Merge pull request #189 from sef-global/development

ScholarX v1.3

Author: Gravewalker666

src/main/java/org/sefglobal/scholarx/repository/MenteeRepository.java

@@ -21,6 +21,8 @@ public interface MenteeRepository extends JpaRepository<Mentee, Long> {
 
     List<Mentee> findAllByProgramIdAndProfileId(long programId, long profileId);
 
+    List<Mentee> findAllByProgramIdAndProfileIdAndState(long programId, long profileId, EnrolmentState state);
+
     List<Mentee> findAllByProgramIdAndProfileIdAndStateIn(long programId, long profileId, List<EnrolmentState> states);
 
     Optional<Mentee> findByProfileIdAndMentorId(long profileId, long mentorId);
@@ -29,6 +31,8 @@ public interface MenteeRepository extends JpaRepository<Mentee, Long> {
 
     List<Mentee> findAllByProgramId(long id);
 
+    List<Mentee> findAllByProgramIdAndState(long programId, EnrolmentState state);
+
     @Modifying
     @Query(
             value = "DELETE " +
@@ -52,4 +56,16 @@ public interface MenteeRepository extends JpaRepository<Mentee, Long> {
             nativeQuery = true
     )
     void removeAllByProgramIdAndProfileIdAndMentorIdNot(long programId, long profileId, long mentorId);
+
+    @Modifying
+    @Query(
+            value = "UPDATE " +
+                    "mentee " +
+                    "SET state = 'REMOVED' " +
+                    "WHERE profile_id = :profileId " +
+                    "AND program_id = :programId ",
+            nativeQuery = true
+    )
+    void removeAllByProgramIdAndProfileId(long programId, long profileId);
+
 }

src/main/java/org/sefglobal/scholarx/service/ProgramService.java

@@ -152,6 +152,15 @@ public Program updateState(long id) throws ResourceNotFoundException {
         }
 
         ProgramState nextState = program.get().getState().next();
+        if (ProgramState.ONGOING.equals(nextState)) {
+            List<Mentee> approvedMenteeList = menteeRepository.findAllByProgramIdAndState(id, EnrolmentState.APPROVED);
+            for (Mentee mentee : approvedMenteeList) {
+                long profileId = mentee.getProfile().getId();
+                if (menteeRepository.findAllByProgramIdAndProfileIdAndState(id, profileId, EnrolmentState.APPROVED).size() != 1) {
+                    menteeRepository.removeAllByProgramIdAndProfileId(id, profileId);
+                }
+            }
+        }
         program.get().setState(nextState);
         return programRepository.save(program.get());
     }