From 1b3758a9e507fb581adcb69af32ee6adf99361c4 Mon Sep 17 00:00:00 2001 From: Hank-Choi Date: Fri, 9 Jan 2026 17:01:44 +0900 Subject: [PATCH 1/4] =?UTF-8?q?github=20workflow=20target=5Fbranch=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/_deploy-native.yml | 6 ------ .github/workflows/_deploy.yml | 6 ------ .github/workflows/deploy-manual-native.yml | 5 ----- .github/workflows/deploy-manual.yml | 5 ----- 4 files changed, 22 deletions(-) diff --git a/.github/workflows/_deploy-native.yml b/.github/workflows/_deploy-native.yml index ba48d90e..6c1703cf 100644 --- a/.github/workflows/_deploy-native.yml +++ b/.github/workflows/_deploy-native.yml @@ -3,10 +3,6 @@ name: deploy-native-template on: workflow_call: inputs: - target_branch: - required: false - type: string - default: '' ecr_repository: required: true type: string @@ -34,8 +30,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - ref: ${{ inputs.target_branch || github.ref }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index e313cc36..976cb448 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -3,10 +3,6 @@ name: deploy-template on: workflow_call: inputs: - target_branch: - required: false - type: string - default: '' ecr_repository: required: true type: string @@ -34,8 +30,6 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - with: - ref: ${{ inputs.target_branch || github.ref }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v4 diff --git a/.github/workflows/deploy-manual-native.yml b/.github/workflows/deploy-manual-native.yml index 0b1fe105..f8881e92 100644 --- a/.github/workflows/deploy-manual-native.yml +++ b/.github/workflows/deploy-manual-native.yml @@ -3,10 +3,6 @@ name: Deploy Manual Native on: workflow_dispatch: inputs: - target_branch: - description: '배포할 브랜치명' - required: true - type: string ecr_repository: description: 'ECR 리포지토리 (예: snutt-dev/snutt-timetable)' required: true @@ -20,7 +16,6 @@ jobs: deploy: uses: ./.github/workflows/_deploy-native.yml with: - target_branch: ${{ inputs.target_branch }} ecr_repository: ${{ inputs.ecr_repository }} dockerfile: ${{ inputs.dockerfile }} secrets: diff --git a/.github/workflows/deploy-manual.yml b/.github/workflows/deploy-manual.yml index 3fd63b42..f1a7fa69 100644 --- a/.github/workflows/deploy-manual.yml +++ b/.github/workflows/deploy-manual.yml @@ -3,10 +3,6 @@ name: Deploy Manual on: workflow_dispatch: inputs: - target_branch: - description: '배포할 브랜치명' - required: true - type: string ecr_repository: description: 'ECR 리포지토리 (예: snutt-dev/snutt-timetable)' required: true @@ -20,7 +16,6 @@ jobs: deploy: uses: ./.github/workflows/_deploy.yml with: - target_branch: ${{ inputs.target_branch }} ecr_repository: ${{ inputs.ecr_repository }} dockerfile: ${{ inputs.dockerfile }} secrets: From bf656119d0eb36378f8af106d5bc7229cd921a97 Mon Sep 17 00:00:00 2001 From: Hank-Choi Date: Thu, 15 Jan 2026 14:17:28 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"mongodb=20=EB=93=9C=EB=9D=BC?= =?UTF-8?q?=EC=9D=B4=EB=B2=84=205.6.2=20->=205.5.2=20=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C=20(#472)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 59f9f7eebddbde89646616f3a5aadab7e6ddff00. --- core/build.gradle.kts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 07973bf3..f15bcb69 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -13,12 +13,6 @@ dependencies { api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8") api("org.springframework.boot:spring-boot-starter-data-mongodb-reactive") - // TODO: https://jira.mongodb.org/browse/JAVA-6038 이슈 해결된 spring-boot-starter-data-mongodb 업그레이드 후 아래 의존성 삭제 - api("org.mongodb:mongodb-driver-sync:5.5.2") - api("org.mongodb:bson:5.5.2") - api("org.mongodb:mongodb-driver-core:5.5.2") - api("org.mongodb:bson-record-codec:5.5.2") - api("org.springframework.boot:spring-boot-starter-data-redis") implementation("org.springframework.security:spring-security-crypto") From a90b5b27b140ae9afb01c9b62d340ec80573752e Mon Sep 17 00:00:00 2001 From: Chanyeong Lim Date: Thu, 15 Jan 2026 14:28:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?logout=EC=97=90=20SnuttDefaultApiFilterTarg?= =?UTF-8?q?et=20=EC=A0=81=EC=9A=A9=20(#479)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/main/kotlin/controller/AuthController.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/src/main/kotlin/controller/AuthController.kt b/api/src/main/kotlin/controller/AuthController.kt index 3457da54..a8b19083 100644 --- a/api/src/main/kotlin/controller/AuthController.kt +++ b/api/src/main/kotlin/controller/AuthController.kt @@ -2,6 +2,7 @@ package com.wafflestudio.snutt.controller import com.wafflestudio.snutt.common.dto.OkResponse import com.wafflestudio.snutt.config.CurrentUser +import com.wafflestudio.snutt.filter.SnuttDefaultApiFilterTarget import com.wafflestudio.snutt.filter.SnuttNoAuthApiFilterTarget import com.wafflestudio.snutt.users.data.User import com.wafflestudio.snutt.users.dto.EmailResponse @@ -108,6 +109,7 @@ class AuthController( return OkResponse() } + @SnuttDefaultApiFilterTarget @PostMapping("/logout") suspend fun logout( @CurrentUser user: User, From 637a110ea7ee657395efcfe1fd13ced2b96a7a57 Mon Sep 17 00:00:00 2001 From: Chanyeong Lim Date: Thu, 15 Jan 2026 14:28:45 +0900 Subject: [PATCH 4/4] =?UTF-8?q?dto=EC=97=90=20@JsonNaming=20=EB=8C=80?= =?UTF-8?q?=EC=8B=A0=20@JsonProperty=20=EC=82=AC=EC=9A=A9=20(#480)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt | 7 +++---- .../kotlin/bookmark/dto/BookmarkLectureModifyRequest.kt | 5 ++--- core/src/main/kotlin/users/dto/FacebookLoginRequest.kt | 6 +++--- core/src/main/kotlin/users/dto/LoginResponse.kt | 5 ++--- core/src/main/kotlin/users/dto/LogoutRequest.kt | 5 ++--- core/src/main/kotlin/users/dto/PasswordChangeRequest.kt | 6 +++--- core/src/main/kotlin/users/dto/PasswordResetRequest.kt | 5 ++--- 7 files changed, 17 insertions(+), 22 deletions(-) diff --git a/core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt b/core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt index 75e2bd0f..c032b981 100644 --- a/core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt +++ b/core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt @@ -1,16 +1,15 @@ package com.wafflestudio.snutt.auth.kakao -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class KakaoOAuth2UserResponse( val id: Long, + @param:JsonProperty("kakao_account") val kakaoAccount: KakaoAccountDto, ) -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class KakaoAccountDto( val email: String, + @param:JsonProperty("is_email_verified") val isEmailVerified: Boolean, ) diff --git a/core/src/main/kotlin/bookmark/dto/BookmarkLectureModifyRequest.kt b/core/src/main/kotlin/bookmark/dto/BookmarkLectureModifyRequest.kt index 530fd008..9d99cb8c 100644 --- a/core/src/main/kotlin/bookmark/dto/BookmarkLectureModifyRequest.kt +++ b/core/src/main/kotlin/bookmark/dto/BookmarkLectureModifyRequest.kt @@ -1,9 +1,8 @@ package com.wafflestudio.snutt.bookmark.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class BookmarkLectureModifyRequest( + @param:JsonProperty("lecture_id") val lectureId: String, ) diff --git a/core/src/main/kotlin/users/dto/FacebookLoginRequest.kt b/core/src/main/kotlin/users/dto/FacebookLoginRequest.kt index cebf03bb..6fdf5373 100644 --- a/core/src/main/kotlin/users/dto/FacebookLoginRequest.kt +++ b/core/src/main/kotlin/users/dto/FacebookLoginRequest.kt @@ -1,10 +1,10 @@ package com.wafflestudio.snutt.users.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class FacebookLoginRequest( + @param:JsonProperty("fb_id") val fbId: String?, + @param:JsonProperty("fb_token") val fbToken: String, ) diff --git a/core/src/main/kotlin/users/dto/LoginResponse.kt b/core/src/main/kotlin/users/dto/LoginResponse.kt index ea5702e3..f5d86028 100644 --- a/core/src/main/kotlin/users/dto/LoginResponse.kt +++ b/core/src/main/kotlin/users/dto/LoginResponse.kt @@ -1,10 +1,9 @@ package com.wafflestudio.snutt.users.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class LoginResponse( + @param:JsonProperty("user_id") val userId: String, val token: String, val message: String = "ok", diff --git a/core/src/main/kotlin/users/dto/LogoutRequest.kt b/core/src/main/kotlin/users/dto/LogoutRequest.kt index d3c7fe33..7ebb0eb4 100644 --- a/core/src/main/kotlin/users/dto/LogoutRequest.kt +++ b/core/src/main/kotlin/users/dto/LogoutRequest.kt @@ -1,9 +1,8 @@ package com.wafflestudio.snutt.users.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class LogoutRequest( + @param:JsonProperty("registration_id") val registrationId: String, ) diff --git a/core/src/main/kotlin/users/dto/PasswordChangeRequest.kt b/core/src/main/kotlin/users/dto/PasswordChangeRequest.kt index 09063814..06032406 100644 --- a/core/src/main/kotlin/users/dto/PasswordChangeRequest.kt +++ b/core/src/main/kotlin/users/dto/PasswordChangeRequest.kt @@ -1,10 +1,10 @@ package com.wafflestudio.snutt.users.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class PasswordChangeRequest( + @param:JsonProperty("old_password") val oldPassword: String, + @param:JsonProperty("new_password") val newPassword: String, ) diff --git a/core/src/main/kotlin/users/dto/PasswordResetRequest.kt b/core/src/main/kotlin/users/dto/PasswordResetRequest.kt index 3cc02b60..094e8dee 100644 --- a/core/src/main/kotlin/users/dto/PasswordResetRequest.kt +++ b/core/src/main/kotlin/users/dto/PasswordResetRequest.kt @@ -1,10 +1,9 @@ package com.wafflestudio.snutt.users.dto -import tools.jackson.databind.PropertyNamingStrategies -import tools.jackson.databind.annotation.JsonNaming +import com.fasterxml.jackson.annotation.JsonProperty -@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class PasswordResetRequest( + @param:JsonProperty("user_id") val userId: String, val password: String, val code: String,