Fix potential duplicate issue when saving notification settings (#1313)

onlydustxyz · Nov 26, 2024 · c8bb587 · c8bb587
1 parent ed37aa5
commit c8bb587
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...va/onlydust/com/marketplace/api/postgres/adapter/PostgresNotificationSettingsAdapter.java b/...va/onlydust/com/marketplace/api/postgres/adapter/PostgresNotificationSettingsAdapter.java
@@ -31,7 +31,14 @@ public Optional<NotificationSettings.Project> getNotificationSettingsForProject(
     @Override
     @Transactional
     public void saveNotificationSettingsForProject(UserId userId, NotificationSettings.Project settings) {
-        notificationSettingsForProjectRepository.save(NotificationSettingsForProjectEntity.of(userId, settings));
+        final var entity = notificationSettingsForProjectRepository
+                .findById(new NotificationSettingsForProjectEntity.PrimaryKey(userId.value(), settings.projectId().value()))
+                .map(e -> {
+                    e.setOnGoodFirstIssueAdded(settings.onGoodFirstIssueAdded().orElse(null));
+                    return e;
+                })
+                .orElseGet(() -> NotificationSettingsForProjectEntity.of(userId, settings));
+        notificationSettingsForProjectRepository.save(entity);
     }
 
     @Override