Skip to content

Commit f62d479

Browse files
author
Daenges
committed
Allow meeting join by superid
1 parent 949b4b2 commit f62d479

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.springframework.stereotype.Service;
1919

2020
import java.util.List;
21+
import java.util.Objects;
2122

2223
@Service
2324
@AllArgsConstructor
@@ -41,11 +42,19 @@ public List<StudyGroupResponse> get(String id) {
4142

4243
@Override
4344
public void create(StudyGroupJoinRequest request, String clientUuid) {
44-
45-
MeetingEntity meetingEntity = meetingService.findMeetingByUUID(request.meetingId);
4645
UserEntity userEntity = userService.findByUUID(UUIDService.parseUUID(clientUuid));
4746

48-
joinMeeting(userEntity, meetingEntity);
47+
if (!Objects.equals(request.meetingId, "")) {
48+
MeetingEntity meetingEntity = meetingService.findMeetingByUUID(request.meetingId);
49+
joinMeeting(userEntity, meetingEntity);
50+
}
51+
else if (!Objects.equals(request.superMeetingID, "")) {
52+
List<MeetingEntity> meetingList = meetingService.findMeetingsBySuperID(request.superMeetingID);
53+
54+
for (MeetingEntity m : meetingList) {
55+
joinMeeting(userEntity, m);
56+
}
57+
}
4958
}
5059

5160
@Override

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,9 @@ private List<MeetingResponse> findAllMeetingEntities() {
8787
public MeetingEntity findMeetingByUUID(String uuid) {
8888
return meetingRepository.findById(UUIDService.parseUUID(uuid)).orElse(null);
8989
}
90+
91+
public List<MeetingEntity> findMeetingsBySuperID(String superID) {
92+
return meetingRepository.findBySuperId(UUIDService.parseUUID(superID));
93+
}
9094
}
9195

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public ResponseEntity<?> add(
2929
return new ResponseEntity<>(HttpStatus.OK);
3030
}
3131

32+
33+
3234
@DeleteMapping
3335
public ResponseEntity<?> delete(String targetUUID, HttpServletRequest request) {
3436
studyGroupService.delete(targetUUID, request.getUserPrincipal().getName());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import jakarta.validation.constraints.NotBlank;
55

66
public class StudyGroupJoinRequest implements CreationRequest {
7-
8-
@NotBlank
7+
public String superMeetingID;
98
public String meetingId;
9+
1010
// User ID given through Request
1111
}

0 commit comments

Comments
 (0)