feat: Add isMeMissionUploadedToday field And Rename IsMeUploadedToday…

… as isMeSurvivalUploadedToday from DaytimePageResponse
depromeet · Apr 24, 2024 · 2ec0215 · 2ec0215
1 parent 042c990
commit 2ec0215
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 7 deletions.
diff --git a/gateway/src/main/java/com/oing/controller/MainViewController.java b/gateway/src/main/java/com/oing/controller/MainViewController.java
@@ -68,8 +68,10 @@ public DaytimePageResponse getDaytimePage(
         String dailyMissionContent = missionBridge.getContentByMissionId(todayMissionId);
         boolean isMissionUnlocked = postController.getMissionAvailableStatus(loginMemberId, loginMemberId, familyId)
                 .isMissionUnlocked();
-        boolean isMeUploadedToday = postController.getSurvivalUploadStatus(loginMemberId, loginMemberId, familyId)
-                .isMeUploadedToday();
+        boolean isMeSurvivalUploadedToday = postController.getSurvivalUploadStatus(loginMemberId, loginMemberId, familyId)
+                .isMeSurvivalUploadedToday();
+        boolean isMeMissionUploadedToday = postController.getMissionUploadStatus(loginMemberId, loginMemberId, familyId)
+                .isMeMissionUploadedToday();
         int leftUploadCountUntilMissionUnlock = postController.getRemainingSurvivalPostCount(loginMemberId, loginMemberId, familyId)
                 .leftUploadCountUntilMissionUnlock();
 
@@ -107,7 +109,9 @@ public DaytimePageResponse getDaytimePage(
 
                 isMissionUnlocked,
 
-                isMeUploadedToday,
+                isMeSurvivalUploadedToday,
+
+                isMeMissionUploadedToday,
 
                 dailyMissionContent,
 

diff --git a/gateway/src/main/java/com/oing/dto/response/DaytimePageResponse.java b/gateway/src/main/java/com/oing/dto/response/DaytimePageResponse.java
@@ -18,8 +18,11 @@ public record DaytimePageResponse(
         @Schema(description = "미션 해금 여부", example = "true")
         boolean isMissionUnlocked,
 
-        @Schema(description = "오늘 나 업로드 여부", example = "true")
-        boolean isMeUploadedToday,
+        @Schema(description = "오늘 요청자가 생존신고를 업로드 했는지 여부", example = "true")
+        boolean isMeSurvivalUploadedToday,
+
+        @Schema(description = "오늘 요청자가 미션을 업로드 했는지 여부", example = "true")
+        boolean isMeMissionUploadedToday,
 
         @Schema(description = "오늘의 미션 내용 (모킹됨)", example = "오늘의 기분을 나타내는 사진 찍기.")
         String dailyMissionContent,

diff --git a/post/src/main/java/com/oing/controller/PostController.java b/post/src/main/java/com/oing/controller/PostController.java
@@ -101,6 +101,16 @@ public SurvivalUploadStatusResponse getSurvivalUploadStatus(String memberId, Str
         return new SurvivalUploadStatusResponse(false);
     }
 
+    @Override
+    public MissionUploadStatusResponse getMissionUploadStatus(String memberId, String loginMemberId, String loginFamilyId) {
+        validateMemberId(loginMemberId, memberId);
+
+        if (postService.existsByMemberIdAndFamilyIdAndTypeAndCreatedAt(memberId, loginFamilyId, PostType.MISSION, LocalDate.now())) {
+            return new MissionUploadStatusResponse(true);
+        }
+        return new MissionUploadStatusResponse(false);
+    }
+
     @Override
     public MissionAvailableStatusResponse getMissionAvailableStatus(String memberId, String loginMemberId, String loginFamilyId) {
         validateMemberId(loginMemberId, memberId);

diff --git a/post/src/main/java/com/oing/dto/response/MissionUploadStatusResponse.java b/post/src/main/java/com/oing/dto/response/MissionUploadStatusResponse.java
@@ -0,0 +1,10 @@
+package com.oing.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(description = "회원 미션 게시글 업로드 여부 응답")
+public record MissionUploadStatusResponse(
+        @Schema(description = "회원 미션 게시글 업로드 여부", example = "true")
+        boolean isMeMissionUploadedToday
+) {
+}
diff --git a/post/src/main/java/com/oing/dto/response/SurvivalUploadStatusResponse.java b/post/src/main/java/com/oing/dto/response/SurvivalUploadStatusResponse.java
@@ -1,11 +1,10 @@
 package com.oing.dto.response;
 
-import com.oing.domain.Reaction;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @Schema(description = "회원 생존신고 게시글 업로드 여부 응답")
 public record SurvivalUploadStatusResponse(
         @Schema(description = "회원 생존신고 게시글 업로드 여부", example = "true")
-        boolean isMeUploadedToday
+        boolean isMeSurvivalUploadedToday
 ) {
 }
diff --git a/post/src/main/java/com/oing/restapi/PostApi.java b/post/src/main/java/com/oing/restapi/PostApi.java
@@ -130,6 +130,22 @@ SurvivalUploadStatusResponse getSurvivalUploadStatus(
             String loginFamilyId
     );
 
+    @Operation(summary = "회원 미션 게시글 업로드 여부 응답 조회", description = "회원 미션 게시글 업로드 여부를 조회합니다.")
+    @GetMapping("/{memberId}/mission-uploaded")
+    MissionUploadStatusResponse getMissionUploadStatus(
+            @PathVariable
+            @Parameter(description = "대상 사용자 ID", example = "01HGW2N7EHJVJ4CJ999RRS2E97")
+            String memberId,
+
+            @Parameter(hidden = true)
+            @LoginMemberId
+            String loginMemberId,
+
+            @Parameter(hidden = true)
+            @LoginFamilyId
+            String loginFamilyId
+    );
+
     @Operation(summary = "회원 미션 참여 가능 여부 응답 조회", description = "회원 미션 참여 가능 여부를 조회합니다.")
     @GetMapping("/{memberId}/mission-available")
     MissionAvailableStatusResponse getMissionAvailableStatus(