From aa116354bee2b0c3d5fae02a85ac1071d3f3f4ac Mon Sep 17 00:00:00 2001 From: Pauline Date: Thu, 4 Dec 2025 08:40:07 +0800 Subject: [PATCH 1/2] fix: Update creation of user so that the schedule does not automatically get generated --- .../org/radarbase/appserver/service/UserService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/java/org/radarbase/appserver/service/UserService.java b/src/main/java/org/radarbase/appserver/service/UserService.java index 4cef3dc71..e445553a5 100644 --- a/src/main/java/org/radarbase/appserver/service/UserService.java +++ b/src/main/java/org/radarbase/appserver/service/UserService.java @@ -165,8 +165,6 @@ public FcmUserDto saveUserInProject(FcmUserDto userDto) { // maintain a bi-directional relationship newUser.getUsermetrics().setUser(newUser); User savedUser = this.userRepository.saveAndFlush(newUser); - // Generate schedule for user - this.scheduleService.generateScheduleForUser(savedUser); return userConverter.entityToDto(savedUser); } @@ -195,14 +193,6 @@ public FcmUserDto updateUser(FcmUserDto userDto) { // maintain a bi-directional relationship user.getUsermetrics().setUser(user); User savedUser = this.userRepository.saveAndFlush(user); - // Generate schedule for user - if (!user.getAttributes().equals(userDto.getAttributes()) - || !user.getTimezone().equals(userDto.getTimezone()) - || !user.getEnrolmentDate().equals(userDto.getEnrolmentDate()) - || !user.getLanguage().equals(userDto.getLanguage())) - { - this.scheduleService.generateScheduleForUser(savedUser); - } return userConverter.entityToDto(savedUser); } From 8549120a6deab1354251394ae24e8159fbbbe107 Mon Sep 17 00:00:00 2001 From: Pauline Date: Thu, 4 Dec 2025 19:23:13 +0800 Subject: [PATCH 2/2] fix: remove unused scheduleservice from userService --- .../java/org/radarbase/appserver/service/UserService.java | 6 +----- .../org/radarbase/appserver/service/UserServiceTest.java | 8 +------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/radarbase/appserver/service/UserService.java b/src/main/java/org/radarbase/appserver/service/UserService.java index e445553a5..8f3f0029a 100644 --- a/src/main/java/org/radarbase/appserver/service/UserService.java +++ b/src/main/java/org/radarbase/appserver/service/UserService.java @@ -57,8 +57,6 @@ public class UserService { private final transient UserRepository userRepository; private final transient ProjectRepository projectRepository; - @Autowired - private final transient QuestionnaireScheduleService scheduleService; private static final String FCM_TOKEN_PREFIX = "unregistered_"; @@ -66,12 +64,10 @@ public class UserService { public UserService( UserConverter userConverter, UserRepository userRepository, - ProjectRepository projectRepository, - QuestionnaireScheduleService scheduleService) { + ProjectRepository projectRepository) { this.userConverter = userConverter; this.userRepository = userRepository; this.projectRepository = projectRepository; - this.scheduleService = scheduleService; } @Transactional(readOnly = true) diff --git a/src/test/java/org/radarbase/appserver/service/UserServiceTest.java b/src/test/java/org/radarbase/appserver/service/UserServiceTest.java index 7bd4a8ae9..dd96bcbf2 100644 --- a/src/test/java/org/radarbase/appserver/service/UserServiceTest.java +++ b/src/test/java/org/radarbase/appserver/service/UserServiceTest.java @@ -65,9 +65,6 @@ class UserServiceTest { @MockBean private transient ProjectRepository projectRepository; - @MockBean - private transient QuestionnaireScheduleService scheduleService; - private transient Instant enrolmentDate = Instant.now().plus(Duration.ofSeconds(100)); private static final String TIMEZONE = "Europe/Bucharest"; @@ -217,14 +214,11 @@ static class UserServiceConfig { @Autowired private transient ProjectRepository projectRepository; - @Autowired - private transient QuestionnaireScheduleService scheduleService; - private final transient UserConverter userConverter = new UserConverter(); @Bean public UserService userServiceBeanConfig() { - return new UserService(userConverter, userRepository, projectRepository, scheduleService); + return new UserService(userConverter, userRepository, projectRepository); } } }