From f9f9a03186035744ebc2aa40bbef8a926ca897c6 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 3 Nov 2021 10:56:26 +0200
Subject: [PATCH] notification preferences fix

---
 .../v1/api/model/notification/NotificationPreferences.java   | 1 -
 .../NotificationPreferencesPersistenceService.java           | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
index 8a98bac17..7410df918 100644
--- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
+++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java
@@ -14,7 +14,6 @@ import java.util.List;
 @AllArgsConstructor
 public class NotificationPreferences {
 
-    private String userId;
     private boolean inAppNotificationsEnabled;
     private boolean emailNotificationsEnabled;
     private EmailNotificationType emailNotificationType;
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
index bb2dfd1e8..92614de81 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java
@@ -19,11 +19,10 @@ public class NotificationPreferencesPersistenceService {
     @Transactional
     public void setNotificationPreference(String userId, NotificationPreferences notification) {
         notificationPreferencesRepository.findById(userId)
-                .ifPresentOrElse(n -> {
-                    BeanUtils.copyProperties(notification, n);
-                }, () -> {
+                .ifPresentOrElse(n -> BeanUtils.copyProperties(notification, n), () -> {
                     NotificationPreferencesEntity notificationPreferencesEntity = new NotificationPreferencesEntity();
                     BeanUtils.copyProperties(notification, notificationPreferencesEntity);
+                    notificationPreferencesEntity.setUserId(userId);
                     notificationPreferencesRepository.save(notificationPreferencesEntity);
                 });
     }