Merge pull request #121 from VRGuild/69-ds-update-entity-column

refactor: member 숫자로 내보내기 수정

Author: Hexeong

src/main/java/com/mtvs/devlinkbackend/guild/service/GuildService.java

@@ -87,8 +87,7 @@ public GuildDetailSingleResponseDTO applyMemberToGuild(GuildMemberModifyRequestD
                             foundGuild.getGuildIntroduction(),
                             foundGuild.getMasterUserId(),
                             foundGuild.getMaximumMember(),
-                            foundGuild.getGuildMemberList().stream().map(memberId ->
-                                    memberViewService.findMemberByMemberId(memberId).getData()).toList()
+                            foundGuild.getGuildMemberList().stream().map(memberViewService::findMemberByMemberId).toList()
                     )
             );
         } else return null;

src/main/java/com/mtvs/devlinkbackend/guild/service/GuildViewService.java

@@ -46,8 +46,7 @@ public GuildDetailSingleResponseDTO findGuildDetailByGuildId(Long guildId) {
                     guild.getGuildIntroduction(),
                     guild.getMasterUserId(),
                     guild.getMaximumMember(),
-                    guild.getGuildMemberList().stream().map(memberId ->
-                            memberViewService.findMemberByMemberId(memberId).getData()).toList()
+                    guild.getGuildMemberList().stream().map(memberViewService::findMemberByMemberId).toList()
             )
         );
     }
@@ -63,8 +62,7 @@ public GuildDetailPagingResponseDTO findGuildDetailsWithPagination(Integer page)
                         guild.getGuildIntroduction(),
                         guild.getMasterUserId(),
                         guild.getMaximumMember(),
-                        guild.getGuildMemberList().stream().map(memberId ->
-                                memberViewService.findMemberByMemberId(memberId).getData()).toList()
+                        guild.getGuildMemberList().stream().map(memberViewService::findMemberByMemberId).toList()
         )).toList();
 
         return new GuildDetailPagingResponseDTO(guildAndMemberDTOList, guildPage.getTotalPages(), guildViewRepository.count());

src/main/java/com/mtvs/devlinkbackend/member/command/service/MemberService.java

@@ -4,6 +4,7 @@
 import com.mtvs.devlinkbackend.member.command.model.entity.Member;
 import com.mtvs.devlinkbackend.member.command.repository.MemberRepository;
 import com.mtvs.devlinkbackend.member.query.view.response.MemberStatusResponseDTO;
+import com.mtvs.devlinkbackend.member.query.view.response.sub.MemberDTO;
 import com.mtvs.devlinkbackend.user.command.model.entity.User;
 import com.mtvs.devlinkbackend.user.query.service.UserViewService;
 import org.springframework.stereotype.Service;
@@ -48,7 +49,18 @@ public MemberStatusResponseDTO acceptSupplyByMemberId(Long memberId, String acco
         if (member.isPresent()) {
             Member foundMember = member.get();
             foundMember.setIsAccepted(AcceptStatus.ACCEPTED);
-            return new MemberStatusResponseDTO(foundMember);
+            return new MemberStatusResponseDTO(
+                    new MemberDTO(
+                            foundMember.getMemberId(),
+                            foundMember.getType(),
+                            foundMember.getAssigneesId(),
+                            foundMember.getUserId(),
+                            foundMember.getMotive(),
+                            foundMember.getGroupId(),
+                            foundMember.getIsAccepted().getValue(),
+                            foundMember.getCreatedAt(),
+                            foundMember.getModifiedAt()
+                    ));
         }
         return null;
     }
@@ -63,7 +75,18 @@ public MemberStatusResponseDTO rejectSupplyByMemberId(Long memberId, String acco
         if (member.isPresent()) {
             Member foundMember = member.get();
             foundMember.setIsAccepted(AcceptStatus.REJECTED);
-            return new MemberStatusResponseDTO(foundMember);
+            return new MemberStatusResponseDTO(
+                    new MemberDTO(
+                            foundMember.getMemberId(),
+                            foundMember.getType(),
+                            foundMember.getAssigneesId(),
+                            foundMember.getUserId(),
+                            foundMember.getMotive(),
+                            foundMember.getGroupId(),
+                            foundMember.getIsAccepted().getValue(),
+                            foundMember.getCreatedAt(),
+                            foundMember.getModifiedAt()
+                    ));
         }
         return null;
     }
@@ -73,7 +96,18 @@ public MemberStatusResponseDTO deleteMemberByMemberId(Long memberId) {
         if (member.isPresent()) {
             Member foundMember = member.get();
             foundMember.setIsAccepted(AcceptStatus.DELETED);
-            return new MemberStatusResponseDTO(foundMember);
+            return new MemberStatusResponseDTO(
+                    new MemberDTO(
+                            foundMember.getMemberId(),
+                            foundMember.getType(),
+                            foundMember.getAssigneesId(),
+                            foundMember.getUserId(),
+                            foundMember.getMotive(),
+                            foundMember.getGroupId(),
+                            foundMember.getIsAccepted().getValue(),
+                            foundMember.getCreatedAt(),
+                            foundMember.getModifiedAt()
+                    ));
         }
         return null;
     }

src/main/java/com/mtvs/devlinkbackend/member/query/controller/MemberQueryController.java

@@ -27,7 +27,7 @@ public MemberQueryController(MemberViewService memberViewService) {
     public ResponseEntity<MemberStatusResponseDTO> updateTeam(
             @PathVariable(name = "memberId") Long memberId) {
 
-        MemberStatusResponseDTO memberStatusResponseDTO = memberViewService.findMemberByMemberId(memberId);
+        MemberStatusResponseDTO memberStatusResponseDTO = memberViewService.findMemberDTOByMemberId(memberId);
         return memberStatusResponseDTO != null ?
                 ResponseEntity.ok(memberStatusResponseDTO) :
                 ResponseEntity.notFound().build();

src/main/java/com/mtvs/devlinkbackend/member/query/service/MemberViewService.java

@@ -3,6 +3,7 @@
 import com.mtvs.devlinkbackend.member.command.model.entity.Member;
 import com.mtvs.devlinkbackend.member.query.repository.MemberViewRepository;
 import com.mtvs.devlinkbackend.member.query.view.response.MemberStatusResponseDTO;
+import com.mtvs.devlinkbackend.member.query.view.response.sub.MemberDTO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -15,8 +16,27 @@ public MemberViewService(MemberViewRepository memberViewRepository) {
         this.memberViewRepository = memberViewRepository;
     }
 
-    public MemberStatusResponseDTO findMemberByMemberId(Long memberId) {
-        return new MemberStatusResponseDTO(memberViewRepository.findById(memberId).orElse(null));
+    public MemberStatusResponseDTO findMemberDTOByMemberId(Long memberId) {
+        Member member = memberViewRepository.findById(memberId).orElse(null);
+        if (member == null)
+            throw new IllegalArgumentException("잘못된 memberId로 접근중");
+
+        return new MemberStatusResponseDTO(
+                new MemberDTO(
+                        member.getMemberId(),
+                        member.getType(),
+                        member.getAssigneesId(),
+                        member.getUserId(),
+                        member.getMotive(),
+                        member.getGroupId(),
+                        member.getIsAccepted().getValue(),
+                        member.getCreatedAt(),
+                        member.getModifiedAt()
+                ));
+    }
+
+    public Member findMemberByMemberId(Long memberId) {
+        return memberViewRepository.findById(memberId).orElse(null);
     }
 
     public List<Member> findMemberByUserId(Long userId) {

src/main/java/com/mtvs/devlinkbackend/member/query/view/response/MemberStatusResponseDTO.java

@@ -1,6 +1,7 @@
 package com.mtvs.devlinkbackend.member.query.view.response;
 
 import com.mtvs.devlinkbackend.member.command.model.entity.Member;
+import com.mtvs.devlinkbackend.member.query.view.response.sub.MemberDTO;
 import lombok.*;
 
 @Getter
@@ -9,5 +10,5 @@
 @AllArgsConstructor
 @ToString
 public class MemberStatusResponseDTO {
-    private Member data;
+    private MemberDTO data;
 }

src/main/java/com/mtvs/devlinkbackend/member/query/view/response/sub/MemberDTO.java

@@ -0,0 +1,28 @@
+package com.mtvs.devlinkbackend.member.query.view.response.sub;
+
+import com.mtvs.devlinkbackend.common.model.AcceptStatus;
+import com.mtvs.devlinkbackend.common.util.converter.AcceptStatusConverter;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class MemberDTO {
+    private Long memberId;
+    private String type;
+    private Long assigneesId;
+    private Long userId;
+    private String motive;
+    private Long groupId;
+    private Integer isAccepted;
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+}

src/test/java/com/mtvs/devlinkbackend/crud/MemberCRUDTest.java

@@ -119,7 +119,7 @@ public void testFindMemberByMemberId() {
         when(memberViewRepository.findById(memberId)).thenReturn(Optional.of(member));
 
         // when
-        MemberStatusResponseDTO responseDTO = memberViewService.findMemberByMemberId(memberId);
+        MemberStatusResponseDTO responseDTO = memberViewService.findMemberDTOByMemberId(memberId);
 
         // then
         assertNotNull(responseDTO);