Merge pull request #95 from Modagbul/fix/team

Fix/team

Author: minsu20

src/main/java/com/moing/backend/domain/team/application/dto/response/GetTeamCountResponse.java

@@ -1,5 +1,6 @@
 package com.moing.backend.domain.team.application.dto.response;
 
+import com.querydsl.core.annotations.QueryProjection;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -11,5 +12,15 @@ public class GetTeamCountResponse {
 
     private String teamName;
     private Long numOfTeam;
+    private String leaderName;
 
+    public void updateCount(Long count){
+        this.numOfTeam=count;
+    }
+
+    @QueryProjection
+    public GetTeamCountResponse(String teamName, String leaderName){
+        this.teamName=teamName;
+        this.leaderName=leaderName;
+    }
 }

src/main/java/com/moing/backend/domain/team/application/dto/response/ReviewTeamResponse.java

@@ -10,10 +10,12 @@
 @AllArgsConstructor
 @NoArgsConstructor
 public class ReviewTeamResponse {
+
     private Long teamId;
     private String teamName;
     private Integer numOfMember;
     private Long duration; //걸린시간(단위:날짜)
     private Long numOfMission;
     private Integer levelOfFire; //불꽃 레벨
+    private Boolean isLeader;
 }

src/main/java/com/moing/backend/domain/team/application/mapper/TeamMapper.java

@@ -38,7 +38,7 @@ public GetTeamDetailResponse toTeamDetailResponse(Long memberId, Team team, Inte
                 .build();
     }
 
-    public ReviewTeamResponse toReviewTeamResponse(Long numOfMission, Team team){
+    public ReviewTeamResponse toReviewTeamResponse(Long numOfMission, Team team, boolean isLeader){
         return ReviewTeamResponse
                 .builder()
                 .teamId(team.getTeamId())
@@ -47,6 +47,7 @@ public ReviewTeamResponse toReviewTeamResponse(Long numOfMission, Team team){
                 .levelOfFire(team.getLevelOfFire())
                 .duration(calculateDuration(team.getApprovalTime()))
                 .numOfMission(numOfMission)
+                .isLeader(isLeader)
                 .build();
     }
 

src/main/java/com/moing/backend/domain/team/application/service/ReviewTeamUseCase.java

@@ -1,5 +1,7 @@
 package com.moing.backend.domain.team.application.service;
 
+import com.moing.backend.domain.member.domain.entity.Member;
+import com.moing.backend.domain.member.domain.service.MemberGetService;
 import com.moing.backend.domain.mission.domain.service.MissionQueryService;
 import com.moing.backend.domain.team.application.dto.response.ReviewTeamResponse;
 import com.moing.backend.domain.team.application.mapper.TeamMapper;
@@ -18,10 +20,13 @@ public class ReviewTeamUseCase {
     private final TeamGetService teamGetService;
     private final TeamMapper teamMapper;
     private final MissionQueryService missionQueryService;
-
+    private final CheckLeaderUseCase checkLeaderUseCase;
+    private final MemberGetService memberGetService;
 
     public ReviewTeamResponse reviewTeam(String socialId, Long teamId){
         Team team=teamGetService.getTeamByTeamId(teamId);
-        return teamMapper.toReviewTeamResponse(missionQueryService.findMissionsCountByTeam(team.getTeamId()),team);
+        Member member=memberGetService.getMemberBySocialId(socialId);
+        boolean isLeader=checkLeaderUseCase.isTeamLeader(member, team);
+        return teamMapper.toReviewTeamResponse(missionQueryService.findMissionsCountByTeam(team.getTeamId()),team, isLeader);
     }
 }

src/main/java/com/moing/backend/domain/team/domain/repository/TeamCustomRepository.java

@@ -22,5 +22,5 @@ public interface TeamCustomRepository {
     void updateTeamStatus(boolean isApproved, List<Long> teamIds);
     List<GetLeaderInfoResponse> findLeaderInfoByTeamIds(List<Long> teamIds);
     Page<GetNewTeamResponse> findNewTeam(String dateSort, Pageable pageable);
-    Long findTeamCount(Long memberId);
+    GetTeamCountResponse findTeamCount(Long memberId, Long teamId);
 }

src/main/java/com/moing/backend/domain/team/domain/repository/TeamCustomRepositoryImpl.java

@@ -178,9 +178,9 @@ public Page<GetNewTeamResponse> findNewTeam(String dateSort, Pageable pageable)
     }
 
     @Override
-    public Long findTeamCount(Long memberId) {
+    public GetTeamCountResponse findTeamCount(Long memberId, Long teamId) {
         LocalDateTime threeDaysAgo = LocalDateTime.now().minusDays(3);
-        return queryFactory
+        long count=queryFactory
                 .select(team.count()) // 팀의 개수를 세기 위해 수정
                 .from(teamMember)
                 .innerJoin(teamMember.team, team)
@@ -191,6 +191,16 @@ public Long findTeamCount(Long memberId) {
                                 .or(team.deletionTime.after(threeDaysAgo)))) // 강제종료된 경우 3일이 지나지 않았다면
                 .fetchOne(); // 단일 결과 (개수) 반환
 
+        GetTeamCountResponse response=queryFactory
+                .select(new QGetTeamCountResponse(team.name, member.nickName))
+                .from(team)
+                .join(member).on(team.leaderId.eq(member.memberId))
+                .where(team.teamId.eq(teamId))
+                .fetchOne();
+
+        response.updateCount(count);
+
+        return response;
     }
 
 

src/main/java/com/moing/backend/domain/team/domain/service/TeamGetService.java

@@ -57,9 +57,8 @@ public Page<GetNewTeamResponse> getNewTeams(String dateSort, Pageable pageable)
     }
 
     public GetTeamCountResponse getTeamCountAndName(Long teamId, Long memberId) {
-        String teamName = getTeamByTeamId(teamId).getName();
-        Long numOfTeam = teamRepository.findTeamCount(memberId);
-        return new GetTeamCountResponse(teamName, numOfTeam);
+
+        return teamRepository.findTeamCount(memberId, teamId);
     }
 
 }

src/test/java/com/moing/backend/domain/team/presentation/TeamControllerTest.java

@@ -259,6 +259,7 @@ public void review_team() throws Exception {
                 .duration(30L)
                 .numOfMission(90L)
                 .levelOfFire(3)
+                .isLeader(false)
                 .build();
 
         given(reviewTeamUseCase.reviewTeam(any(), any())).willReturn(output);
@@ -289,7 +290,8 @@ public void review_team() throws Exception {
                                         fieldWithPath("data.numOfMember").description("모임원 명 수"),
                                         fieldWithPath("data.duration").description("소모임과 함께한 시간"),
                                         fieldWithPath("data.levelOfFire").description("소모임 불꽃 레벨"),
-                                        fieldWithPath("data.numOfMission").description("미션 총 개수")
+                                        fieldWithPath("data.numOfMission").description("미션 총 개수"),
+                                        fieldWithPath("data.isLeader").description("소모임장 여부")
                                 )
                         )
                 );
@@ -516,6 +518,7 @@ public void get_team_count() throws Exception {
         GetTeamCountResponse output = GetTeamCountResponse.builder()
                 .teamName("소모임 이름")
                 .numOfTeam(2L)
+                .leaderName("소모임장 이름")
                 .build();
 
         given(getTeamUseCase.getTeamCount(any(), any())).willReturn(output);
@@ -544,7 +547,8 @@ public void get_team_count() throws Exception {
                                         fieldWithPath("isSuccess").description("true"),
                                         fieldWithPath("message").description("소모임을 수정했습니다."),
                                         fieldWithPath("data.teamName").description("소모임 이름"),
-                                        fieldWithPath("data.numOfTeam").description("지금까지 가입한 소모임 개수")
+                                        fieldWithPath("data.numOfTeam").description("지금까지 가입한 소모임 개수"),
+                                        fieldWithPath("data.leaderName").description("소모임장 이름")
                                 )
                         )
                 );