Merge pull request #45 from Halbes-Byte/meeting-fixes

Meeting fixes

Author: Pand3ru

server/src/main/java/com/studybuddies/server/domain/MeetingEntity.java

@@ -31,7 +31,7 @@ public class MeetingEntity {
   UUID superId;
 
   @Column(nullable = false)
-  String title;
+  String module;
 
   String description;
 

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

@@ -18,6 +18,7 @@
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 @Service
 @AllArgsConstructor
@@ -41,16 +42,26 @@ public List<StudyGroupResponse> get(String id) {
 
   @Override
   public void create(StudyGroupJoinRequest request, String clientUuid) {
-
-    MeetingEntity meetingEntity = meetingService.findMeetingByUUID(request.meetingId);
     UserEntity userEntity = userService.findByUUID(UUIDService.parseUUID(clientUuid));
 
-    joinMeeting(userEntity, meetingEntity);
+    if (!Objects.equals(request.meetingId, "")) {
+      MeetingEntity meetingEntity = meetingService.findMeetingByUUID(request.meetingId);
+      joinMeeting(userEntity, meetingEntity);
+    }
+    else if (!Objects.equals(request.superMeetingID, "")) {
+      List<MeetingEntity> meetingList = meetingService.findMeetingsBySuperID(request.superMeetingID);
+
+      for (MeetingEntity m : meetingList) {
+        joinMeeting(userEntity, m);
+      }
+    }
   }
 
   @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) {
@@ -69,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/services/meeting/MeetingCreationService.java

@@ -107,7 +107,7 @@ private void setEndTime() {
   private MeetingEntity cloneMeetingEntity(MeetingEntity meetingEntity) {
     return MeetingEntity.builder()
         .superId(meetingEntity.getSuperId())
-        .title(meetingEntity.getTitle())
+        .module(meetingEntity.getModule())
         .description(meetingEntity.getDescription())
         .dateFrom(meetingEntity.getDateFrom())
         .dateUntil(meetingEntity.getDateUntil())

server/src/main/java/com/studybuddies/server/services/meeting/MeetingService.java

@@ -87,5 +87,9 @@ private List<MeetingResponse> findAllMeetingEntities() {
   public MeetingEntity findMeetingByUUID(String uuid) {
     return meetingRepository.findById(UUIDService.parseUUID(uuid)).orElse(null);
   }
+
+  public List<MeetingEntity> findMeetingsBySuperID(String superID) {
+    return meetingRepository.findBySuperId(UUIDService.parseUUID(superID));
+  }
 }
 

server/src/main/java/com/studybuddies/server/web/StudyGroupController.java

@@ -29,6 +29,8 @@ public ResponseEntity<?> add(
     return new ResponseEntity<>(HttpStatus.OK);
   }
 
+
+
   @DeleteMapping
   public ResponseEntity<?> delete(String targetUUID, HttpServletRequest request) {
     studyGroupService.delete(targetUUID, request.getUserPrincipal().getName());

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingChangeRequest.java

@@ -10,7 +10,7 @@
 public class MeetingChangeRequest implements ChangeRequest {
 
   public ChangeType changeType;
-  public String title;
+  public String module;
   public String description;
   public String dateFrom;
   public String dateUntil;

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingCreationRequest.java

@@ -8,7 +8,7 @@
 public class MeetingCreationRequest implements CreationRequest {
 
   @NotBlank
-  public String title;
+  public String module;
   public String description;
   @NotBlank
   public String dateFrom;

server/src/main/java/com/studybuddies/server/web/dto/meeting/MeetingResponse.java

@@ -9,7 +9,7 @@ public class MeetingResponse implements Responses {
   public String id;
   public String superId;
   @NotBlank
-  public String title;
+  public String module;
   public String description;
   @NotBlank
   public String dateFrom;