Merge pull request #395 from wafflestudio/develop

Release

Author: asp345

.github/workflows/ci.yml

@@ -8,23 +8,23 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-northeast-2
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Run Tests

.github/workflows/deploy-dev.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   deploy:
     name: Deploy-dev
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     env:
       IMAGE_TAG: ${{ github.run_number }}
       BUILD_NUMBER: ${{ github.run_number }}
@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-northeast-2
 
       - name: Login to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Get and save Auth Token for CodeArtifact
         id: get-save-codeartifact-auth-token

.github/workflows/deploy-prod.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   deploy:
     name: Deploy-prod
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     env:
       IMAGE_TAG: ${{ github.run_number }}
       BUILD_NUMBER: ${{ github.run_number }}
@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: ap-northeast-2
 
       - name: Login to ECR
         id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
+        uses: aws-actions/amazon-ecr-login@v2
 
       - name: Get and save Auth Token for CodeArtifact
         id: get-save-codeartifact-auth-token
@@ -45,7 +45,7 @@ jobs:
           echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
 
       - name: Slack Notify
-        uses: rtCamp/action-slack-notify@v2.1.2
+        uses: rtCamp/action-slack-notify@v2.3.3
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_CHANNEL: team-snutt-deploy

.github/workflows/lint.yml

@@ -8,16 +8,16 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Run Lint

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:21-alpine
 WORKDIR /app
 ARG CODEARTIFACT_AUTH_TOKEN
 COPY . /app

Dockerfile-batch

@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-slim
+FROM eclipse-temurin:21-alpine
 WORKDIR /app
 ARG CODEARTIFACT_AUTH_TOKEN
 COPY . /app

api/build.gradle.kts

@@ -1,20 +1,22 @@
 plugins {
     id("org.springframework.boot")
-    id("org.unbroken-dome.test-sets") version "4.0.0"
+    id("org.unbroken-dome.test-sets") version "4.1.0"
 }
 
 dependencies {
     implementation(project(":core"))
 
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
 
-    implementation("io.jsonwebtoken:jjwt:0.9.1")
-    runtimeOnly("javax.xml.bind:jaxb-api:2.1")
+    implementation("io.jsonwebtoken:jjwt-api:0.12.6")
+    implementation("io.jsonwebtoken:jjwt-impl:0.12.6")
+    implementation("io.jsonwebtoken:jjwt-jackson:0.12.6")
+    runtimeOnly("jakarta.xml.bind:jakarta.xml.bind-api:4.0.2")
 
     testImplementation(testFixtures(project(":core")))
     testImplementation("org.springframework.boot:spring-boot-testcontainers")
-    testImplementation("org.testcontainers:mongodb:1.19.0")
-    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.1.2")
+    testImplementation("org.testcontainers:mongodb:1.21.3")
+    testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
 }
 
 tasks.bootJar {

api/src/main/kotlin/filter/ErrorWebFilter.kt

@@ -26,8 +26,9 @@ class ErrorWebFilter(
     override fun filter(
         exchange: ServerWebExchange,
         chain: WebFilterChain,
-    ): Mono<Void> {
-        return chain.filter(exchange)
+    ): Mono<Void> =
+        chain
+            .filter(exchange)
             .onErrorResume { throwable ->
                 val errorBody: ErrorBody
                 val httpStatusCode: HttpStatusCode
@@ -38,6 +39,7 @@ class ErrorWebFilter(
                             throwable.errorResponse.let {
                                 ErrorBody(
                                     it.error.code,
+                                    "",
                                     it.error.message,
                                     it.error.message,
                                 )
@@ -79,15 +81,14 @@ class ErrorWebFilter(
                     Mono.empty()
                 }
             }
-    }
 
-    private fun makeErrorBody(exception: SnuttException): ErrorBody {
-        return ErrorBody(exception.error.errorCode, exception.errorMessage, exception.displayMessage, exception.ext)
-    }
+    private fun makeErrorBody(exception: SnuttException): ErrorBody =
+        ErrorBody(exception.error.errorCode, exception.title, exception.errorMessage, exception.displayMessage, exception.ext)
 }
 
 private data class ErrorBody(
     val errcode: Long,
+    val title: String,
     val message: String,
     val displayMessage: String,
     // TODO: 구버전 대응용 ext 필드. 추후 삭제

api/src/main/kotlin/handler/AdminHandler.kt

@@ -7,6 +7,8 @@ import com.wafflestudio.snutt.clientconfig.service.ClientConfigService
 import com.wafflestudio.snutt.common.dto.OkResponse
 import com.wafflestudio.snutt.common.storage.StorageService
 import com.wafflestudio.snutt.common.storage.StorageSource
+import com.wafflestudio.snutt.diary.dto.request.DiaryAddQuestionRequestDto
+import com.wafflestudio.snutt.diary.service.DiaryService
 import com.wafflestudio.snutt.middleware.SnuttRestAdminApiMiddleware
 import com.wafflestudio.snutt.notification.service.NotificationAdminService
 import com.wafflestudio.snutt.popup.dto.PopupResponse
@@ -24,6 +26,7 @@ class AdminHandler(
     private val configService: ClientConfigService,
     private val storageService: StorageService,
     private val popupService: PopupService,
+    private val diaryService: DiaryService,
     snuttRestAdminApiMiddleware: SnuttRestAdminApiMiddleware,
 ) : ServiceHandler(snuttRestAdminApiMiddleware) {
     suspend fun insertNotification(req: ServerRequest) =
@@ -90,4 +93,46 @@ class AdminHandler(
 
             popupService.deletePopup(popupId)
         }
+
+    suspend fun getDiaryQuestions(req: ServerRequest) =
+        handle(req) {
+            diaryService.getActiveQuestions()
+        }
+
+    suspend fun insertDiaryQuestion(req: ServerRequest) =
+        handle(req) {
+            val body = req.awaitBody<DiaryAddQuestionRequestDto>()
+
+            diaryService.addQuestion(body)
+            OkResponse()
+        }
+
+    suspend fun removeDiaryQuestion(req: ServerRequest) =
+        handle(req) {
+            val questionId = req.pathVariable("id")
+
+            diaryService.removeQuestion(questionId)
+            OkResponse()
+        }
+
+    suspend fun getAllDiaryActivities(req: ServerRequest) =
+        handle(req) {
+            diaryService.getAllActivities()
+        }
+
+    suspend fun insertDiaryActivity(req: ServerRequest) =
+        handle(req) {
+            val name = req.parseRequiredQueryParam<String>("name")
+
+            diaryService.addOrEnableActivity(name)
+            OkResponse()
+        }
+
+    suspend fun removeDiaryActivity(req: ServerRequest) =
+        handle(req) {
+            val name = req.parseRequiredQueryParam<String>("name")
+
+            diaryService.disableActivity(name)
+            OkResponse()
+        }
 }

api/src/main/kotlin/handler/BuildingHandler.kt

@@ -18,7 +18,8 @@ class BuildingHandler(
     suspend fun searchBuildings(req: ServerRequest): ServerResponse =
         handle(req) {
             val placesQuery =
-                req.parseRequiredQueryParam<String>("places")
+                req
+                    .parseRequiredQueryParam<String>("places")
                     .split(",")
                     .flatMap { PlaceInfo.getValuesOf(it) }
                     .distinct()