Merge pull request #33 from Nexters/dev

1차 MVP 개선 배포

Author: Jeongminyooa

.github/workflows/cd.yml

@@ -43,6 +43,10 @@ jobs:
           echo "${{ secrets.PROPERTIES_PROD }}" > ./application-prod.properties
         shell: bash
 
+      - name: Add FCM service account JSON key
+        run: |
+          echo "${{ secrets.FCM_SERVICE_ACCOUNT_JSON }}" > ./resources/donmani-5d3f6-firebase-adminsdk-fbsvc-22a01911fd.json
+
       #test를 제외한 프로젝트 빌드
       - name: Build With Gradle
         run: ./gradlew build -x test
@@ -81,5 +85,5 @@ jobs:
           docker stop donmani
           docker rm donmani
           sudo docker pull ${{ secrets.DOCKER_HUB_USERNAME }}/donmani
-          docker run -d --name donmani -p 8080:8080 ${{ secrets.DOCKER_HUB_USERNAME }}/donmani
+          docker run -d --name donmani --network donmani-network -p 8080:8080 ${{ secrets.DOCKER_HUB_USERNAME }}/donmani
           docker images -f "dangling=true" -q | xargs -r docker rmi -f

.gitignore

@@ -37,4 +37,7 @@ out/
 .vscode/
 
 ### Log ###
-**/*.log
+**/*.log
+
+# Firebase Admin SDK JSON Key
+/src/main/resources/*.json

build.gradle

@@ -34,6 +34,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.4'
+	implementation 'com.google.firebase:firebase-admin:9.4.3'
 }
 
 tasks.named('test') {

src/main/java/donmani/donmani_server/DonmaniServerApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class DonmaniServerApplication {
 
 	public static void main(String[] args) {

src/main/java/donmani/donmani_server/appversion/controller/AppVersionController.java

@@ -0,0 +1,26 @@
+package donmani.donmani_server.appversion.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+
+import donmani.donmani_server.appversion.entity.PlatformType;
+import donmani.donmani_server.appversion.dto.AppVersionDTO;
+import donmani.donmani_server.appversion.service.AppVersionService;
+import donmani.donmani_server.common.httpStatus.HttpStatusDTO;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class AppVersionController {
+	private final AppVersionService appVersionService;
+
+	@GetMapping("api/v1/appVersion/{platformType}")
+	public ResponseEntity<HttpStatusDTO<AppVersionDTO>> getLatestVersion(@PathVariable PlatformType platformType) {
+		AppVersionDTO appVersion = appVersionService.getLatestVersionByPlatform((platformType));
+		return ResponseEntity.ok(
+			HttpStatusDTO.response(HttpStatus.OK.value(), "성공", appVersion));
+	}
+}

src/main/java/donmani/donmani_server/appversion/dto/AppVersionDTO.java

@@ -0,0 +1,19 @@
+package donmani.donmani_server.appversion.dto;
+
+import donmani.donmani_server.appversion.entity.PlatformType;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class AppVersionDTO {
+	private PlatformType platformType;
+	private String latestVersion;
+	private String forcedUpdateYn;
+}

src/main/java/donmani/donmani_server/appversion/entity/AppVersion.java

@@ -0,0 +1,31 @@
+package donmani.donmani_server.appversion.entity;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppVersion {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Long id;
+
+	@Enumerated(EnumType.STRING)
+	private PlatformType platformType;
+
+	private String latestVersion;
+
+	private String forceUpdateYn;  // 강제 업데이트 여부
+}

src/main/java/donmani/donmani_server/appversion/entity/PlatformType.java

@@ -0,0 +1,6 @@
+package donmani.donmani_server.appversion.entity;
+
+public enum PlatformType {
+	Android,
+	iOS
+}

src/main/java/donmani/donmani_server/appversion/repository/AppVersionRepository.java

@@ -0,0 +1,13 @@
+package donmani.donmani_server.appversion.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import donmani.donmani_server.appversion.entity.PlatformType;
+import donmani.donmani_server.appversion.entity.AppVersion;
+
+public interface AppVersionRepository extends JpaRepository<AppVersion, Long> {
+	@Query("SELECT a FROM AppVersion a WHERE a.platformType = :platformType ORDER BY a.id DESC LIMIT 1")
+	AppVersion findLatestVersionByPlatform(@Param("platformType") PlatformType platformType);
+}

src/main/java/donmani/donmani_server/appversion/service/AppVersionService.java

@@ -0,0 +1,26 @@
+package donmani.donmani_server.appversion.service;
+
+import org.springframework.stereotype.Service;
+
+import donmani.donmani_server.appversion.entity.PlatformType;
+import donmani.donmani_server.appversion.repository.AppVersionRepository;
+import donmani.donmani_server.appversion.dto.AppVersionDTO;
+import donmani.donmani_server.appversion.entity.AppVersion;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class AppVersionService {
+
+	private final AppVersionRepository appVersionRepository;
+
+	public AppVersionDTO getLatestVersionByPlatform(PlatformType platformType) {
+		AppVersion appVersion = appVersionRepository.findLatestVersionByPlatform(platformType);
+
+		return AppVersionDTO.builder()
+			.platformType(appVersion.getPlatformType())
+			.latestVersion(appVersion.getLatestVersion())
+			.forcedUpdateYn(appVersion.getForceUpdateYn())
+			.build();
+	}
+}