Merge pull request #540 from RADAR-base/fix/create-user

Remove schedule generation on user creation

Author: this-Aditya

src/main/java/org/radarbase/appserver/service/UserService.java

@@ -57,21 +57,17 @@ 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_";
 
   @Autowired
   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)
@@ -165,8 +161,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 +189,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);
   }
 

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);
         }
     }
 }