[fix] 그룹 최초 가입 시 기본으로 선택되도록 설정

team-JMT · Mar 12, 2024 · ade5094 · ade5094
1 parent ba3fb54
commit ade5094
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/com/gdsc/jmt/domain/group/command/service/GroupService.java b/src/main/java/com/gdsc/jmt/domain/group/command/service/GroupService.java
@@ -148,8 +148,11 @@ public void joinGroup(long groupId, UserInfo user) {
             throw new ApiException(GroupMessage.GROUP_NOT_FOUND);
         }
 
-        Optional<GroupUsersEntity> groupUserResult = groupUserRepository.findByGroupIdAndUserId(groupId, userResult.get().getId());
-        if(groupUserResult.isPresent()) {
+        List<GroupUsersEntity> groupUsers = groupUserRepository.findByUserId(userResult.get().getId());
+        boolean isAlreadyExistsGroup = groupUsers
+                .stream()
+                .anyMatch(groupUser -> groupUser.getGroupId().equals(groupId));
+        if(isAlreadyExistsGroup) {
             throw new ApiException(GroupMessage.USER_ALREADY_EXISTS_IN_GROUP);
         }
 
@@ -159,6 +162,14 @@ public void joinGroup(long groupId, UserInfo user) {
                 .role(GroupUserRole.MEMBER)
                 .build();
 
+        if(groupUsers.isEmpty()) {
+            GroupUserSelectEntity groupUserSelectEntity = GroupUserSelectEntity.builder()
+                    .groupId(groupId)
+                    .userId(userResult.get().getId())
+                    .build();
+            groupUserSelectRepository.save(groupUserSelectEntity);
+        }
+
         groupUserRepository.save(joinGroupUsersEntity);
     }