[RELEASE/3.0.0] release: v3.0.0

.github/workflows/dev-cicd.yaml

@@ -8,14 +8,15 @@ on:
       - 'common/**' # Common 모듈 변경
       - 'family/**' # Family 모듈 변경
       - 'post/**' # Post 모듈 변경
+      - 'mission/**' # Mission 모듈 변경
       - '.github/workflows/**' # 워크플로우와 관련된 파일이 변경된 경우
       - 'build.gradle' # Parent Gradle 모듈 설정이 변경된 경우
       - 'settings.gradle' # Parent Gradle 설정이 변경된 경우
 
 env:
   ECR_REPOSITORY_NAME: bibbi-backend-dev
   SPRING_PROFILE: dev
-  ECS_SERVICE: bibbi-backend-dev
+  ECS_SERVICE: bibbi-backend-development
   ECS_CLUSTER: bibbi-cluster-prod
   ECR_TASK_DEFINITION: bibbi-backend-dev
 

.github/workflows/prod-cicd.yaml

@@ -8,14 +8,15 @@ on:
       - 'common/**' # Common 모듈 변경
       - 'family/**' # Family 모듈 변경
       - 'post/**' # Post 모듈 변경
+      - 'mission/**' # Mission 모듈 변경
       - '.github/workflows/**' # 워크플로우와 관련된 파일이 변경된 경우
       - 'build.gradle' # Parent Gradle 모듈 설정이 변경된 경우
       - 'settings.gradle' # Parent Gradle 설정이 변경된 경우
 
 env:
   ECR_REPOSITORY_NAME: bibbi-backend-prod
   SPRING_PROFILE: prod
-  ECS_SERVICE: bibbi-backend
+  ECS_SERVICE: bibbi-backend-prod
   ECS_CLUSTER: bibbi-cluster-prod
   ECR_TASK_DEFINITION: bibbi-backend-prod
 

.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+.DS_Store
 
 ### STS ###
 .apt_generated

common/src/main/java/com/oing/exception/AuthorizationFailedException.java

@@ -1,6 +1,10 @@
 package com.oing.exception;
 
 public class AuthorizationFailedException extends DomainException {
+    public AuthorizationFailedException(ErrorCode errorCode) {
+        super(errorCode);
+    }
+
     public AuthorizationFailedException() {
         super(ErrorCode.AUTHORIZATION_FAILED);
     }

common/src/main/java/com/oing/exception/ErrorCode.java

@@ -18,55 +18,77 @@ public enum ErrorCode {
      */
     APP_UPDATE_REQUIRED("AV0001", "Update Required"),
     APP_KEY_NOT_FOUND("AV0002", "App Key Not Found"),
+
     /**
      * Auth Related Errors
      */
-    AUTHENTICATION_FAILED("AU0001", "Authentication failed"),
-    TOKEN_AUTHENTICATION_FAILED("AU0002", "Token Authentication failed"),
-    AUTHORIZATION_FAILED("AU0003", "No Permission"),
-    REFRESH_TOKEN_INVALID("AU0004", "Refresh Token is invalid"),
-    TOKEN_EXPIRED("AU0005", "Token is expired"),
+    AUTHENTICATION_FAILED("AU0001", "인증에 실패했습니다."),
+    TOKEN_AUTHENTICATION_FAILED("AU0002", "토큰을 통한 인증에 실패했습니다."),
+    AUTHORIZATION_FAILED("AU0003", "권한이 없습니다."),
+    REFRESH_TOKEN_INVALID("AU0004", "유효하지 않은 리프레쉬 토큰입니다."),
+    TOKEN_EXPIRED("AU0005", "토큰이 만료됐습니다."),
+    UNAUTHORIZED_MEMBER_USED("AU0006", "인증되지 않은/권한이 없는 회원에 접근하였습니다."),
+
     /**
      * Member Related Errors
      */
-    MEMBER_NOT_FOUND("MB0001", "Member not found"),
-    MEMBER_ALREADY_EXISTS("MB0002", "Member With That Credentials Already Exists"),
+    MEMBER_NOT_FOUND("MB0001", "찾을 수 없는 회원입니다."),
+    MEMBER_ALREADY_EXISTS("MB0002", "이미 존재하는 회원입니다."),
+    INVALID_MEMBER_NAME_LENGTH("MB0003", "회원 이름의 길이가 유효하지 않습니다."),
     /**
      * Post Related Errors
      */
-    POST_NOT_FOUND("PO0001", "Post not found"),
+    POST_NOT_FOUND("PO0001", "존재하지 않는 게시글입니다."),
+    INVALID_UPLOAD_TIME("PO0002", "게시글 업로드가 허용되지 않은 시간대입니다."),
+    DUPLICATE_SURVIVAL_POST_UPLOAD("PO0003", "이미 생존신고 게시글을 업로드했습니다."),
+    DUPLICATE_MISSION_POST_UPLOAD("PO0004", "이미 미션 게시글을 업로드했습니다."),
+    MISSION_POST_ACCESS_DENIED_FAMILY("PO0005", "미션 게시글 기능에 접근할 수 없는 가족입니다."),
+    MISSION_POST_CREATE_ACCESS_DENIED_MEMBER("PO0006", "미션 게시글 업로드 권한이 없는 회원입니다."),
 
     /**
      * Emoji Related Errors
      */
-    EMOJI_ALREADY_EXISTS("EM0001", "Emoji already exists"),
-    EMOJI_NOT_FOUND("EM0002", "Emoji not found"),
+    EMOJI_ALREADY_EXISTS("EM0001", "이미 존재하는 이모지입니다."),
+    EMOJI_NOT_FOUND("EM0002", "존재하지 않는 이모지입니다."),
+
     /**
      * Comment Related Errors
      */
-    POST_COMMENT_NOT_FOUND("CM0001", "Comment not found"),
+    POST_COMMENT_NOT_FOUND("CM0001", "존재하지 않는 댓글입니다."),
+
     /**
      * Family Related Errors
      */
-    FAMILY_NOT_FOUND("FM0001", "Family not found"),
-    ALREADY_IN_FAMILY("FM0002", "Already in family"),
+    FAMILY_NOT_FOUND("FM0001", "존재하지 않는 가족입니다."),
+    ALREADY_IN_FAMILY("FM0002", "이미 가족에 가입되어 있습니다."),
+
     /**
-     * Post Related Errors
+     * Real-Emoji Related Errors
      */
-    INVALID_UPLOAD_TIME("PO0001", "Invalid Upload Time. The request is outside the valid time range" +
-            "(from 12:00 AM yesterday to 12:00 AM today)."),
-    DUPLICATE_POST_UPLOAD("PO0002", "Duplicate Post Upload"),
+    REAL_EMOJI_NOT_FOUND("RE0001", "존재하지 않는 리얼이모지입니다."),
+    REAL_EMOJI_ALREADY_EXISTS("RE0002", "이미 존재하는 리얼이모지입니다."),
+    REGISTERED_REAL_EMOJI_NOT_FOUND("RE0003", "등록된 리얼이모지가 아닙니다."),
+    DUPLICATE_REAL_EMOJI("RE0004", "이미 등록된 리얼이모지입니다."),
+
     /**
-     * Real-Emoji Related Errors
+     * Mission Related Errors
      */
-    REAL_EMOJI_NOT_FOUND("RE0001", "Real-Emoji not found"),
-    REAL_EMOJI_ALREADY_EXISTS("RE0002", "Real-Emoji already exists"),
-    REGISTERED_REAL_EMOJI_NOT_FOUND("RE0003", "Registered Real-Emoji not found"),
-    DUPLICATE_REAL_EMOJI("RE0004", "Duplicate Real Emoji"),
+    MISSION_NOT_FOUND("MI0001", "존재하지 않는 미션입니다."),
+    DAILY_MISSION_HISTORY_NOT_FOUND("MI0002", "존재하지 않는 미션 히스토리입니다."),
+    DUPLICATED_DAILY_MISSION_HISTORY("MI0003", "이미 존재하는 미션 히스토리입니다."),
+
     /**
      * Deep Link Related Errors
      */
-    LINK_NOT_VALID("DL0001", "Link is not valid");
+    LINK_NOT_VALID("DL0001", "Link is not valid"),
+
+    /**
+     * Member Pick Related Errors
+     */
+    ALREADY_PICKED_TODAY("MP0001", "Already picked today"),
+    MEMBER_ALREADY_UPLOADED_POST("MP0002", "Member already uploaded post"),
+
+    ;
 
 
     private final String code;

common/src/main/java/com/oing/service/MemberBridge.java

@@ -1,5 +1,7 @@
 package com.oing.service;
 
+import java.util.List;
+
 /**
  * no5ing-server
  * User: CChuYong
@@ -31,4 +33,6 @@ public interface MemberBridge {
      * @return 삭제된 사용자인지 여부
      */
     boolean isDeletedMember(String memberId);
+
+    List<String> getFamilyMembersIdsByFamilyId(String familyId);
 }

common/src/main/java/com/oing/service/MissionBridge.java

@@ -0,0 +1,12 @@
+package com.oing.service;
+
+import java.time.LocalDate;
+
+public interface MissionBridge {
+
+    String getContentByMissionId(String missionId);
+
+    String getContentByDate(LocalDate date);
+
+    String getTodayMissionId();
+}

common/src/main/java/com/oing/service/PostBridge.java

@@ -0,0 +1,11 @@
+package com.oing.service;
+
+/**
+ * no5ing-server
+ * User: CChuYong
+ * Date: 3/31/24
+ * Time: 5:47 PM
+ */
+public interface PostBridge {
+    boolean isUploadedToday(String familyId, String memberId);
+}

gateway/build.gradle

@@ -12,11 +12,13 @@ dependencies {
     implementation project(':member')
     implementation project(':family')
     implementation project(':post')
+    implementation project(':mission')
 
     jacocoAggregation project(':common')
     jacocoAggregation project(':member')
     jacocoAggregation project(':family')
     jacocoAggregation project(':post')
+    jacocoAggregation project(':mission')
 
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'

gateway/src/main/java/com/oing/config/SpringWebExceptionHandler.java

@@ -4,9 +4,7 @@
 import com.oing.component.SentryGateway;
 import com.oing.domain.ErrorReportDTO;
 import com.oing.dto.response.ErrorResponse;
-import com.oing.exception.TokenNotValidException;
-import com.oing.exception.DomainException;
-import com.oing.exception.ErrorCode;
+import com.oing.exception.*;
 import io.jsonwebtoken.ExpiredJwtException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.ConstraintViolationException;

gateway/src/main/java/com/oing/controller/CalendarController.java

@@ -2,27 +2,33 @@
 
 import com.oing.domain.BannerImageType;
 import com.oing.domain.Post;
-import com.oing.dto.response.ArrayResponse;
-import com.oing.dto.response.BannerResponse;
-import com.oing.dto.response.CalendarResponse;
-import com.oing.dto.response.FamilyMonthlyStatisticsResponse;
+import com.oing.domain.PostType;
+import com.oing.dto.response.*;
 import com.oing.restapi.CalendarApi;
-import com.oing.service.FamilyService;
-import com.oing.service.MemberService;
-import com.oing.service.PostService;
+import com.oing.service.*;
 import com.oing.util.OptimizedImageUrlGenerator;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Controller;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.oing.domain.PostType.MISSION;
+import static com.oing.domain.PostType.SURVIVAL;
 
 @Controller
 @RequiredArgsConstructor
 public class CalendarController implements CalendarApi {
 
+    private final PostController postController;
+    private final MissionBridge missionBridge;
+    private final MemberBridge memberBridge;
+
     private final MemberService memberService;
     private final PostService postService;
     private final FamilyService familyService;
@@ -31,42 +37,78 @@ public class CalendarController implements CalendarApi {
 
 
     @Override
-    public ArrayResponse<CalendarResponse> getMonthlyCalendar(String yearMonth, String familyId) {
+    public ArrayResponse<DailyCalendarResponse> getDailyCalendar(String yearMonthDay, String loginMemberId, String loginFamilyId) {
+        List<DailyCalendarResponse> dailyCalendarResponses = new ArrayList<>();
+        LocalDate date = LocalDate.parse(yearMonthDay, DateTimeFormatter.ISO_DATE);
+
+        Collection<PostResponse> survivalPosts = postController.fetchDailyFeeds(1, 10, date, null, "ASC", SURVIVAL, loginMemberId).results();
+        Collection<PostResponse> missionPosts = postController.fetchDailyFeeds(1, 10, date, null, "ASC", MISSION, loginMemberId).results();
+        String missionContent = missionBridge.getContentByDate(date);
+        boolean allFamilyMembersUploaded = getAllFamilyMembersUploaded(survivalPosts, loginFamilyId);
+
+        dailyCalendarResponses.addAll(convertToDailyCalendarResponse(survivalPosts, missionContent, allFamilyMembersUploaded));
+        dailyCalendarResponses.addAll(convertToDailyCalendarResponse(missionPosts, missionContent, allFamilyMembersUploaded));
+        return ArrayResponse.of(dailyCalendarResponses);
+    }
+
+    private boolean getAllFamilyMembersUploaded(Collection<PostResponse> survivalPosts, String familyId) {
+        HashSet<String> uploadedFamilyMembers = survivalPosts.stream().map(PostResponse::authorId).collect(Collectors.toCollection(HashSet::new));
+        List<String> familyMembersIds = memberService.getFamilyMembersIdsByFamilyIdAndJoinAtBefore(familyId, LocalDate.now());
+
+        return uploadedFamilyMembers.containsAll(familyMembersIds);
+    }
+
+    private List<DailyCalendarResponse> convertToDailyCalendarResponse(Collection<PostResponse> posts, String missionContent, boolean allFamilyMembersUploaded) {
+        return posts.stream().map(post -> switch (PostType.fromString(post.type())) {
+            case MISSION -> DailyCalendarResponse.of(post, missionContent, allFamilyMembersUploaded);
+            case SURVIVAL -> DailyCalendarResponse.of(post, null, allFamilyMembersUploaded);
+        }).toList();
+    }
+
+
+    @Override
+    public ArrayResponse<MonthlyCalendarResponse> getMonthlyCalendar(String yearMonth, String familyId) {
         if (yearMonth == null) yearMonth = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
 
         LocalDate startDate = LocalDate.parse(yearMonth + "-01"); // yyyy-MM-dd 패턴으로 파싱
         LocalDate endDate = startDate.plusMonths(1);
 
         List<Post> daysLatestPosts = postService.findLatestPostOfEveryday(startDate, endDate, familyId);
-        List<CalendarResponse> calendarResponses = convertToCalendarResponse(daysLatestPosts, familyId);
-        return new ArrayResponse<>(calendarResponses);
+        List<MonthlyCalendarResponse> monthlyCalendarResponses = convertToMonthlyCalendarResponse(daysLatestPosts, familyId);
+        return new ArrayResponse<>(monthlyCalendarResponses);
     }
 
-    private List<CalendarResponse> convertToCalendarResponse(List<Post> daysLatestPosts, String familyId) {
-        List<CalendarResponse> calendarResponses = new ArrayList<>();
+    private List<MonthlyCalendarResponse> convertToMonthlyCalendarResponse(List<Post> daysLatestPosts, String familyId) {
+        List<MonthlyCalendarResponse> monthlyCalendarResponses = new ArrayList<>();
 
         for (Post dayLatestPost : daysLatestPosts) {
             LocalDate postDate = dayLatestPost.getCreatedAt().toLocalDate();
 
             // 탈퇴한 회원을 제외하고 allFamilyMembersUploaded 기본값이 true이므로, 탈퇴한 회원이 allFamilyMembersUploaded 계산에 영향을 미치지 않음
             // edge case: 글을 업로드하지 않은 회원이 탈퇴하면, 과거 날짜들의 allFamilyMembersUploaded이 true로 변함 -> 핸들링할 수 없는 케이스
-            List<String> familyMembersIds = memberService.findFamilyMembersIdsByFamilyJoinAtBefore(familyId, postDate.plusDays(1));
+            List<String> familyMembersIds = memberService.getFamilyMembersIdsByFamilyIdAndJoinAtBefore(familyId, postDate.plusDays(1));
             boolean allFamilyMembersUploaded = true;
             for (String memberId : familyMembersIds) {
-                if (!postService.existsByMemberIdAndFamilyIdAndCreatedAt(memberId, familyId, postDate)) {
+                if (!postService.existsByMemberIdAndFamilyIdAndTypeAndCreatedAt(memberId, familyId, SURVIVAL, postDate)) {
                     allFamilyMembersUploaded = false;
                     break;
                 }
             }
 
-            calendarResponses.add(new CalendarResponse(
+            monthlyCalendarResponses.add(new MonthlyCalendarResponse(
                     dayLatestPost.getCreatedAt().toLocalDate(),
                     dayLatestPost.getId(),
                     optimizedImageUrlGenerator.getThumbnailUrlGenerator(dayLatestPost.getPostImgUrl()),
                     allFamilyMembersUploaded
             ));
         }
-        return calendarResponses;
+        return monthlyCalendarResponses;
+    }
+
+
+    @Override
+    public ArrayResponse<MonthlyCalendarResponse> getMonthlyCalendarLegacy(String yearMonth, String familyId) {
+        return getMonthlyCalendar(yearMonth, familyId);
     }
 
 
@@ -95,9 +137,9 @@ public BannerResponse getBanner(String yearMonth, String familyId) {
             boolean allFamilyMembersUploaded = true;
 
             if (postService.existsByFamilyIdAndCreatedAt(familyId, startDate)) {
-                List<String> familyMembersIds = memberService.findFamilyMembersIdsByFamilyJoinAtBefore(familyId, startDate.plusDays(1));
+                List<String> familyMembersIds = memberService.getFamilyMembersIdsByFamilyIdAndJoinAtBefore(familyId, startDate.plusDays(1));
                 for (String memberId : familyMembersIds) {
-                    if (!postService.existsByMemberIdAndFamilyIdAndCreatedAt(memberId, familyId, startDate)) {
+                    if (!postService.existsByMemberIdAndFamilyIdAndTypeAndCreatedAt(memberId, familyId, SURVIVAL, startDate)) {
                         allFamilyMembersUploaded = false;
                         break;
                     }
@@ -161,13 +203,14 @@ private BannerImageType getBannerImageType(int familyLevel) {
         return bannerImageType;
     }
 
+
     @Override
     public FamilyMonthlyStatisticsResponse getSummary(String yearMonth, String loginMemberId) {
         String[] yearMonthArray = yearMonth.split("-");
         int year = Integer.parseInt(yearMonthArray[0]);
         int month = Integer.parseInt(yearMonthArray[1]);
 
-        String familyId = memberService.findFamilyIdByMemberId(loginMemberId);
+        String familyId = memberService.getFamilyIdByMemberId(loginMemberId);
         long monthlyPostCount = postService.countMonthlyPostByFamilyId(year, month, familyId);
         return new FamilyMonthlyStatisticsResponse((int) monthlyPostCount);
     }