Merge pull request #117 from Modagbul/feat/mission-alarm

Feat/mission alarm
Modagbul · Dec 6, 2023 · c317866 · c317866
2 parents e84953f + 6b63796
commit c317866
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 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,12 +2,15 @@
 
 import lombok.*;
 
+import javax.validation.constraints.Size;
+
 @Builder
 @NoArgsConstructor
 @Getter
 public class MissionArchiveReq {
 
     private String status;
+    @Size(min = 1, max = 4000)
     private String archive; //사진일 경우 파일명, 이외에는 text,link
 
     @Builder

diff --git a/...n/java/com/moing/backend/domain/missionArchive/presentation/MissionArchiveController.java b/...n/java/com/moing/backend/domain/missionArchive/presentation/MissionArchiveController.java
@@ -1,5 +1,6 @@
 package com.moing.backend.domain.missionArchive.presentation;
 
+import com.moing.backend.domain.member.domain.entity.Member;
 import com.moing.backend.domain.mission.application.dto.res.GatherRepeatMissionRes;
 import com.moing.backend.domain.missionArchive.application.dto.req.MissionArchiveReq;
 import com.moing.backend.domain.missionArchive.application.dto.res.MissionArchiveRes;
@@ -8,6 +9,7 @@
 import com.moing.backend.domain.missionArchive.application.dto.res.PersonalArchiveRes;
 import com.moing.backend.domain.missionArchive.application.service.*;
 import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveDeleteService;
+import com.moing.backend.domain.missionArchive.domain.service.MissionArchiveScheduleQueryService;
 import com.moing.backend.domain.missionHeart.application.dto.MissionHeartRes;
 import com.moing.backend.domain.missionHeart.application.service.MissionHeartUseCase;
 import com.moing.backend.global.config.security.dto.User;
@@ -17,6 +19,7 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 import static com.moing.backend.domain.missionArchive.domain.constant.MissionArchiveResponseMessage.*;
@@ -46,8 +49,8 @@ public class MissionArchiveController {
     public ResponseEntity<SuccessResponse<MissionArchiveRes>> createArchive(@AuthenticationPrincipal User user,
                                                                             @PathVariable("teamId") Long teamId,
                                                                             @PathVariable("missionId") Long missionId,
-                                                                            @RequestBody MissionArchiveReq missionArchiveReq) {
-        return ResponseEntity.ok(SuccessResponse.create(CREATE_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveCreateUseCase.createArchive(user.getSocialId(), missionId,missionArchiveReq)));
+                                                                            @Valid @RequestBody MissionArchiveReq missionArchiveReq) {
+        return ResponseEntity.ok(SuccessResponse.create(CREATE_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveCreateUseCase.createArchive(user.getSocialId(), missionId, missionArchiveReq)));
     }
 
     /**
@@ -61,8 +64,9 @@ public ResponseEntity<SuccessResponse<MissionArchiveRes>> updateArchive(@Authent
                                                                             @PathVariable("teamId") Long teamId,
                                                                             @PathVariable("missionId") Long missionId,
                                                                             @RequestBody MissionArchiveReq missionArchiveReq) {
-        return ResponseEntity.ok(SuccessResponse.create(UPDATE_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveUpdateUseCase.updateArchive(user.getSocialId(), missionId,missionArchiveReq)));
+        return ResponseEntity.ok(SuccessResponse.create(UPDATE_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveUpdateUseCase.updateArchive(user.getSocialId(), missionId, missionArchiveReq)));
     }
+
     /**
      * 미션 인증 취소하기
      * [DELETE] {teamId}/missions/{missionId}/archive
@@ -99,7 +103,7 @@ public ResponseEntity<SuccessResponse<MyMissionArchiveRes>> getMyArchive(@Authen
     public ResponseEntity<SuccessResponse<List<PersonalArchiveRes>>> getOtherPeopleArchives(@AuthenticationPrincipal User user,
                                                                                             @PathVariable("teamId") Long teamId,
                                                                                             @PathVariable("missionId") Long missionId) {
-        return ResponseEntity.ok(SuccessResponse.create(READ_TEAM_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveReadUseCase.getPersonalArchive(user.getSocialId(),missionId)));
+        return ResponseEntity.ok(SuccessResponse.create(READ_TEAM_ARCHIVE_SUCCESS.getMessage(), this.missionArchiveReadUseCase.getPersonalArchive(user.getSocialId(), missionId)));
     }
 
 
@@ -115,7 +119,7 @@ public ResponseEntity<SuccessResponse<MissionHeartRes>> pushHeart(@Authenticatio
                                                                       @PathVariable("missionId") Long missionId,
                                                                       @PathVariable("archiveId") Long archiveId,
                                                                       @PathVariable("missionHeartStatus") String missionHeartStatus) {
-        return ResponseEntity.ok(SuccessResponse.create(CREATE_ARCHIVE_SUCCESS.getMessage(), this.missionHeartUseCase.pushHeart(user.getSocialId(),archiveId,missionHeartStatus)));
+        return ResponseEntity.ok(SuccessResponse.create(CREATE_ARCHIVE_SUCCESS.getMessage(), this.missionHeartUseCase.pushHeart(user.getSocialId(), archiveId, missionHeartStatus)));
     }
 
     /**
@@ -132,7 +136,6 @@ public ResponseEntity<SuccessResponse<MissionArchiveStatusRes>> getMissionDoneSt
     }
 
 
-
     /**
      * 반복미션 - 나의 성공 횟수 조회
      * [GET] {teamId}/missions/{missionId}/archive/my-status
@@ -141,14 +144,10 @@ public ResponseEntity<SuccessResponse<MissionArchiveStatusRes>> getMissionDoneSt
 
     @GetMapping("/my-status")
     public ResponseEntity<SuccessResponse<MissionArchiveStatusRes>> getMyMissionDoneStatus(@AuthenticationPrincipal User user,
-                                                                                         @PathVariable("teamId") Long teamId,
-                                                                                         @PathVariable("missionId") Long missionId) {
-        return ResponseEntity.ok(SuccessResponse.create(MISSION_ARCHIVE_PEOPLE_STATUS_SUCCESS.getMessage(), this.repeatMissionArchiveReadUseCase.getMyMissionDoneStatus(user.getSocialId(),missionId)));
+                                                                                           @PathVariable("teamId") Long teamId,
+                                                                                           @PathVariable("missionId") Long missionId) {
+        return ResponseEntity.ok(SuccessResponse.create(MISSION_ARCHIVE_PEOPLE_STATUS_SUCCESS.getMessage(), this.repeatMissionArchiveReadUseCase.getMyMissionDoneStatus(user.getSocialId(), missionId)));
     }
 
 
-
-
-
-
 }