Deploy for PROD

.github/workflows/CD-dev.yml

@@ -12,16 +12,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      #jdk 세팅
+      # 1) 워크플로우 실행 전 기본적으로 체크아웃 필요
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+
+      # 2) JDK 17 버전 설치
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: 'zulu'
 
-      #gradle 캐싱
-      - name: Gradle Caching
+      # 3) Gradle Caching
+      - name: Gradle Cashing
         uses: actions/cache@v3
         with:
           path: |
@@ -30,38 +32,39 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-
 
-      #배포를 위한 secret yml 설정
+      # 4) Gradle 권한 부여
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # 5) Set for application-secret.yml
       - name: Make application-secret.yml
         run: |
           cd ./src/main/resources
           touch ./application-secret.yml
           echo "${{ secrets.PROPERTIES_SECRET }}" > ./application-secret.yml
         shell: bash
 
-      #로그 xml 파일 설정
+      # 6) 로그 xml 파일 설정
       - name: Make logback-spring.xml
         run: |
           cd ./src/main/resources
           touch ./logback-spring.xml
           echo "${{ secrets.LOGBACK_SPRING }}" > ./logback-spring.xml
         shell: bash
 
-
-
-      #test를 포함한 프로젝트 빌드
+      # 7) jar 파일 생성
       - name: Build With Gradle
         run: ./gradlew bootJar
 
-      # Docker 빌드 & 푸쉬
+      # 8) Docker 빌드 & 푸쉬
       - name: docker build and push
         run: |
           docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
           docker build -f Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY}} .
           docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY}}
 
-      # Deploy (DEV-Server)
+      # 9) Deploy (DEV-Server)
       - name: Deploy (DEV)
         uses: appleboy/ssh-action@master
         with:

.github/workflows/CD.yml

@@ -18,12 +18,11 @@ jobs:
 
     steps:
       #jdk 세팅
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: 'zulu'
 
       #gradle 캐싱
       - name: Gradle Caching
@@ -35,7 +34,9 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-
+
+      - name: Grant Execute Permission For Gradlew
+        run: chmod +x gradlew
 
       #배포를 위한 secret yml 설정
       - name: Make application-secret.yml

.github/workflows/CI-Sonar.yml

@@ -20,35 +20,42 @@ jobs:
     name: Build and analyze
     runs-on: ubuntu-latest
     steps:
+
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: 11
-          distribution: 'temurin' # Alternative distribution options are available
+          java-version: 17
+          distribution: 'zulu'
+
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-#      - name: Gradle Caching
-#        uses: actions/cache@v3
-#        with:
-#          path: |
-#            ~/.gradle/caches
-#            ~/.gradle/wrapper
-#          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-#          restore-keys: |
-#            ${{ runner.os }}-gradle-
+
+      - name: Gradle Caching
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
       - name : Update gradlew access authorized
         run: chmod +x gradlew
-      - name : Clean gradle
-        run : ./gradlew clean
-      - name : Stop gradle
-        run : ./gradlew --stop
+
+#      - name : Clean gradle
+#        run : ./gradlew clean
+#
+#      - name : Stop gradle
+#        run : ./gradlew --stop
 
       #test를 위한 mysql설정
       - name: Start MySQL
@@ -73,8 +80,9 @@ jobs:
           touch ./application-test.yml
           echo "${{ secrets.PROPERTIES_TEST }}" > ./application-test.yml
         shell: bash
+
       - name: Build and analyze
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: ./gradlew build sonarqube --info

.github/workflows/CI.yml

@@ -13,12 +13,11 @@ jobs:
 
     steps:
       #jdk 세팅
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: 'zulu'
 
       #gradle 캐싱
       - name: Gradle Caching

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:11-jdk
+FROM openjdk:17-jdk
 ARG JAR_FILE=./build/libs/jhouse_server-0.0.1-SNAPSHOT.jar
 COPY ${JAR_FILE} app.jar
 ENTRYPOINT ["java", "-Duser.timezone=Asia/Seoul", "-jar", "/app.jar","--spring.profiles.active=dev"]

build.gradle.kts

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.jetbrains.kotlin.kapt3.base.Kapt.kapt
 
 plugins {
     id("org.springframework.boot") version "2.7.8"
@@ -30,7 +29,7 @@ sonarqube {
 
 group = "com.example"
 version = "0.0.1-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
     mavenCentral()
@@ -87,7 +86,7 @@ dependencies {
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         freeCompilerArgs = listOf("-Xjsr305=strict")
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
 }
 

src/main/kotlin/com/example/jhouse_server/admin/anaylsis/controller/AdminAnalysisController.kt

@@ -10,21 +10,42 @@ import org.springframework.web.bind.annotation.RequestMapping
 @Controller
 @RequestMapping("/admin/analysis")
 class AdminAnalysisController (
+    /**
+     * =============================================================================================
+     *  DI for Service
+     * =============================================================================================
+     * */
     val analysisService: AnalysisService
         ){
-
+    /**
+     * =============================================================================================
+     * 사용자(일반 사용자, 공인중개사 ) 회원 가입 경로 조회
+     *
+     * @author YoonTaeminnnn
+     * @param model
+     * @return analysis/joinPath 회원 가입 경로 페이지
+     * =============================================================================================
+     * */
     @GetMapping("/join-path")
     fun getAnalysisJoinPath(model : Model) : String {
         val result = analysisService.getAnalysisJoinPathResult()
-        model.addAttribute("joinPathResults", result)
+        model.addAttribute("joinPathResults", result) // 가입 경로 결과
         return "analysis/joinPath"
 
     }
-
+    /**
+     * =============================================================================================
+     * 사용자 연령대 조회
+     *
+     * @author YoonTaeminnnn
+     * @param model
+     * @return analysis/age 연령대 페이지
+     * =============================================================================================
+     * */
     @GetMapping("/age")
     fun getAnalysisAge(model : Model) : String {
         val result = analysisService.getAnalysisAgeResult()
-        val label = Age.values().map { it.value }
+        val label = Age.values().map { it.value } // Age enum class value 리스트 추출
         model.addAttribute("rate", result.map { it.rate })
         model.addAttribute("count", result.map { it.count })
         model.addAttribute("label", label)

src/main/kotlin/com/example/jhouse_server/admin/anaylsis/dto/AnalysisJoinPathResponse.kt

@@ -1,11 +1,26 @@
 package com.example.jhouse_server.admin.anaylsis.dto
 
+/**
+ * =============================================================================================
+ * AnalysisJoinPathResponse -- 회원 가입 경로 응답 DTO
+ * joinPath                 -- 가입경로명
+ * rate                     -- 비율
+ * count                    -- 실제 수
+ * =============================================================================================
+ */
 data class AnalysisJoinPathResponse(
         val joinPath : String,
         val rate : Double,
         val count : Int,
 )
-
+/**
+ * =============================================================================================
+ * AnalysisAgeResponse      -- 회원 연령대 응답 DTO
+ * age                      -- 연령대명 ( Age enum class 참고 )
+ * rate                     -- 비율
+ * count                    -- 실제 수
+ * =============================================================================================
+ */
 data class AnalysisAgeResponse(
         val age: String,
         val rate : Double,