From 77140f3dbc80bd8c4c10c1decb0af1a0334f70d3 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Wed, 27 Aug 2025 08:47:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[REFACTOR/#403]=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20API=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/terning/data/auth/dto/request/SignInRequestDto.kt | 6 ++++-- .../com/terning/data/auth/mapper/SignInRequestMapper.kt | 5 ++++- .../java/com/terning/domain/auth/entity/SignInRequest.kt | 5 +++-- .../terning/feature/onboarding/signin/SignInViewModel.kt | 6 +++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/data/auth/src/main/java/com/terning/data/auth/dto/request/SignInRequestDto.kt b/data/auth/src/main/java/com/terning/data/auth/dto/request/SignInRequestDto.kt index 8c6955adb..b7514bb59 100644 --- a/data/auth/src/main/java/com/terning/data/auth/dto/request/SignInRequestDto.kt +++ b/data/auth/src/main/java/com/terning/data/auth/dto/request/SignInRequestDto.kt @@ -6,5 +6,7 @@ import kotlinx.serialization.Serializable @Serializable data class SignInRequestDto( @SerialName("authType") - val authType: String -) \ No newline at end of file + val authType: String, + @SerialName("fcmToken") + val fcmToken: String, +) diff --git a/data/auth/src/main/java/com/terning/data/auth/mapper/SignInRequestMapper.kt b/data/auth/src/main/java/com/terning/data/auth/mapper/SignInRequestMapper.kt index a140186c7..f8cfd7282 100644 --- a/data/auth/src/main/java/com/terning/data/auth/mapper/SignInRequestMapper.kt +++ b/data/auth/src/main/java/com/terning/data/auth/mapper/SignInRequestMapper.kt @@ -4,4 +4,7 @@ import com.terning.data.auth.dto.request.SignInRequestDto import com.terning.domain.auth.entity.SignInRequest fun SignInRequest.toSignInRequestDto(): SignInRequestDto = - SignInRequestDto(authType = authType) \ No newline at end of file + SignInRequestDto( + authType = authType, + fcmToken = fcmToken + ) diff --git a/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInRequest.kt b/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInRequest.kt index 798f796ce..33047aff7 100644 --- a/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInRequest.kt +++ b/domain/auth/src/main/java/com/terning/domain/auth/entity/SignInRequest.kt @@ -1,5 +1,6 @@ package com.terning.domain.auth.entity data class SignInRequest( - val authType: String -) \ No newline at end of file + val authType: String, + val fcmToken: String, +) diff --git a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt index 6c510629b..6c2da37fd 100644 --- a/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt +++ b/feature/onboarding/src/main/java/com/terning/feature/onboarding/signin/SignInViewModel.kt @@ -62,9 +62,13 @@ class SignInViewModel @Inject constructor( accessToken: String, authType: String = KAKAO, ) { + userRepository.fetchAndSetFcmToken() authRepository.signIn( accessToken, - SignInRequest(authType = authType) + SignInRequest( + authType = authType, + fcmToken = userRepository.getFcmToken() + ) ).onSuccess { response -> when { response.accessToken == null -> { From 4bca14e38fab73613c5b72013827f6ddf6f204f3 Mon Sep 17 00:00:00 2001 From: LEE YOU BIN Date: Mon, 1 Sep 2025 14:03:53 +0900 Subject: [PATCH 2/2] [REFACTOR/#402] version upgrade to 1.3.7 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb0630274..a55c451a6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ compileSdk = "35" minSdk = "28" targetSdk = "35" -versionName = "1.3.6" -versionCode = "103060" +versionName = "1.3.7" +versionCode = "103070" jvmTarget = "1.8" ## Android gradle plugin