Merge pull request #60 from Modagbul/feat/mission

fix : 미션 모아보기-teamId 추가
Modagbul · Nov 5, 2023 · f9db7a1 · f9db7a1
2 parents 6b1bb84 + 20d7dda
commit f9db7a1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/...ain/java/com/moing/backend/domain/mission/application/dto/res/GatherRepeatMissionRes.java b/...ain/java/com/moing/backend/domain/mission/application/dto/res/GatherRepeatMissionRes.java
@@ -10,6 +10,7 @@
 public class GatherRepeatMissionRes {
 
     private Long missionId;
+    private Long teamId;
     private String teamName;
     private String missionTitle;
     private String totalNum;

diff --git a/...ain/java/com/moing/backend/domain/mission/application/dto/res/GatherSingleMissionRes.java b/...ain/java/com/moing/backend/domain/mission/application/dto/res/GatherSingleMissionRes.java
@@ -9,6 +9,7 @@
 @AllArgsConstructor
 public class GatherSingleMissionRes {
     private Long missionId;
+    private Long teamId;
     private String teamName;
     private String missionTitle;
     private String dueTo;

diff --git a/.../java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java b/.../java/com/moing/backend/domain/mission/domain/repository/MissionCustomRepositoryImpl.java
@@ -42,6 +42,7 @@ public Optional<List<GatherRepeatMissionRes>> findRepeatMissionByMemberId(Long m
         return Optional.ofNullable(queryFactory
                 .select(Projections.constructor(GatherRepeatMissionRes.class,
                         mission.id,
+                        mission.team.teamId,
                         mission.team.name,
                         mission.title,
                         mission.number.stringValue(),
@@ -88,6 +89,7 @@ public Optional<List<GatherSingleMissionRes>> findSingleMissionByMemberId(Long m
         return Optional.ofNullable(queryFactory
                 .select(Projections.constructor(GatherSingleMissionRes.class,
                         mission.id,
+                        mission.team.teamId,
                         mission.team.name,
                         mission.title,
                         mission.dueTo.stringValue()

diff --git a/...a/com/moing/backend/domain/missionArchive/representation/MissionGatherControllerTest.java b/...a/com/moing/backend/domain/missionArchive/representation/MissionGatherControllerTest.java
@@ -40,6 +40,7 @@ public class MissionGatherControllerTest extends CommonControllerTest {
 
         List<GatherSingleMissionRes> output = Lists.newArrayList(GatherSingleMissionRes.builder()
                 .missionId(1L)
+                .teamId(1L)
                 .dueTo("2023-09-03T21:32:33.888")
                 .teamName("team name")
                 .missionTitle("mission title")
@@ -68,6 +69,7 @@ public class MissionGatherControllerTest extends CommonControllerTest {
                                         fieldWithPath("isSuccess").description("true"),
                                         fieldWithPath("message").description(ACTIVE_SINGLE_MISSION_SUCCESS.getMessage()),
                                         fieldWithPath("data[].missionId").description("미션 아이디"),
+                                        fieldWithPath("data[].teamId").description("팀 아이디"),
                                         fieldWithPath("data[].dueTo").description("미션 마감 시각"),
                                         fieldWithPath("data[].teamName").description("팀 이름"),
                                         fieldWithPath("data[].missionTitle").description("미션 제목")
@@ -85,6 +87,7 @@ public class MissionGatherControllerTest extends CommonControllerTest {
 
         List<GatherRepeatMissionRes> output = Lists.newArrayList(GatherRepeatMissionRes.builder()
                 .missionId(1L)
+                .teamId(1L)
                 .teamName("team name")
                 .missionTitle("mission title")
                 .doneNum("0")
@@ -114,6 +117,7 @@ public class MissionGatherControllerTest extends CommonControllerTest {
                                         fieldWithPath("isSuccess").description("true"),
                                         fieldWithPath("message").description(ACTIVE_REPEAT_MISSION_SUCCESS.getMessage()),
                                         fieldWithPath("data[].missionId").description("미션 아이디"),
+                                        fieldWithPath("data[].teamId").description("팀 아이디"),
                                         fieldWithPath("data[].teamName").description("팀 이름"),
                                         fieldWithPath("data[].missionTitle").description("미션 제목"),
                                         fieldWithPath("data[].doneNum").description("완료한 횟수"),