From 643ffc8723d923a7ede8ee52e25ea40e25045148 Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Tue, 7 Mar 2023 13:34:05 +0100 Subject: [PATCH] RED-6310: Corrected services so that they use the user id instead of wrongly using the entity id --- .../NotificationPreferencesPersistenceService.java | 8 +++----- .../repository/NotificationPreferencesRepository.java | 7 ++++++- 2 files changed, 9 insertions(+), 6 deletions(-) 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 cb125312b..57b270993 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 @@ -60,14 +60,14 @@ public class NotificationPreferencesPersistenceService { @Transactional public void deleteNotificationPreferences(String userId) { - notificationPreferencesRepository.deleteById(userId); + notificationPreferencesRepository.deleteByUserId(userId); } @Transactional public NotificationPreferencesEntity getOrCreateNotificationPreferences(String userId) { - return notificationPreferencesRepository.findById(userId).orElseGet(() -> { + return notificationPreferencesRepository.findByUserId(userId).orElseGet(() -> { var notificationPreference = new NotificationPreferencesEntity(); notificationPreference.setUserId(userId); @@ -82,9 +82,7 @@ public class NotificationPreferencesPersistenceService { @Transactional public void initializePreferencesIfNotExists(String userId) { - if (!notificationPreferencesRepository.existsByUserId(userId)) { - getOrCreateNotificationPreferences(userId); - } + getOrCreateNotificationPreferences(userId); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationPreferencesRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationPreferencesRepository.java index fa804686d..f151527e4 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationPreferencesRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/NotificationPreferencesRepository.java @@ -1,11 +1,16 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import com.iqser.red.service.persistence.management.v1.processor.entity.notification.NotificationPreferencesEntity; public interface NotificationPreferencesRepository extends JpaRepository { - boolean existsByUserId(String userId); + Optional findByUserId(String userId); + + + void deleteByUserId(String userId); }