v2.0.0: release 2차 운영 배포

build.gradle

@@ -67,6 +67,10 @@ dependencies {
 	// flyway
 	implementation 'org.flywaydb:flyway-core'
 	implementation 'org.flywaydb:flyway-mysql'
+
+	// cache
+	implementation 'org.springframework.boot:spring-boot-starter-cache'
+
 }
 
 tasks.named('test') {

src/main/java/bitnagil/bitnagil_backend/appVersion/Repository/AndroidAppVersionRepository.java

@@ -0,0 +1,11 @@
+package bitnagil.bitnagil_backend.appVersion.Repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import bitnagil.bitnagil_backend.appVersion.domain.AndroidAppVersion;
+
+public interface AndroidAppVersionRepository extends JpaRepository<AndroidAppVersion, Long> {
+
+    // major, minor가 가장 높은 AndroidAppVersion을 조회
+    AndroidAppVersion findFirstByOrderByMajorDescMinorDesc();
+}

src/main/java/bitnagil/bitnagil_backend/appVersion/controller/AndroidAppVersionController.java

@@ -0,0 +1,30 @@
+package bitnagil.bitnagil_backend.appVersion.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import bitnagil.bitnagil_backend.appVersion.controller.spec.AndroidAppVersionSpec;
+import bitnagil.bitnagil_backend.appVersion.response.ForceUpdateResponse;
+import bitnagil.bitnagil_backend.appVersion.service.AndroidAppVersionService;
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(value = "/api/v1/version")
+public class AndroidAppVersionController implements AndroidAppVersionSpec {
+
+    private final AndroidAppVersionService androidAppVersionService;
+
+    @GetMapping("/android/check")
+    public CustomResponseDto<ForceUpdateResponse> validateForceUpdateRequired(
+        @RequestParam int major,
+        @RequestParam int minor,
+        // 추후에 patch를 최소 버전 기준에 추가될 때 사용하기 위함
+        @RequestParam int patch) {
+
+        return CustomResponseDto.from(androidAppVersionService.validateForceUpdateRequired(major, minor));
+    }
+}

src/main/java/bitnagil/bitnagil_backend/appVersion/controller/spec/AndroidAppVersionSpec.java

@@ -0,0 +1,24 @@
+package bitnagil.bitnagil_backend.appVersion.controller.spec;
+
+import bitnagil.bitnagil_backend.appVersion.response.ForceUpdateResponse;
+import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
+import bitnagil.bitnagil_backend.global.swagger.ApiTags;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = ApiTags.APP_VERSION)
+public interface AndroidAppVersionSpec {
+
+    @Operation(
+        summary = "강제 업데이트 여부 검증",
+        description = "사용자의 앱 Major, Minor, Patch 버전을 받아 강제 업데이트 필요 여부를 판단합니다."
+    )
+    @Parameters({
+        @Parameter(name = "major", description = "앱 Major 버전", required = true, example = "1"),
+        @Parameter(name = "minor", description = "앱 Minor 버전", required = true, example = "5"),
+        @Parameter(name = "patch", description = "앱 Patch 버전 (추후 사용 예정)", required = true, example = "0")
+    })
+    CustomResponseDto<ForceUpdateResponse> validateForceUpdateRequired(int major, int minor, int patch);
+}

src/main/java/bitnagil/bitnagil_backend/appVersion/domain/AndroidAppVersion.java

@@ -0,0 +1,31 @@
+package bitnagil.bitnagil_backend.appVersion.domain;
+
+import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class AndroidAppVersion extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long versionId; // 버전 ID
+
+    @NotNull
+    private Integer major; // 버전의 가장 좌측 숫자
+
+    @NotNull
+    private Integer minor; // 버전의 가장 중앙 숫자
+
+    @NotNull
+    private Integer patch; // 버전의 가장 우측 숫자
+}
+

src/main/java/bitnagil/bitnagil_backend/appVersion/response/ForceUpdateResponse.java

@@ -0,0 +1,12 @@
+package bitnagil.bitnagil_backend.appVersion.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class ForceUpdateResponse {
+    private boolean forceUpdateYn;
+}

src/main/java/bitnagil/bitnagil_backend/appVersion/service/AndroidAppVersionService.java

@@ -0,0 +1,44 @@
+package bitnagil.bitnagil_backend.appVersion.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import bitnagil.bitnagil_backend.appVersion.Repository.AndroidAppVersionRepository;
+import bitnagil.bitnagil_backend.appVersion.domain.AndroidAppVersion;
+import bitnagil.bitnagil_backend.appVersion.response.ForceUpdateResponse;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AndroidAppVersionService {
+
+    private final AndroidAppVersionRepository androidAppVersionRepository;
+
+    @Transactional(readOnly = true)
+    public ForceUpdateResponse validateForceUpdateRequired(Integer clientMajor, Integer clientMinor) {
+
+        AndroidAppVersion latestVersion = androidAppVersionRepository.findFirstByOrderByMajorDescMinorDesc();
+
+        // major 비교
+        if (clientMajor < latestVersion.getMajor()) {
+            // major 버전이 최소 요구 major 버전보다 낮으면 강제 업데이트 필요
+            return ForceUpdateResponse.builder()
+                .forceUpdateYn(true)
+                .build();
+        }
+
+        if (clientMajor.equals(latestVersion.getMajor())) {
+            // major 같으면 minor 비교
+            if (clientMinor < latestVersion.getMinor()) {
+                return ForceUpdateResponse.builder()
+                    .forceUpdateYn(true)
+                    .build();
+            }
+        }
+
+        // 강제 업데이트 필요하지 않은 경우
+        return ForceUpdateResponse.builder()
+            .forceUpdateYn(false)
+            .build();
+    }
+}

src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java

@@ -6,8 +6,7 @@
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 
-import bitnagil.bitnagil_backend.enums.Role;
-import bitnagil.bitnagil_backend.global.entity.HistoryPk;
+import bitnagil.bitnagil_backend.user.domain.enums.Role;
 import lombok.Getter;
 
 /**

src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/OAuth2Attribute.java

@@ -3,11 +3,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import bitnagil.bitnagil_backend.enums.SocialType;
+import bitnagil.bitnagil_backend.user.domain.enums.SocialType;
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.exception.CustomException;
 import bitnagil.bitnagil_backend.user.domain.User;
-import bitnagil.bitnagil_backend.enums.Role;
+import bitnagil.bitnagil_backend.user.domain.enums.Role;
 import lombok.Builder;
 import lombok.Getter;
 

src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java

@@ -1,6 +1,5 @@
 package bitnagil.bitnagil_backend.auth.kakao.service;
 
-import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.Map;
 
@@ -17,7 +16,7 @@
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.exception.CustomException;
 import bitnagil.bitnagil_backend.user.repository.UserRepository;
-import bitnagil.bitnagil_backend.enums.SocialType;
+import bitnagil.bitnagil_backend.user.domain.enums.SocialType;
 import bitnagil.bitnagil_backend.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/bitnagil/bitnagil_backend/emotionMarble/controller/EmotionMarbleController.java

@@ -3,6 +3,7 @@
 import bitnagil.bitnagil_backend.emotionMarble.controller.spec.EmotionMarbleSpec;
 import bitnagil.bitnagil_backend.emotionMarble.request.RegisterEmotionMarbleRequest;
 import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponse;
+import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponseV2;
 import bitnagil.bitnagil_backend.emotionMarble.response.RegisterEmotionMarbleResponse;
 import bitnagil.bitnagil_backend.emotionMarble.service.EmotionMarbleService;
 import bitnagil.bitnagil_backend.global.annotation.CurrentUser;
@@ -18,27 +19,38 @@
 
 @RestController
 @RequiredArgsConstructor
-@RequestMapping(value = "/api/v1/emotion-marbles")
+@RequestMapping(value = "/api")
 public class EmotionMarbleController implements EmotionMarbleSpec {
     private final EmotionMarbleService emotionMarbleService;
 
     // 감정구슬 조회 API
-    @GetMapping("")
+    @GetMapping("/v1/emotion-marbles")
     public CustomResponseDto<List<EmotionMarbleTypeResponse>> getEmotionMarbles() {
         return CustomResponseDto.from(emotionMarbleService.getEmotionMarbles());
     }
 
     // 감정구슬 등록 API
-    @PostMapping("")
+    @PostMapping("/v1/emotion-marbles")
     public CustomResponseDto<RegisterEmotionMarbleResponse> registryEmotionMarble(
         @CurrentUser User user,
         @RequestBody RegisterEmotionMarbleRequest request) {
 
         return CustomResponseDto.from(emotionMarbleService.registryEmotionMarble(user, request));
     }
 
+    // todo: 당일의 유저가 선택한 감정 구슬 조회 API V2로 변환
+    @GetMapping("/v2/emotion-marbles/{searchDate}")
+    public CustomResponseDto<EmotionMarbleTypeResponseV2> getEmotionMarbleBySearchDateV2(
+            @CurrentUser User user,
+            @PathVariable LocalDate searchDate) {
+
+        return CustomResponseDto.from(emotionMarbleService.getEmotionMarbleBySearchDateV2(user, searchDate));
+    }
+
     // 당일의 유저가 선택한 감정 구슬 조회 API
-    @GetMapping("/{searchDate}")
+    // TODO: v2로 전환 시 deprecated 처리
+    @Deprecated()
+    @GetMapping("/v1/emotion-marbles/{searchDate}")
     public CustomResponseDto<EmotionMarbleTypeResponse> getEmotionMarbleBySearchDate(
         @CurrentUser User user,
         @PathVariable @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate searchDate) {

src/main/java/bitnagil/bitnagil_backend/emotionMarble/controller/spec/EmotionMarbleSpec.java

@@ -2,8 +2,8 @@
 
 import bitnagil.bitnagil_backend.emotionMarble.request.RegisterEmotionMarbleRequest;
 import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponse;
+import bitnagil.bitnagil_backend.emotionMarble.response.EmotionMarbleTypeResponseV2;
 import bitnagil.bitnagil_backend.emotionMarble.response.RegisterEmotionMarbleResponse;
-import bitnagil.bitnagil_backend.global.annotation.CurrentUser;
 import bitnagil.bitnagil_backend.global.errorcode.ErrorCode;
 import bitnagil.bitnagil_backend.global.response.CustomResponseDto;
 import bitnagil.bitnagil_backend.global.swagger.ApiErrorCodeExamples;
@@ -14,14 +14,11 @@
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.constraints.NotNull;
 
 import java.time.LocalDate;
 import java.util.List;
 
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 
 @Tag(name = ApiTags.EMOTION_MARBLE)
 public interface EmotionMarbleSpec {
@@ -34,6 +31,14 @@ public interface EmotionMarbleSpec {
     public CustomResponseDto<RegisterEmotionMarbleResponse> registryEmotionMarble(
         User user, RegisterEmotionMarbleRequest request);
 
+    @Operation(summary = "(V2) 검색 날짜 기준으로 대한 유저의 감정구슬 정보를 조회합니다.")
+    @Parameters({
+            @Parameter(name = "searchDate", description = "감정 구슬 조회 날짜", required = true, example = "2025-08-15",
+                    in = ParameterIn.PATH)
+    })
+    CustomResponseDto<EmotionMarbleTypeResponseV2> getEmotionMarbleBySearchDateV2(
+            User user, @PathVariable LocalDate searchDate);
+
     @Operation(summary = "검색 날짜 기준으로 대한 유저의 감정구슬 정보를 조회합니다.")
     @Parameters({
         @Parameter(name = "searchDate", description = "감정 구슬 조회 날짜", required = true, example = "2025-07-01",

src/main/java/bitnagil/bitnagil_backend/emotionMarble/domain/enums/EmotionMarbleType.java

@@ -7,16 +7,42 @@
 @RequiredArgsConstructor
 @Getter
 public enum EmotionMarbleType implements EnumType {
-    CALM("평온함", 5L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_calm.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_calm.png"),
-    VITALITY("활기참", 6L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_vitality.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_vitality.png"),
-    LETHARGY("무기력함", 7L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_lethargy.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_lethargy.png"),
-    ANXIETY("불안함", 8L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_anxiety.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_anxiety.png"),
-    SATISFACTION("만족함", 9L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_satisfaction.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_satisfaction.png"),
-    FATIGUE("피로함", 10L, "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_fatigue.png", "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_fatigue.png")
+    CALM("평온함", 5L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_calm.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_calm_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_calm.png",
+            "오늘은 평온하군요~"),
+    VITALITY("활기참", 6L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_vitality.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_vitality_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_vitality.png",
+            "오늘은 활기차군요~"),
+    LETHARGY("무기력함", 7L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_lethargy.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_lethargy_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_lethargy.png",
+            "오늘은 무기력한가요?"),
+    ANXIETY("불안함", 8L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_anxiety.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_anxiety_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_anxiety.png",
+            "오늘은 불안한가요?"),
+    SATISFACTION("만족함", 9L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_satisfaction.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_satisfaction_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_satisfaction.png",
+            "오늘은 만족하는군요~"),
+    FATIGUE("피로함", 10L,
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_fatigue.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/home_fatigue_v2.png",
+            "https://bitnagil-s3.s3.ap-northeast-2.amazonaws.com/marble_fatigue.png",
+            "오늘은 피곤한가요?"),
     ;
 
     private final String description;
     private final Long caseId;
-    private final String homeMarbleImageUrl;
+    private final String homeMarbleImageUrlV1;
+    private final String homeMarbleImageUrlV2;
     private final String marbleImageUrl;
+    private final String homeMessage;
 }

src/main/java/bitnagil/bitnagil_backend/emotionMarble/response/EmotionMarbleTypeResponseV2.java

@@ -0,0 +1,25 @@
+package bitnagil.bitnagil_backend.emotionMarble.response;
+
+import bitnagil.bitnagil_backend.emotionMarble.domain.enums.EmotionMarbleType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+@Schema(description = "감정 구슬 조회 DTO")
+public class EmotionMarbleTypeResponseV2 {
+    @Schema(description = "감정 구슬 타입", example = "CALM")
+    private EmotionMarbleType emotionMarbleType;
+
+    @Schema(description = "감정 구슬 명칭", example = "평온함")
+    private String emotionMarbleName;
+
+    @Schema(description = "감정 구슬 이미지 URL (홈/구슬 선택 화면 이미지 다름)", example = "https://example.com/image/calm.png")
+    private String imageUrl;
+
+    @Schema(description = "감정 구슬 홈 화면 메시지", example = "오늘은 평온하군요~")
+    private String emotionMarbleHomeMessage;
+}