fix: 그룹 회원 추가 시 기존 그룹 회원 정보가 덮어 씌워지는 문제 해결 및 의존성 수정

.github/workflows/deploy.yml

@@ -96,4 +96,5 @@ jobs:
           envs: IMAGE_FULL_URL, DOCKERHUB_IMAGE_NAME
           script: |
             echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u "${{ env.DOCKERHUB_USERNAME }}" --password-stdin
+            docker compose down --remove-orphans
             docker compose up --build -d

src/main/java/org/ioteatime/meonghanyangserver/group/service/GroupService.java

@@ -1,7 +1,6 @@
 package org.ioteatime.meonghanyangserver.group.service;
 
 import jakarta.transaction.Transactional;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.ioteatime.meonghanyangserver.clients.google.FcmClient;
 import org.ioteatime.meonghanyangserver.common.exception.BadRequestException;
@@ -16,9 +15,9 @@
 import org.ioteatime.meonghanyangserver.group.mapper.GroupEntityMapper;
 import org.ioteatime.meonghanyangserver.group.mapper.GroupResponseMapper;
 import org.ioteatime.meonghanyangserver.group.repository.GroupRepository;
+import org.ioteatime.meonghanyangserver.groupmember.doamin.GroupMemberEntity;
 import org.ioteatime.meonghanyangserver.groupmember.doamin.enums.GroupMemberRole;
-import org.ioteatime.meonghanyangserver.groupmember.repository.JpaGroupMemberRepository;
-import org.ioteatime.meonghanyangserver.groupmember.service.GroupMemberService;
+import org.ioteatime.meonghanyangserver.groupmember.repository.GroupMemberRepository;
 import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
 import org.ioteatime.meonghanyangserver.member.repository.MemberRepository;
 import org.springframework.stereotype.Service;
@@ -29,15 +28,14 @@ public class GroupService {
     private final FcmClient fcmClient;
     private final GroupRepository groupRepository;
     private final MemberRepository memberRepository;
-    private final GroupMemberService groupMemberService;
+    private final GroupMemberRepository groupMemberRepository;
     private final RandomStringGenerator randomStringGenerator;
-    private final JpaGroupMemberRepository groupUserRepository;
 
     // create group
     @Transactional
     public CreateGroupResponse createGroup(Long memberId, CreateGroupRequest createGroupRequest) {
 
-        boolean groupUserEntity = groupMemberService.existsGroupMember(memberId);
+        boolean groupUserEntity = groupMemberRepository.existsGroupMember(memberId);
         String thingId = createGroupRequest.thingId();
         if (groupUserEntity) {
             throw new BadRequestException(GroupErrorType.ALREADY_EXISTS);
@@ -55,8 +53,10 @@ public CreateGroupResponse createGroup(Long memberId, CreateGroupRequest createG
         GroupEntity groupEntity = GroupEntityMapper.toEntity(roomName, fcmTopic);
 
         GroupEntity newGroupEntity = groupRepository.save(groupEntity);
-        groupMemberService.createGroupMember(
-                newGroupEntity, memberEntity, GroupMemberRole.ROLE_MASTER, thingId);
+        GroupMemberEntity groupMemberEntity =
+                GroupMemberEntity.from(
+                        GroupMemberRole.ROLE_MASTER, thingId, newGroupEntity, memberEntity);
+        groupMemberRepository.save(groupMemberEntity);
 
         // FCM 토픽 구독
         fcmClient.subTopic(memberEntity.getFcmToken(), fcmTopic);
@@ -71,7 +71,8 @@ private String createFcmTopicName(Long memberId) {
 
     public GroupTotalResponse getGroupTotalData(Long memberId) {
         GroupEntity groupEntity =
-                Optional.ofNullable(groupMemberService.getGroup(memberId))
+                groupMemberRepository
+                        .findGropFromGroupMember(memberId)
                         .orElseThrow(
                                 () -> new NotFoundException(GroupErrorType.GROUP_MEMBER_NOT_FOUND));
 

src/main/java/org/ioteatime/meonghanyangserver/groupmember/controller/GroupMemberApi.java

@@ -5,28 +5,31 @@
 import org.ioteatime.meonghanyangserver.common.api.Api;
 import org.ioteatime.meonghanyangserver.common.utils.LoginMember;
 import org.ioteatime.meonghanyangserver.groupmember.dto.request.JoinGroupMemberRequest;
+import org.ioteatime.meonghanyangserver.groupmember.dto.response.GroupMemberInfoListResponse;
+import org.ioteatime.meonghanyangserver.groupmember.dto.response.GroupMemberResponse;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
 @Tag(name = "Group Member Api", description = "Group Member 관련 API 목록입니다.")
 public interface GroupMemberApi {
 
     @Operation(summary = "참여자가 그룹과 역할을 조회합니다.", description = "담당자: 임지인")
-    public Api<?> getGroupMemberInfo(@LoginMember Long memberId);
+    Api<GroupMemberResponse> getGroupMemberInfo(@LoginMember Long memberId);
 
     @Operation(summary = "참여자가 그룹에 입장을 요청합니다.", description = "담당자: 임지인")
-    public Api<Void> joinGroupAsMember(
+    Api<?> joinGroupAsMember(
             @LoginMember Long memberId, @RequestBody JoinGroupMemberRequest joinGroupMemberRequest);
 
     @Operation(summary = "방장이 그룹에서 참여자를 제외합니다.", description = "담당자: 최민석")
-    public Api<?> deleteMasterGroupMember(
+    Api<?> deleteMasterGroupMember(
             @LoginMember Long memberId,
             @PathVariable Long groupId,
             @PathVariable Long groupMemberId);
 
     @Operation(summary = "그룹에서 참여자가 스스로 퇴장합니다.", description = "담당자: 최민석")
-    public Api<?> deleteGroupMember(@LoginMember Long memberId, @PathVariable Long groupId);
+    Api<?> deleteGroupMember(@LoginMember Long memberId, @PathVariable Long groupId);
 
     @Operation(summary = "그룹 참여자들의 정보를 조회합니다.", description = "담당자: 최민석")
-    public Api<?> getGroupMemberInfoList(@LoginMember Long memberId, @PathVariable Long groupId);
+    Api<GroupMemberInfoListResponse> getGroupMemberInfoList(
+            @LoginMember Long memberId, @PathVariable Long groupId);
 }

src/main/java/org/ioteatime/meonghanyangserver/groupmember/controller/GroupMemberController.java

@@ -17,13 +17,13 @@ public class GroupMemberController implements GroupMemberApi {
     private final GroupMemberService groupMemberService;
 
     @GetMapping
-    public Api<?> getGroupMemberInfo(@LoginMember Long memberId) {
+    public Api<GroupMemberResponse> getGroupMemberInfo(@LoginMember Long memberId) {
         GroupMemberResponse groupMemberResponse = groupMemberService.getGroupMemberInfo(memberId);
         return Api.success(GroupSuccessType.GET_GROUP_MEMBER_INFO, groupMemberResponse);
     }
 
     @PostMapping("/viewer")
-    public Api<Void> joinGroupAsMember(
+    public Api<?> joinGroupAsMember(
             @LoginMember Long memberId,
             @RequestBody JoinGroupMemberRequest joinGroupMemberRequest) {
         groupMemberService.joinGroupMember(memberId, joinGroupMemberRequest);
@@ -33,20 +33,22 @@ public Api<Void> joinGroupAsMember(
     @DeleteMapping("/{groupId}/member/{groupMemberId}")
     public Api<?> deleteMasterGroupMember(
             @LoginMember Long memberId,
-            @PathVariable Long groupId,
-            @PathVariable Long groupMemberId) {
+            @PathVariable("groupId") Long groupId,
+            @PathVariable("groupMemberId") Long groupMemberId) {
         groupMemberService.deleteMasterGroupMember(memberId, groupId, groupMemberId);
         return Api.success(GroupSuccessType.DELETE_GROUP_MEMBER);
     }
 
     @DeleteMapping("/{groupId}/member")
-    public Api<?> deleteGroupMember(@LoginMember Long memberId, @PathVariable Long groupId) {
+    public Api<?> deleteGroupMember(
+            @LoginMember Long memberId, @PathVariable("groupId") Long groupId) {
         groupMemberService.deleteGroupMember(memberId, groupId);
         return Api.success(GroupSuccessType.DELETE_GROUP_MEMBER);
     }
 
     @GetMapping("/{groupId}/member")
-    public Api<?> getGroupMemberInfoList(@LoginMember Long memberId, @PathVariable Long groupId) {
+    public Api<GroupMemberInfoListResponse> getGroupMemberInfoList(
+            @LoginMember Long memberId, @PathVariable("groupId") Long groupId) {
         GroupMemberInfoListResponse groupMemberInfoListResponse =
                 groupMemberService.getGroupMemberInfoList(memberId, groupId);
         return Api.success(

src/main/java/org/ioteatime/meonghanyangserver/groupmember/doamin/GroupMemberEntity.java

@@ -43,11 +43,20 @@ public GroupMemberEntity(
         this.group = group;
     }
 
-    @Builder
     public GroupMemberEntity(Long id, GroupMemberRole role, String thingId, MemberEntity member) {
         this.id = id;
         this.role = role;
         this.member = member;
         this.thingId = thingId;
     }
+
+    public static GroupMemberEntity from(
+            GroupMemberRole role, String thingId, GroupEntity group, MemberEntity member) {
+        return GroupMemberEntity.builder()
+                .role(role)
+                .thingId(thingId)
+                .group(group)
+                .member(member)
+                .build();
+    }
 }

src/main/java/org/ioteatime/meonghanyangserver/groupmember/repository/GroupMemberRepository.java

@@ -13,7 +13,7 @@ public interface GroupMemberRepository {
 
     Optional<GroupMemberEntity> findByMemberId(Long memberId);
 
-    GroupEntity findGroupMember(Long memberId);
+    Optional<GroupEntity> findGropFromGroupMember(Long memberId);
 
     void deleteById(Long id);
 

src/main/java/org/ioteatime/meonghanyangserver/groupmember/repository/GroupMemberRepositoryImpl.java

@@ -37,12 +37,13 @@ public Optional<GroupMemberEntity> findByMemberId(Long memberId) {
     }
 
     @Override
-    public GroupEntity findGroupMember(Long memberId) {
-        return jpaQueryFactory
-                .select(groupMemberEntity.group)
-                .from(groupMemberEntity)
-                .where(groupMemberEntity.member.id.eq(memberId))
-                .fetchOne();
+    public Optional<GroupEntity> findGropFromGroupMember(Long memberId) {
+        return Optional.ofNullable(
+                jpaQueryFactory
+                        .select(groupMemberEntity.group)
+                        .from(groupMemberEntity)
+                        .where(groupMemberEntity.member.id.eq(memberId))
+                        .fetchOne());
     }
 
     @Override

src/main/java/org/ioteatime/meonghanyangserver/groupmember/service/GroupMemberService.java

@@ -1,7 +1,6 @@
 package org.ioteatime.meonghanyangserver.groupmember.service;
 
 import java.util.List;
-import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.ioteatime.meonghanyangserver.cctv.dto.response.CctvInviteResponse;
 import org.ioteatime.meonghanyangserver.cctv.repository.CctvRepository;
@@ -19,7 +18,6 @@
 import org.ioteatime.meonghanyangserver.groupmember.dto.response.GroupMemberInfoListResponse;
 import org.ioteatime.meonghanyangserver.groupmember.dto.response.GroupMemberInfoResponse;
 import org.ioteatime.meonghanyangserver.groupmember.dto.response.GroupMemberResponse;
-import org.ioteatime.meonghanyangserver.groupmember.mapper.GroupMemberEntityMapper;
 import org.ioteatime.meonghanyangserver.groupmember.mapper.GroupMemberResponseMapper;
 import org.ioteatime.meonghanyangserver.groupmember.repository.GroupMemberRepository;
 import org.ioteatime.meonghanyangserver.member.domain.MemberEntity;
@@ -30,22 +28,11 @@
 @Service
 @RequiredArgsConstructor
 public class GroupMemberService {
-    private final GroupMemberRepository groupMemberRepository;
-    private final MemberRepository memberRepository;
+    private final CctvRepository cctvRepository;
     private final GroupRepository groupRepository;
+    private final MemberRepository memberRepository;
+    private final GroupMemberRepository groupMemberRepository;
     private final KvsChannelNameGenerator kvsChannelNameGenerator;
-    private final CctvRepository cctvRepository;
-
-    // input user
-    public void createGroupMember(
-            GroupEntity groupEntity,
-            MemberEntity memberEntity,
-            GroupMemberRole groupMemberRole,
-            String thingId) {
-        GroupMemberEntity groupMember =
-                GroupMemberEntityMapper.from(groupEntity, memberEntity, groupMemberRole, thingId);
-        groupMemberRepository.save(groupMember);
-    }
 
     @Transactional
     public void joinGroupMember(Long memberId, JoinGroupMemberRequest joinGroupMemberRequest) {
@@ -64,7 +51,10 @@ public void joinGroupMember(Long memberId, JoinGroupMemberRequest joinGroupMembe
                         .findById(memberId)
                         .orElseThrow(() -> new BadRequestException(AuthErrorType.NOT_FOUND));
 
-        createGroupMember(groupEntity, memberEntity, GroupMemberRole.ROLE_PARTICIPANT, thingId);
+        GroupMemberEntity groupMemberEntity =
+                GroupMemberEntity.from(
+                        GroupMemberRole.ROLE_PARTICIPANT, thingId, groupEntity, memberEntity);
+        groupMemberRepository.save(groupMemberEntity);
     }
 
     public boolean existsGroupMember(Long memberId) {
@@ -103,7 +93,8 @@ public CctvInviteResponse generateCctvInvite(Long memberId) {
     }
 
     public GroupEntity getGroup(Long memberId) {
-        return Optional.ofNullable(groupMemberRepository.findGroupMember(memberId))
+        return groupMemberRepository
+                .findGropFromGroupMember(memberId)
                 .orElseThrow(() -> new NotFoundException(GroupErrorType.GROUP_MEMBER_NOT_FOUND));
     }
 

src/main/resources/application-prod.yaml

@@ -10,4 +10,4 @@ spring:
         format_sql: true
         default_batch_fetch_size: 100
     hibernate:
-      ddl-auto: create
+      ddl-auto: update