fix: QA 수정사항 반영

app/build.gradle.kts

@@ -24,8 +24,8 @@ android {
         applicationId = "com.kuit.findu"
         minSdk = 28
         targetSdk = 35
-        versionCode = 12
-        versionName = "1.0.11"
+        versionCode = 13
+        versionName = "1.0.12"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "GPT_KEY", properties["GPT_KEY"].toString())

app/src/main/java/com/kuit/findu/data/datalocal/datasource/DeviceLocalDataSource.kt

@@ -3,6 +3,7 @@ package com.kuit.findu.data.datalocal.datasource
 interface DeviceLocalDataSource {
     var deviceId: String
     var nickname: String
+    var isGuestLogin: Boolean
 
     fun clear()
 }

app/src/main/java/com/kuit/findu/data/datalocal/datasourceimpl/DeviceLocalDataSourceImpl.kt

@@ -23,6 +23,10 @@ class DeviceLocalDataSourceImpl @Inject constructor(
         get() = sharedPreferences.getString(NICKNAME, INITIAL_VALUE).toString()
         set(value) = sharedPreferences.edit { putString(NICKNAME, value) }
 
+    override var isGuestLogin: Boolean
+        get() = sharedPreferences.getBoolean(IS_GUEST_LOGIN, false)
+        set(value) = sharedPreferences.edit { putBoolean(IS_GUEST_LOGIN, value) }
+
     override fun clear() {
         val currentDeviceId = deviceId
         sharedPreferences.edit {
@@ -34,6 +38,7 @@ class DeviceLocalDataSourceImpl @Inject constructor(
         const val PREFERENCES_NAME = "device_preferences"
         const val DEVICE_ID = "deviceId"
         const val NICKNAME = "nickname"
+        const val IS_GUEST_LOGIN = "isGuestLogin"
 
         const val INITIAL_VALUE = ""
     }

app/src/main/java/com/kuit/findu/data/dataremote/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -6,24 +6,23 @@ import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse
 import com.kuit.findu.data.dataremote.model.request.CheckNicknameRequestDto
 import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto
 import com.kuit.findu.data.dataremote.model.request.LoginRequestDto
+import com.kuit.findu.data.dataremote.model.request.PostUserRequestDto
 import com.kuit.findu.data.dataremote.model.response.CheckNicknameResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto
 import com.kuit.findu.data.dataremote.service.AuthService
-import com.kuit.findu.data.mapper.torequest.toImageMultipart
-import com.kuit.findu.data.mapper.torequest.toPlainTextRequestBody
 import java.io.File
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl @Inject constructor(
-    private val authService: AuthService
+    private val authService: AuthService,
 ) : AuthRemoteDataSource {
     override suspend fun postLogin(loginRequestDto: LoginRequestDto): NullableBaseResponse<LoginResponseDto> =
-        authService.postLogin(loginRequestDto=loginRequestDto)
+        authService.postLogin(loginRequestDto = loginRequestDto)
 
     override suspend fun postGuestLogin(guestLoginRequestDto: GuestLoginRequestDto): NullableBaseResponse<GuestLoginResponseDto> =
-        authService.postGuestLogin(guestLoginRequestDto=guestLoginRequestDto)
+        authService.postGuestLogin(guestLoginRequestDto = guestLoginRequestDto)
 
     override suspend fun postCheckNickname(nickname: String): BaseResponse<CheckNicknameResponseDto> =
         authService.postCheckNickname(CheckNicknameRequestDto(nickname))
@@ -33,12 +32,8 @@ class AuthRemoteDataSourceImpl @Inject constructor(
         defaultImageName: String?,
         nickname: String,
         kakaoId: Long,
-        deviceId: String
+        deviceId: String,
     ): NullableBaseResponse<UserInfoDto> = authService.postSignup(
-        profileImage = profileImageFile?.toImageMultipart("profileImage"),
-        defaultImageName = defaultImageName?.toPlainTextRequestBody(),
-        nickname = nickname.toPlainTextRequestBody(),
-        kakaoId = kakaoId.toString().toPlainTextRequestBody(),
-        deviceId = deviceId.toPlainTextRequestBody()
+        PostUserRequestDto(nickname, kakaoId, deviceId)
     )
 }

app/src/main/java/com/kuit/findu/data/dataremote/exception/ApiNotFoundException.kt

@@ -0,0 +1,5 @@
+package com.kuit.findu.data.dataremote.exception
+
+class ApiNotFoundException(
+    message: String,
+) : Exception(message)

app/src/main/java/com/kuit/findu/data/dataremote/model/request/PostUserRequestDto.kt

@@ -0,0 +1,14 @@
+package com.kuit.findu.data.dataremote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostUserRequestDto(
+    @SerialName("nickname")
+    val nickname: String,
+    @SerialName("kakaoId")
+    val kakaoId: Long,
+    @SerialName("deviceId")
+    val deviceId: String,
+)

app/src/main/java/com/kuit/findu/data/dataremote/model/request/TokenReissueRequestDto.kt

@@ -0,0 +1,10 @@
+package com.kuit.findu.data.dataremote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenReissueRequestDto(
+    @SerialName("refreshToken")
+    val refreshToken: String,
+)

app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/GuestLoginResponseDto.kt

@@ -8,5 +8,7 @@ data class GuestLoginResponseDto(
     @SerialName("userId")
     val userId: Long,
     @SerialName("accessToken")
-    val accessToken: String
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String
 )

app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/LoginResponseDto.kt

@@ -18,5 +18,7 @@ data class UserInfoDto(
     @SerialName("nickname")
     val nickname: String,
     @SerialName("accessToken")
-    val accessToken: String
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
 )

app/src/main/java/com/kuit/findu/data/dataremote/model/response/auth/TokenReissueResponseDto.kt

@@ -0,0 +1,12 @@
+package com.kuit.findu.data.dataremote.model.response.auth
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TokenReissueResponseDto(
+    @SerialName("accessToken")
+    val accessToken: String,
+    @SerialName("refreshToken")
+    val refreshToken: String,
+)

app/src/main/java/com/kuit/findu/data/dataremote/model/response/my/MyNickNameResponseDto.kt

@@ -9,5 +9,5 @@ data class MyNickNameResponseDto(
     @SerialName("nickname")
     val nickname: String,
     @SerialName("profileImage")
-    val profileImage : String,
+    val profileImage : String? = null,
 )

app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailMissingResponseDto.kt

@@ -16,8 +16,8 @@ data class DetailMissingResponseDto(
     @SerialName("significant") val significant: String,
     @SerialName("missingLocation") val missingLocation: String,
     @SerialName("missingAddress") val missingAddress: String,
-    @SerialName("latitude") val latitude: Double,
-    @SerialName("longitude") val longitude: Double,
+    @SerialName("latitude") val latitude: Double?,
+    @SerialName("longitude") val longitude: Double?,
     @SerialName("reporterName") val reporterName: String,
     @SerialName("reporterTel") val reporterTel: String,
     @SerialName("interest") val interest: Boolean

app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailProtectResponseDto.kt

@@ -28,9 +28,9 @@ data class DetailProtectResponseDto(
     @SerialName("careAddr")
     val careAddr: String,
     @SerialName("latitude")
-    val latitude: Double,
+    val latitude: Double?,
     @SerialName("longitude")
-    val longitude: Double,
+    val longitude: Double?,
     @SerialName("careTel")
     val careTel: String,
     @SerialName("foundDate")

app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/DetailWitnessResponseDto.kt

@@ -12,8 +12,8 @@ data class DetailWitnessResponseDto(
     @SerialName("significant") val significant: String,
     @SerialName("witnessLocation") val witnessLocation: String,
     @SerialName("witnessAddress") val witnessAddress: String,
-    @SerialName("latitude") val latitude: Double,
-    @SerialName("longitude") val longitude: Double,
+    @SerialName("latitude") val latitude: Double?,
+    @SerialName("longitude") val longitude: Double?,
     @SerialName("reporterInfo") val reporterInfo: String,
     @SerialName("witnessDate") val witnessDate: String,
     @SerialName("interest") val interest: Boolean

app/src/main/java/com/kuit/findu/data/dataremote/model/response/search/SearchResponseDto.kt

@@ -8,9 +8,9 @@ data class SearchResponseDto(
     @SerialName("cards")
     val cards: List<SearchAnimalCard>,
     @SerialName("lastId")
-    val lastId : Long?,
+    val lastId: Long?,
     @SerialName("isLast")
-    val isLast : Boolean
+    val isLast: Boolean,
 )
 
 @Serializable
@@ -28,5 +28,7 @@ data class SearchAnimalCard(
     @SerialName("location")
     val location: String,
     @SerialName("interest")
-    val interest: Boolean = false
+    val interest: Boolean = false,
+    @SerialName("createdAt")
+    val createdAt: String,
 )

app/src/main/java/com/kuit/findu/data/dataremote/service/AuthService.kt

@@ -5,43 +5,36 @@ import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse
 import com.kuit.findu.data.dataremote.model.request.CheckNicknameRequestDto
 import com.kuit.findu.data.dataremote.model.request.GuestLoginRequestDto
 import com.kuit.findu.data.dataremote.model.request.LoginRequestDto
+import com.kuit.findu.data.dataremote.model.request.PostUserRequestDto
 import com.kuit.findu.data.dataremote.model.response.CheckNicknameResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.GuestLoginResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.LoginResponseDto
 import com.kuit.findu.data.dataremote.model.response.auth.UserInfoDto
 import com.kuit.findu.data.dataremote.util.ApiConstraints.API
 import com.kuit.findu.data.dataremote.util.ApiConstraints.AUTH
 import com.kuit.findu.data.dataremote.util.ApiConstraints.VERSION
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
 import retrofit2.http.Body
 import retrofit2.http.Multipart
 import retrofit2.http.POST
-import retrofit2.http.Part
 
 interface AuthService {
     @POST("/$API/$VERSION/$AUTH/login/kakao")
     suspend fun postLogin(
-        @Body loginRequestDto: LoginRequestDto
+        @Body loginRequestDto: LoginRequestDto,
     ): NullableBaseResponse<LoginResponseDto>
 
     @POST("/$API/$VERSION/$AUTH/login/guest")
     suspend fun postGuestLogin(
-        @Body guestLoginRequestDto: GuestLoginRequestDto
+        @Body guestLoginRequestDto: GuestLoginRequestDto,
     ): NullableBaseResponse<GuestLoginResponseDto>
 
     @POST("/$API/$VERSION/users/check/duplicate-nickname")
     suspend fun postCheckNickname(
-        @Body checkNicknameRequestDto: CheckNicknameRequestDto
+        @Body checkNicknameRequestDto: CheckNicknameRequestDto,
     ): BaseResponse<CheckNicknameResponseDto>
 
-    @Multipart
     @POST("/$API/$VERSION/users")
     suspend fun postSignup(
-        @Part profileImage: MultipartBody.Part?,
-        @Part("defaultProfileImageName") defaultImageName: RequestBody?,
-        @Part("nickname") nickname: RequestBody,
-        @Part("kakaoId") kakaoId: RequestBody,
-        @Part("deviceId") deviceId: RequestBody
+        @Body postUserRequestDto: PostUserRequestDto,
     ): NullableBaseResponse<UserInfoDto>
 }

app/src/main/java/com/kuit/findu/data/dataremote/service/ReissueService.kt

@@ -0,0 +1,18 @@
+package com.kuit.findu.data.dataremote.service
+
+import com.kuit.findu.data.dataremote.model.base.BaseResponse
+import com.kuit.findu.data.dataremote.model.request.TokenReissueRequestDto
+import com.kuit.findu.data.dataremote.model.response.auth.TokenReissueResponseDto
+import com.kuit.findu.data.dataremote.util.ApiConstraints.API
+import com.kuit.findu.data.dataremote.util.ApiConstraints.AUTH
+import com.kuit.findu.data.dataremote.util.ApiConstraints.VERSION
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface ReissueService {
+
+    @POST("/$API/$VERSION/$AUTH/reissue/token")
+    suspend fun postReissueToken(
+        @Body tokenReissueRequestDto: TokenReissueRequestDto,
+    ): BaseResponse<TokenReissueResponseDto>
+}

app/src/main/java/com/kuit/findu/data/dataremote/util/ApiResponseHandler.kt

@@ -1,5 +1,6 @@
 package com.kuit.findu.data.dataremote.util
 
+import com.kuit.findu.data.dataremote.exception.ApiNotFoundException
 import com.kuit.findu.data.dataremote.model.base.BaseResponse
 import com.kuit.findu.data.dataremote.model.base.NullableBaseResponse
 
@@ -28,8 +29,13 @@ fun <T> NullableBaseResponse<T>.handleBaseResponse(): Result<T?> =
             Result.success(this.data)
         }
 
+
         in 400..499 -> { // 클라이언트 에러
-            Result.failure(Exception("Client error : ${this.message}"))
+            if (this.code == 404) {
+                Result.failure(ApiNotFoundException("Client error : ${this.message}"))
+            } else {
+                Result.failure(Exception("Client error : ${this.message}"))
+            }
         }
 
         in 500..599 -> { // 서버 에러

app/src/main/java/com/kuit/findu/data/dataremote/util/AuthAuthenticator.kt

@@ -1,34 +1,53 @@
 package com.kuit.findu.data.dataremote.util
 
-import android.content.Context
-import android.content.Intent
 import com.kuit.findu.data.datalocal.datasource.TokenLocalDataSource
-import com.kuit.findu.presentation.ui.login.LoginActivity
-import dagger.hilt.android.qualifiers.ApplicationContext
-import okhttp3.Interceptor
+import com.kuit.findu.data.dataremote.model.request.TokenReissueRequestDto
+import com.kuit.findu.data.dataremote.service.ReissueService
+import kotlinx.coroutines.runBlocking
+import okhttp3.Authenticator
+import okhttp3.Request
 import okhttp3.Response
+import okhttp3.Route
 import javax.inject.Inject
 
 class AuthAuthenticator @Inject constructor(
     private val tokenLocalDataSource: TokenLocalDataSource,
-    @ApplicationContext private val context: Context
-) : Interceptor {
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request = chain.request()
-        val response = chain.proceed(request)
-
+    private val reissueService: ReissueService,
+) : Authenticator {
+    override fun authenticate(route: Route?, response: Response): Request? {
         // 401 Unauthorized 에러 감지
         if (response.code == 401) {
-            // 토큰 삭제
-            tokenLocalDataSource.clearToken()
+            return try {
+                val refreshToken = tokenLocalDataSource.refreshToken
+
+                // 토큰 재발급 요청
+                val reissueResponse = runBlocking {
+                    reissueService.postReissueToken(
+                        TokenReissueRequestDto(refreshToken)
+                    )
+                }
+
+                if (reissueResponse.success) {
+                    // 새로운 토큰으로 저장
+                    tokenLocalDataSource.accessToken = reissueResponse.data.accessToken
+                    tokenLocalDataSource.refreshToken = reissueResponse.data.refreshToken
 
-            // 로그인 화면으로 이동
-            val intent = Intent(context, LoginActivity::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+                    // 새로운 토큰으로 원래 요청 재시도
+                    response.request.newBuilder()
+                        .header("Authorization", "Bearer ${reissueResponse.data.accessToken}")
+                        .build()
+                } else {
+                    // 토큰 재발급 실패 - 로그인 화면으로 이동
+                    tokenLocalDataSource.clearToken()
+                    null
+                }
+            } catch (e: Exception) {
+                // 토큰 재발급 중 오류 발생 - 로그인 화면으로 이동
+                tokenLocalDataSource.clearToken()
+                null
             }
-            context.startActivity(intent)
         }
 
-        return response
+        return null
     }
 }

app/src/main/java/com/kuit/findu/data/dataremote/util/ErrorTrackingInterceptor.kt

@@ -41,7 +41,7 @@ class ErrorTrackingInterceptor @Inject constructor(
                 key("api_status", code)
             }
 
-            if (code in 500..599) {
+            if (code in 400..599) {
                 CoroutineScope(Dispatchers.IO).launch {
                     discordLogger.logServerError(
                         code = code,

app/src/main/java/com/kuit/findu/data/mapper/todomain/GuestLoginResponseDtoMapper.kt

@@ -6,5 +6,6 @@ import com.kuit.findu.domain.model.GuestLoginData
 fun GuestLoginResponseDto.toDomain(): GuestLoginData =
     GuestLoginData(
         userId = this.userId,
-        accessToken = this.accessToken
+        accessToken = this.accessToken,
+        refreshToken = this.refreshToken
     )