feat: 미션 내역 수정 구현 (#123)

* fix: 미션 기록 일지 수정 * fix: spotlessApply * feat: 미션 기록 소유권 검증 * fix: 미션, 미션 기록 수정 API return 객체 정적 팩토리 메서드로 변경 * fix: updateMissionRecord 인자 변경 * fix: MissionVisibility 검증 부분 수정 * fix: spotlessApply * fix: spotlessApply * fix: update return 타입 변경 및 변수 할당 * fix: 미션 수정도 동일한 response 형식 * fix: 수정 API 변경으로 인한 테스트 코드 수정 * fix: spotlessApply
depromeet · Jan 15, 2024 · 0986204 · 0986204
1 parent 8e68480
commit 0986204
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 77 deletions.
diff --git a/src/main/java/com/depromeet/domain/mission/dto/request/MissionUpdateRequest.java b/src/main/java/com/depromeet/domain/mission/dto/request/MissionUpdateRequest.java
@@ -14,5 +14,6 @@ public record MissionUpdateRequest(
         @Size(min = 1, max = 30, message = "미션 내용은 1자 이상 30자 이하")
                 @Schema(description = "미션 내용", defaultValue = "default content")
                 String content,
-        @NotNull @Schema(description = "미션 공개여부", defaultValue = "ALL")
+        @NotNull(message = "미션 공개 여부가 null일 수 없습니다.")
+                @Schema(description = "미션 공개여부", defaultValue = "ALL")
                 MissionVisibility visibility) {}
diff --git a/src/main/java/com/depromeet/domain/mission/dto/response/MissionUpdateResponse.java b/src/main/java/com/depromeet/domain/mission/dto/response/MissionUpdateResponse.java
@@ -1,33 +1,11 @@
 package com.depromeet.domain.mission.dto.response;
 
 import com.depromeet.domain.mission.domain.Mission;
-import com.depromeet.domain.mission.domain.MissionCategory;
-import com.depromeet.domain.mission.domain.MissionVisibility;
-import com.depromeet.global.error.exception.CustomException;
-import com.depromeet.global.error.exception.ErrorCode;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
 
 public record MissionUpdateResponse(
-        @Schema(description = "미션 ID", defaultValue = "1") Long missionId,
-        @Schema(description = "미션 이름", defaultValue = "default name") String name,
-        @Schema(description = "미션 내용", defaultValue = "default content") String content,
-        @Schema(description = "미션 카테고리", defaultValue = "STUDY") MissionCategory category,
-        @Schema(description = "미션 공개여부", defaultValue = "ALL") MissionVisibility visibility) {
-    public MissionUpdateResponse(Mission mission) {
-        this(
-                mission.getId(),
-                mission.getName(),
-                mission.getContent(),
-                mission.getCategory(),
-                mission.getVisibility());
-        validateVisibility();
-    }
-
-    @NotNull(message = "미션 공개여부는 null이 될 수 없습니다.")
-    private void validateVisibility() {
-        if (visibility == null) {
-            throw new CustomException(ErrorCode.MISSION_VISIBILITY_NULL);
-        }
+        @Schema(description = "미션 ID", defaultValue = "1") Long missionId) {
+    public static MissionUpdateResponse from(Mission mission) {
+        return new MissionUpdateResponse(mission.getId());
     }
 }
diff --git a/src/main/java/com/depromeet/domain/mission/service/MissionService.java b/src/main/java/com/depromeet/domain/mission/service/MissionService.java
@@ -61,7 +61,7 @@ public MissionUpdateResponse updateMission(
                 missionUpdateRequest.name(),
                 missionUpdateRequest.content(),
                 missionUpdateRequest.visibility());
-        return new MissionUpdateResponse(mission);
+        return MissionUpdateResponse.from(mission);
     }
 
     public void deleteMission(Long missionId) {

diff --git a/src/main/java/com/depromeet/domain/missionRecord/api/MissionRecordController.java b/src/main/java/com/depromeet/domain/missionRecord/api/MissionRecordController.java
@@ -1,9 +1,11 @@
 package com.depromeet.domain.missionRecord.api;
 
 import com.depromeet.domain.missionRecord.dto.request.MissionRecordCreateRequest;
+import com.depromeet.domain.missionRecord.dto.request.MissionRecordUpdateRequest;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordCreateResponse;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordFindOneResponse;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordFindResponse;
+import com.depromeet.domain.missionRecord.dto.response.MissionRecordUpdateResponse;
 import com.depromeet.domain.missionRecord.service.MissionRecordService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -16,6 +18,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -49,4 +52,11 @@ public List<MissionRecordFindResponse> missionRecordFind(
             @RequestParam("yearMonth") YearMonth yearMonth) {
         return missionRecordService.findAllMissionRecord(missionId, yearMonth);
     }
+
+    @Operation(summary = "미션 기록 단건 수정", description = "미션 기록을 수정합니다.")
+    @PutMapping("/{recordId}")
+    public MissionRecordUpdateResponse missionRecordUpdate(
+            @Valid @RequestBody MissionRecordUpdateRequest request, @PathVariable Long recordId) {
+        return missionRecordService.updateMissionRecord(request, recordId);
+    }
 }
diff --git a/src/main/java/com/depromeet/domain/missionRecord/domain/MissionRecord.java b/src/main/java/com/depromeet/domain/missionRecord/domain/MissionRecord.java
@@ -95,4 +95,8 @@ public void updateUploadStatusComplete(String remark, String imageUrl) {
         this.remark = remark;
         this.imageUrl = imageUrl;
     }
+
+    public void updateMissionRecord(String remark) {
+        this.remark = remark;
+    }
 }
diff --git a/src/main/java/com/depromeet/domain/missionRecord/dto/request/MissionRecordUpdateRequest.java b/src/main/java/com/depromeet/domain/missionRecord/dto/request/MissionRecordUpdateRequest.java
@@ -0,0 +1,9 @@
+package com.depromeet.domain.missionRecord.dto.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Size;
+
+public record MissionRecordUpdateRequest(
+        @Size(min = 0, max = 200, message = "미션 기록 일지는 200자까지")
+                @Schema(description = "미션 기록 일지", defaultValue = "default missionRecord remark")
+                String remark) {}
diff --git a/...ain/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordUpdateResponse.java b/...ain/java/com/depromeet/domain/missionRecord/dto/response/MissionRecordUpdateResponse.java
@@ -0,0 +1,11 @@
+package com.depromeet.domain.missionRecord.dto.response;
+
+import com.depromeet.domain.missionRecord.domain.MissionRecord;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record MissionRecordUpdateResponse(
+        @Schema(description = "미션 기록 ID", defaultValue = "1") Long recordId) {
+    public static MissionRecordUpdateResponse from(MissionRecord missionRecord) {
+        return new MissionRecordUpdateResponse(missionRecord.getId());
+    }
+}
diff --git a/src/main/java/com/depromeet/domain/missionRecord/service/MissionRecordService.java b/src/main/java/com/depromeet/domain/missionRecord/service/MissionRecordService.java
@@ -8,9 +8,11 @@
 import com.depromeet.domain.missionRecord.domain.MissionRecord;
 import com.depromeet.domain.missionRecord.domain.MissionRecordTTL;
 import com.depromeet.domain.missionRecord.dto.request.MissionRecordCreateRequest;
+import com.depromeet.domain.missionRecord.dto.request.MissionRecordUpdateRequest;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordCreateResponse;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordFindOneResponse;
 import com.depromeet.domain.missionRecord.dto.response.MissionRecordFindResponse;
+import com.depromeet.domain.missionRecord.dto.response.MissionRecordUpdateResponse;
 import com.depromeet.global.common.constants.RedisExpireEventConstants;
 import com.depromeet.global.error.exception.CustomException;
 import com.depromeet.global.error.exception.ErrorCode;
@@ -90,6 +92,20 @@ public List<MissionRecordFindResponse> findAllMissionRecord(
         return missionRecords.stream().map(MissionRecordFindResponse::from).toList();
     }
 
+    public MissionRecordUpdateResponse updateMissionRecord(
+            MissionRecordUpdateRequest request, Long recordId) {
+        final Member member = memberUtil.getCurrentMember();
+        MissionRecord missionRecord =
+                missionRecordRepository
+                        .findById(recordId)
+                        .orElseThrow(() -> new CustomException(ErrorCode.MISSION_RECORD_NOT_FOUND));
+
+        validateMissionRecordUserMismatch(missionRecord.getMission(), member);
+
+        missionRecord.updateMissionRecord(request.remark());
+        return MissionRecordUpdateResponse.from(missionRecord);
+    }
+
     private void validateMissionRecordDuration(Duration duration) {
         if (duration.getSeconds() > 3600L) {
             throw new CustomException(ErrorCode.MISSION_RECORD_DURATION_OVERBALANCE);

diff --git a/src/main/java/com/depromeet/global/error/exception/ErrorCode.java b/src/main/java/com/depromeet/global/error/exception/ErrorCode.java
@@ -23,8 +23,6 @@ public enum ErrorCode {
     // Mission
     MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 미션을 찾을 수 없습니다."),
 
-    MISSION_VISIBILITY_NULL(HttpStatus.BAD_REQUEST, "미션 공개 여부가 null입니다."),
-
     // MissionRecord
     MISSION_RECORD_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 미션 기록을 찾을 수 없습니다."),
     MISSION_RECORD_USER_MISMATCH(HttpStatus.FORBIDDEN, "미션을 생성한 유저와 로그인된 계정이 일치하지 않습니다"),

diff --git a/src/test/java/com/depromeet/domain/mission/controller/MissionControllerTest.java b/src/test/java/com/depromeet/domain/mission/controller/MissionControllerTest.java
@@ -211,14 +211,7 @@ private Slice<MissionFindResponse> checkLastPage(
         MissionUpdateRequest updateRequest =
                 new MissionUpdateRequest(
                         "testMissionName", "testMissionContent", MissionVisibility.NONE);
-        given(missionService.updateMission(any(), any()))
-                .willReturn(
-                        new MissionUpdateResponse(
-                                1L,
-                                "testMissionName",
-                                "testMissionContent",
-                                MissionCategory.STUDY,
-                                MissionVisibility.FOLLOWER));
+        given(missionService.updateMission(any(), any())).willReturn(new MissionUpdateResponse(1L));
 
         // expected
         ResultActions perform =
@@ -231,8 +224,7 @@ private Slice<MissionFindResponse> checkLastPage(
 
         perform.andExpect(status().isOk())
                 .andExpect(jsonPath("$.data.missionId").exists())
-                .andExpect(
-                        jsonPath("$.data.visibility").value(MissionVisibility.FOLLOWER.toString()))
+                .andExpect(jsonPath("$.data.missionId").value(1L))
                 .andDo(print());
     }
 
@@ -241,14 +233,7 @@ private Slice<MissionFindResponse> checkLastPage(
         // given
         MissionUpdateRequest updateRequest =
                 new MissionUpdateRequest(null, "testMissionContent", MissionVisibility.NONE);
-        given(missionService.updateMission(any(), any()))
-                .willReturn(
-                        new MissionUpdateResponse(
-                                1L,
-                                null,
-                                "testMissionContent",
-                                MissionCategory.STUDY,
-                                MissionVisibility.FOLLOWER));
+        given(missionService.updateMission(any(), any())).willReturn(new MissionUpdateResponse(1L));
 
         // expected
         ResultActions perform =

diff --git a/src/test/java/com/depromeet/domain/mission/service/MissionServiceTest.java b/src/test/java/com/depromeet/domain/mission/service/MissionServiceTest.java
@@ -13,7 +13,6 @@
 import com.depromeet.domain.mission.dto.response.MissionCreateResponse;
 import com.depromeet.domain.mission.dto.response.MissionFindResponse;
 import com.depromeet.domain.mission.dto.response.MissionUpdateResponse;
-import com.depromeet.global.error.exception.CustomException;
 import com.depromeet.global.util.MemberUtil;
 import jakarta.persistence.EntityManager;
 import java.time.LocalDateTime;
@@ -146,9 +145,7 @@ void setUp() {
                 missionService.updateMission(missionUpdateRequest, saveMission.missionId());
 
         // expected
-        assertEquals(modifyMission.name(), "modifyName");
-        assertEquals(modifyMission.content(), "modifyContent");
-        assertEquals(modifyMission.visibility(), MissionVisibility.FOLLOWER);
+        assertEquals(modifyMission.missionId(), 1L);
     }
 
     @Test
@@ -173,32 +170,6 @@ void setUp() {
                 .isInstanceOf(DataIntegrityViolationException.class);
     }
 
-    @Test
-    void 미션_공개여부_null값은_잘못된_요청이다() {
-        // given
-        MissionCreateRequest missionCreateRequest =
-                new MissionCreateRequest(
-                        "testMissionName",
-                        "testMissionContent",
-                        MissionCategory.STUDY,
-                        MissionVisibility.ALL);
-        MissionCreateResponse saveMission = missionService.createMission(missionCreateRequest);
-        MissionUpdateRequest missionUpdateRequest =
-                new MissionUpdateRequest("modifyName", "modifyContent", null);
-
-        // when
-        CustomException exception =
-                assertThrows(
-                        CustomException.class,
-                        () -> {
-                            missionService.updateMission(
-                                    missionUpdateRequest, saveMission.missionId());
-                        });
-
-        // expected
-        assertEquals(exception.getMessage(), "미션 공개 여부가 null입니다.");
-    }
-
     @Test
     void 미션이름_20자_초과하면_미션수정_실패한다() {
         // given