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 = 14
+        versionName = "1.0.13"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "GPT_KEY", properties["GPT_KEY"].toString())

app/proguard-rules.pro

@@ -5,17 +5,155 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Keep line numbers for debugging
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
+
+# Keep annotations
+-keepattributes *Annotation*
+-keepattributes Signature
+-keepattributes Exceptions
+
+# ========== Retrofit & OkHttp ==========
+-dontwarn okhttp3.**
+-dontwarn okio.**
+-dontwarn javax.annotation.**
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+# ========== Kotlinx Serialization ==========
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.AnnotationsKt
+-keepclassmembers class kotlinx.serialization.json.** {
+    *** Companion;
+}
+-keepclasseswithmembers class kotlinx.serialization.json.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-keep,includedescriptorclasses class com.kuit.findu.**$$serializer { *; }
+-keepclassmembers class com.kuit.findu.** {
+    *** Companion;
+}
+-keepclasseswithmembers class com.kuit.findu.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep all data classes and their properties
+-keep class com.kuit.findu.data.** { *; }
+-keep class com.kuit.findu.domain.** { *; }
+
+# ========== Hilt ==========
+-dontwarn com.google.errorprone.annotations.**
+-keep class dagger.** { *; }
+-keep class javax.inject.** { *; }
+-keep class * extends dagger.hilt.android.internal.managers.ViewComponentManager$FragmentContextWrapper { *; }
+-keep class * implements dagger.hilt.internal.GeneratedComponent { *; }
+-keep class * implements dagger.hilt.internal.GeneratesRootInput { *; }
+-keep class dagger.hilt.** { *; }
+-keep class javax.inject.** { *; }
+-keep class * extends dagger.hilt.android.lifecycle.HiltViewModel { *; }
+
+# ========== Glide ==========
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+# ========== Naver Map SDK ==========
+-keep class com.naver.maps.** { *; }
+-keep interface com.naver.maps.** { *; }
+-dontwarn com.naver.maps.**
+
+# ========== CameraX ==========
+-keep class androidx.camera.** { *; }
+-dontwarn androidx.camera.**
+
+# ========== Kakao SDK ==========
+-keep class com.kakao.sdk.**.model.* { <fields>; }
+-keep class * extends com.google.gson.TypeAdapter
+-keep class com.kakao.sdk.auth.** { *; }
+-keep class com.kakao.sdk.user.** { *; }
+-keep class com.kakao.sdk.common.** { *; }
+
+# ========== Firebase ==========
+-keep class com.google.firebase.** { *; }
+-keep class com.google.android.gms.** { *; }
+-dontwarn com.google.firebase.**
+-dontwarn com.google.android.gms.**
+
+# ========== Jetpack Compose ==========
+-keep class androidx.compose.** { *; }
+-keep class androidx.compose.runtime.** { *; }
+-keep class androidx.compose.ui.** { *; }
+-dontwarn androidx.compose.**
+
+# Keep ViewModels
+-keep class * extends androidx.lifecycle.ViewModel {
+    <init>();
+}
+-keep class * extends androidx.lifecycle.AndroidViewModel {
+    <init>(android.app.Application);
+}
+
+# ========== AndroidX Navigation ==========
+-keep class androidx.navigation.fragment.NavHostFragment { *; }
+-keepnames class * extends android.os.Parcelable
+-keepnames class * extends java.io.Serializable
+
+# ========== Material Components ==========
+-keep class com.google.android.material.** { *; }
+-dontwarn com.google.android.material.**
+
+# ========== ViewBinding & DataBinding ==========
+-keep class * implements androidx.viewbinding.ViewBinding {
+    public static * inflate(android.view.LayoutInflater);
+    public static * inflate(android.view.LayoutInflater, android.view.ViewGroup, boolean);
+    public static * bind(android.view.View);
+}
+
+# ========== Lottie ==========
+-keep class com.airbnb.lottie.** { *; }
+-dontwarn com.airbnb.lottie.**
+
+# ========== WebView ==========
+-keepclassmembers class * {
+    @android.webkit.JavascriptInterface <methods>;
+}
+
+# ========== Kotlin ==========
+-keep class kotlin.** { *; }
+-keep class kotlin.Metadata { *; }
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+
+# ========== Coroutines ==========
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+-keepclassmembernames class kotlinx.** {
+    volatile <fields>;
+}
+
+# ========== R8 Full Mode ==========
+-allowaccessmodification
+-repackageclasses

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,
 )