Allow leaving studygroup by superid

Author: Daenges

server/src/main/java/com/studybuddies/server/persistance/StudyGroupId.java

@@ -15,7 +15,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class StudyGroupId implements Serializable {
-
   private UUID userId;
   private UUID meetingId;
 }

server/src/main/java/com/studybuddies/server/persistance/StudyGroupRepository.java

@@ -21,6 +21,12 @@ public interface StudyGroupRepository extends CrudRepository<StudyGroupEntity, S
   @Transactional
   @Query("DELETE FROM StudyGroupEntity s WHERE s.id.userId = :userId AND s.id.meetingId = :meetingId")
   void deleteByUserIdAndMeetingId(@Param("userId") UUID userId, @Param("meetingId") UUID meetingId);
+
+  @Modifying
+  @Transactional
+  @Query("DELETE FROM StudyGroupEntity s WHERE s.user.id = :userId AND s.meeting.superId = :meetingSuperId")
+  void deleteByUserIdAndSuperMeetingId(@Param("userId") UUID userId, @Param("meetingSuperId") UUID meetingSuperId);
+
 }
 
 

server/src/main/java/com/studybuddies/server/services/StudyGroupService.java

@@ -59,7 +59,9 @@ else if (!Objects.equals(request.superMeetingID, "")) {
 
   @Override
   public void delete(String targetUUID, String clientUUID) {
+    // Restricted through the CRUD Interface :/
     leaveMeeting(clientUUID, targetUUID);
+    leaveSuperMeeting(clientUUID, targetUUID);
   }
 
   private void joinMeeting(UserEntity userEntity, MeetingEntity meetingEntity) {
@@ -78,6 +80,11 @@ private void leaveMeeting(String userUUID, String meetingUUID) {
         UUIDService.parseUUID(meetingUUID));
   }
 
+  private void leaveSuperMeeting(String userUUID, String meetingSuperUUID) {
+    studyGroupRepository.deleteByUserIdAndSuperMeetingId(UUIDService.parseUUID(userUUID),
+            UUIDService.parseUUID(meetingSuperUUID));
+  }
+
   private List<StudyGroupEntity> findStudyGroupsByUUID(String someUUID) {
     return studyGroupRepository.findByUserIdOrMeetingId(UUIDService.parseUUID(someUUID))
         .orElseThrow(() -> new InvalidUUIDException("UUID was invalid"));

server/src/main/java/com/studybuddies/server/web/dto/studygroup/StudyGroupLeaveRequest.java

@@ -5,4 +5,5 @@
 public class StudyGroupLeaveRequest implements ChangeRequest {
 
   public String meetingId;
+  public String meetingSuperId;
 }