Merge pull request #274 from Modagbul/MNG-21

MNG-21 : 미션 인증 시 문구 추가
Modagbul · Apr 21, 2024 · 084bb07 · 084bb07
2 parents f707f7e + e9380df
commit 084bb07
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/...n/java/com/moing/backend/domain/missionArchive/application/dto/req/MissionArchiveReq.java b/...n/java/com/moing/backend/domain/missionArchive/application/dto/req/MissionArchiveReq.java
@@ -2,6 +2,7 @@
 
 import lombok.*;
 
+import javax.annotation.Nullable;
 import javax.validation.constraints.Size;
 
 @Builder
@@ -10,12 +11,16 @@
 public class MissionArchiveReq {
 
     private String status;
+
     @Size(min = 1, max = 1000)
     private String archive; //사진일 경우 파일명, 이외에는 text,link
 
+    private String contents;
+
     @Builder
-    public MissionArchiveReq(String status, String archive) {
+    public MissionArchiveReq(String status, String archive, String contents) {
         this.status = status;
         this.archive = archive;
+        this.contents = contents;
     }
 }
diff --git a/...n/java/com/moing/backend/domain/missionArchive/application/dto/res/MissionArchiveRes.java b/...n/java/com/moing/backend/domain/missionArchive/application/dto/res/MissionArchiveRes.java
@@ -18,6 +18,7 @@ public class MissionArchiveRes {
     private Long count;
     private String heartStatus;
     private Long hearts;
+    private String contents;
 
     public void updateCount(Long count) {
         this.count = count;

diff --git a/.../java/com/moing/backend/domain/missionArchive/application/dto/res/PersonalArchiveRes.java b/.../java/com/moing/backend/domain/missionArchive/application/dto/res/PersonalArchiveRes.java
@@ -2,6 +2,8 @@
 
 import lombok.*;
 
+import javax.annotation.Nullable;
+
 @AllArgsConstructor
 @Builder
 @NoArgsConstructor
@@ -24,5 +26,8 @@ public class PersonalArchiveRes {
 
     private Long makerId;
 
+    @Nullable
+    private String contents;
+
 
 }
diff --git a/...java/com/moing/backend/domain/missionArchive/application/mapper/MissionArchiveMapper.java b/...java/com/moing/backend/domain/missionArchive/application/mapper/MissionArchiveMapper.java
@@ -2,7 +2,6 @@
 
 import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.mission.application.dto.res.FinishMissionBoardRes;
-import com.moing.backend.domain.mission.application.dto.res.RepeatMissionBoardRes;
 import com.moing.backend.domain.mission.application.dto.res.SingleMissionBoardRes;
 import com.moing.backend.domain.mission.domain.entity.Mission;
 import com.moing.backend.domain.missionArchive.application.dto.req.MissionArchiveReq;
@@ -29,6 +28,7 @@ public static MissionArchive mapToMissionArchive(MissionArchiveReq missionArchiv
                 .member(member)
                 .mission(mission)
                 .heartList(new ArrayList<>())
+                .contents(missionArchiveReq.getContents())
                 .build();
     }
 
@@ -50,6 +50,7 @@ public static MissionArchiveRes mapToMissionArchiveRes(MissionArchive missionArc
                         .filter(heart -> heart.getHeartStatus() == ( MissionHeartStatus.True))
                         .filter(heart -> heart.getMissionArchive().equals( missionArchive))// heartStatus가 true인 요소만 필터링
                         .count())
+                .contents(missionArchive.getContents())
                 .build();
     }
 
@@ -84,6 +85,7 @@ public static PersonalArchiveRes mapToPersonalArchive(MissionArchive missionArch
                         .filter(heart -> heart.getMissionArchive().equals( missionArchive))// heartStatus가 true인 요소만 필터링
                         .count())
                 .makerId(missionArchive.getMember().getMemberId())
+                .contents(missionArchive.getContents())
                 .build();
     }
 

diff --git a/src/main/java/com/moing/backend/domain/missionArchive/domain/entity/MissionArchive.java b/src/main/java/com/moing/backend/domain/missionArchive/domain/entity/MissionArchive.java
@@ -39,12 +39,14 @@ public class MissionArchive extends BaseTimeEntity { // 1회 미션을 저장
     @Enumerated(value = EnumType.STRING)
     private MissionArchiveStatus status;
 
-
     @Column(nullable = false, columnDefinition="TEXT", length = 4000)
     private String archive; //링크, 글, 사진 뭐든 가능
 
     private Long count; // 횟수
 
+    @Column(nullable = true, columnDefinition="TEXT", length = 1000)
+    private String contents;
+
     @OneToMany(mappedBy = "missionArchive", cascade = CascadeType.REMOVE)
     private List<MissionHeart> heartList = new ArrayList<>();
 

diff --git a/.../com/moing/backend/domain/missionArchive/representation/MissionArchiveControllerTest.java b/.../com/moing/backend/domain/missionArchive/representation/MissionArchiveControllerTest.java
@@ -1,7 +1,6 @@
 package com.moing.backend.domain.missionArchive.representation;
 
 import com.moing.backend.config.CommonControllerTest;
-import com.moing.backend.domain.missionArchive.application.dto.req.MissionArchiveHeartReq;
 import com.moing.backend.domain.missionArchive.application.dto.req.MissionArchiveReq;
 import com.moing.backend.domain.missionArchive.application.dto.res.*;
 import com.moing.backend.domain.missionArchive.application.service.*;
@@ -65,6 +64,7 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                 .count(1L)
                 .heartStatus("[True/False]")
                 .hearts(1L)
+                .contents("contents")
                 .build();
 
         given(missionArchiveCreateUseCase.createArchive(any(),any(),any())).willReturn(output);
@@ -93,7 +93,10 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                 ),
                                 requestFields(
                                         fieldWithPath("status").description("미션 인증 상태 [COMPLETE/SKIP]"),
-                                        fieldWithPath("archive").description("미션 인증물 [s3URL/text/링크] ")
+                                        fieldWithPath("archive").description("미션 인증물 [s3URL/text/링크] "),
+                                        fieldWithPath("contents").description("미션 인증 문구 [null 허용] ")
+
+
                                 ),
                                 responseFields(
                                         fieldWithPath("isSuccess").description("true"),
@@ -105,7 +108,8 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                         fieldWithPath("data.status").description("미션 인증 상태"),
                                         fieldWithPath("data.count").description("미션 인증 횟수"),
                                         fieldWithPath("data.hearts").description("미션 인증 좋아요 수"),
-                                        fieldWithPath("data.heartStatus").description("미션 인증 좋아요 상태")
+                                        fieldWithPath("data.heartStatus").description("미션 인증 좋아요 상태"),
+                                        fieldWithPath("data.contents").description("미션 인증 문구")
                                 )
                         )
                 )
@@ -132,6 +136,7 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                 .count(1L)
                 .heartStatus("[True/False]")
                 .hearts(1L)
+                .contents("contents")
                 .build();
 
         given(missionArchiveUpdateUseCase.updateArchive(any(),any(),any())).willReturn(output);
@@ -160,7 +165,9 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                 ),
                                 requestFields(
                                         fieldWithPath("status").description("미션 인증 상태 [COMPLETE/SKIP]"),
-                                        fieldWithPath("archive").description("미션 인증물 [s3URL/text/링크] ")
+                                        fieldWithPath("archive").description("미션 인증물 [s3URL/text/링크] "),
+                                        fieldWithPath("contents").description("미션 인증 문구 [null 허용] ")
+
                                 ),
                                 responseFields(
                                         fieldWithPath("isSuccess").description("true"),
@@ -173,7 +180,9 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                         fieldWithPath("data.status").description("미션 인증 상태"),
                                         fieldWithPath("data.count").description("미션 인증 횟수"),
                                         fieldWithPath("data.heartStatus").description("미션 인증 좋아요 상태"),
-                                        fieldWithPath("data.hearts").description("미션 인증 좋아요 수")
+                                        fieldWithPath("data.hearts").description("미션 인증 좋아요 수"),
+                                        fieldWithPath("data.contents").description("미션 인증 문구")
+
                                 )
                         )
                 )
@@ -236,6 +245,7 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                 .count(1L)
                 .heartStatus("[True/False]")
                 .hearts(1L)
+                .contents("contents")
                 .build());
 
         MyMissionArchiveRes output = MyMissionArchiveRes.builder()
@@ -278,7 +288,8 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                         fieldWithPath("data.archives[].status").description("미션 인증 상태"),
                                         fieldWithPath("data.archives[].count").description("미션 인증 횟수"),
                                         fieldWithPath("data.archives[].heartStatus").description("미션 인증 좋아요 상태"),
-                                        fieldWithPath("data.archives[].hearts").description("미션 인증 좋아요 수")
+                                        fieldWithPath("data.archives[].hearts").description("미션 인증 좋아요 수"),
+                                        fieldWithPath("data.archives[].contents").description("미션 인증 문구")
 
 
                                         )
@@ -304,6 +315,7 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                 .heartStatus("[True/False]")
                 .hearts(3)
                 .makerId(1L)
+                .contents("contents")
                 .build());
 
         given(missionArchiveReadUseCase.getPersonalArchive(any(),any())).willReturn(output);
@@ -343,10 +355,11 @@ public class MissionArchiveControllerTest extends CommonControllerTest {
                                         fieldWithPath("data[].count").description("미션 인증 횟수"),
                                         fieldWithPath("data[].heartStatus").description("미션 인증 좋아요 상태 "),
                                         fieldWithPath("data[].hearts").description("미션 인증 좋아요 수 "),
-                                        fieldWithPath("data[].makerId").description("미션 인증한 사람 ")
+                                        fieldWithPath("data[].makerId").description("미션 인증한 사람 "),
+                                        fieldWithPath("data[].contents").description("미션 인증 문구")
 
 
-                                        )
+                                )
                         )
                 )
                 .andReturn();