YAPP-Github
diff --git a/‎build.gradle‎
Lines changed: 4 additions & 0 deletions b/‎build.gradle‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/Repository/AndroidAppVersionRepository.java‎
Lines changed: 11 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/Repository/AndroidAppVersionRepository.java‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/controller/AndroidAppVersionController.java‎
Lines changed: 30 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/controller/AndroidAppVersionController.java‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/controller/spec/AndroidAppVersionSpec.java‎
Lines changed: 24 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/controller/spec/AndroidAppVersionSpec.java‎
Lines changed: 24 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/domain/AndroidAppVersion.java‎
Lines changed: 31 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/domain/AndroidAppVersion.java‎
Lines changed: 31 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/response/ForceUpdateResponse.java‎
Lines changed: 12 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/response/ForceUpdateResponse.java‎
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/appVersion/service/AndroidAppVersionService.java‎
Lines changed: 44 additions & 0 deletions b/‎src/main/java/bitnagil/bitnagil_backend/appVersion/service/AndroidAppVersionService.java‎
Lines changed: 44 additions & 0 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java‎
Lines changed: 1 addition & 2 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/CustomOAuth2User.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/OAuth2Attribute.java‎
Lines changed: 2 additions & 2 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/domain/OAuth2Attribute.java‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java‎
Lines changed: 1 addition & 2 deletions b/‎src/main/java/bitnagil/bitnagil_backend/auth/kakao/service/CustomOAuth2UserService.java‎
Lines changed: 1 addition & 2 deletions
@@ -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') {
 
@@ -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();
+}
@@ -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));
+    }
+}
@@ -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);
+}
@@ -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; // 버전의 가장 우측 숫자
+}
+
@@ -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;
+}
@@ -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();
+    }
+}
@@ -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;
 
 /**
 
@@ -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;
 
 
@@ -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;