[Feat] 온보딩 관련 API 연동

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

@@ -0,0 +1,6 @@
+package com.example.findu.data.datalocal.datasource
+
+interface DeviceLocalDataSource {
+    var deviceId: String
+    fun clear()
+}

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

@@ -0,0 +1,28 @@
+package com.example.findu.data.datalocal.datasourceimpl
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import com.example.findu.data.datalocal.datasource.DeviceLocalDataSource
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class DeviceLocalDataSourceImpl @Inject constructor(
+    @ApplicationContext context: Context
+) : DeviceLocalDataSource {
+
+    private val sharedPreferences: SharedPreferences =
+        context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+
+    override var deviceId: String
+        get() = sharedPreferences.getString(DEVICE_ID, INITIAL_VALUE).toString()
+        set(value) = sharedPreferences.edit { putString(DEVICE_ID, value) }
+
+    override fun clear() = sharedPreferences.edit { clear() }
+
+    companion object {
+        const val PREFERENCES_NAME = "device_preferences"
+        const val DEVICE_ID = "token"
+        const val INITIAL_VALUE = ""
+    }
+}

app/src/main/java/com/example/findu/data/datalocal/datasourceimpl/TokenLocalDataSourceImpl.kt

@@ -18,7 +18,7 @@ class TokenLocalDataSourceImpl @Inject constructor(
         set(value) = sharedPreferences.edit { putString(REFRESH_TOKEN, value) }
 
     override fun clearToken() {
-        sharedPreferences.edit().clear().apply()
+        sharedPreferences.edit { clear() }
     }
 
     companion object {

app/src/main/java/com/example/findu/data/dataremote/datasource/AuthRemoteDataSource.kt

@@ -1,29 +1,34 @@
 package com.example.findu.data.dataremote.datasource
 
 import com.example.findu.data.dataremote.model.base.BaseResponse
+import com.example.findu.data.dataremote.model.base.NullableBaseResponse
 import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto
 import com.example.findu.data.dataremote.model.request.LoginRequestDto
-import com.example.findu.data.dataremote.model.response.CheckEmailResponseDto
+import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto
 import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto
 import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto
+import com.example.findu.data.dataremote.model.response.auth.UserInfoDto
 import retrofit2.Response
+import java.io.File
 
 interface AuthRemoteDataSource {
     suspend fun postLogin(
         loginRequestDto: LoginRequestDto
-    ): BaseResponse<LoginResponseDto>
+    ): NullableBaseResponse<LoginResponseDto>
 
     suspend fun postGuestLogin(
         guestLoginRequestDto: GuestLoginRequestDto
-    ): BaseResponse<GuestLoginResponseDto>
+    ): NullableBaseResponse<GuestLoginResponseDto>
 
-    suspend fun postCheckEmail(
-        email: String
-    ): BaseResponse<CheckEmailResponseDto>
+    suspend fun postCheckNickname(
+        nickname: String
+    ): BaseResponse<CheckNicknameResponseDto>
 
     suspend fun postSignup(
-        email: String,
-        password: String,
-        nickname: String
-    ): Response<Unit>
+        profileImageFile: File?,
+        defaultImageName: String?,
+        nickname: String,
+        kakaoId: Long,
+        deviceId: String
+    ): NullableBaseResponse<UserInfoDto>
 }

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

@@ -3,32 +3,42 @@ package com.example.findu.data.dataremote.datasourceimpl
 import com.example.findu.data.dataremote.datasource.AuthRemoteDataSource
 import com.example.findu.data.dataremote.model.base.BaseResponse
 import com.example.findu.data.dataremote.model.base.NullableBaseResponse
-import com.example.findu.data.dataremote.model.request.CheckEmailRequestDto
+import com.example.findu.data.dataremote.model.request.CheckNicknameRequestDto
 import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto
 import com.example.findu.data.dataremote.model.request.LoginRequestDto
-import com.example.findu.data.dataremote.model.request.SignupRequestDto
-import com.example.findu.data.dataremote.model.response.CheckEmailResponseDto
+import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto
 import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto
 import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto
+import com.example.findu.data.dataremote.model.response.auth.UserInfoDto
 import com.example.findu.data.dataremote.service.AuthService
-import retrofit2.Response
+import com.example.findu.data.mapper.torequest.toImageMultipart
+import com.example.findu.data.mapper.torequest.toPlainTextRequestBody
+import java.io.File
 import javax.inject.Inject
 
 class AuthRemoteDataSourceImpl @Inject constructor(
     private val authService: AuthService
 ) : AuthRemoteDataSource {
-    override suspend fun postLogin(loginRequestDto: LoginRequestDto): BaseResponse<LoginResponseDto> =
+    override suspend fun postLogin(loginRequestDto: LoginRequestDto): NullableBaseResponse<LoginResponseDto> =
         authService.postLogin(loginRequestDto=loginRequestDto)
 
-    override suspend fun postGuestLogin(guestLoginRequestDto: GuestLoginRequestDto): BaseResponse<GuestLoginResponseDto> =
+    override suspend fun postGuestLogin(guestLoginRequestDto: GuestLoginRequestDto): NullableBaseResponse<GuestLoginResponseDto> =
         authService.postGuestLogin(guestLoginRequestDto=guestLoginRequestDto)
 
-    override suspend fun postCheckEmail(email: String): BaseResponse<CheckEmailResponseDto> =
-        authService.postCheckEmail(CheckEmailRequestDto(email))
+    override suspend fun postCheckNickname(nickname: String): BaseResponse<CheckNicknameResponseDto> =
+        authService.postCheckNickname(CheckNicknameRequestDto(nickname))
 
     override suspend fun postSignup(
-        email: String,
-        password: String,
-        nickname: String
-    ): Response<Unit> = authService.postSignup(SignupRequestDto(email, password, nickname))
+        profileImageFile: File?,
+        defaultImageName: String?,
+        nickname: String,
+        kakaoId: Long,
+        deviceId: String
+    ): NullableBaseResponse<UserInfoDto> = authService.postSignup(
+        profileImage = profileImageFile?.toImageMultipart("profileImage"),
+        defaultImageName = defaultImageName?.toPlainTextRequestBody(),
+        nickname = nickname.toPlainTextRequestBody(),
+        kakaoId = kakaoId.toString().toPlainTextRequestBody(),
+        deviceId = deviceId.toPlainTextRequestBody()
+    )
 }

app/src/main/java/com/example/findu/data/dataremote/model/base/BaseResponse.kt

@@ -8,5 +8,5 @@ data class BaseResponse<T>(
     @SerialName("success") val success: Boolean,
     @SerialName("code") val code: Int,
     @SerialName("message") val message: String,
-    @SerialName("data") val data: T? = null
+    @SerialName("data") val data: T
 )

app/src/main/java/com/example/findu/data/dataremote/model/request/CheckEmailRequestDto.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CheckEmailRequestDto(
-    @SerialName("email")
-    val email: String
+data class CheckNicknameRequestDto(
+    @SerialName("nickname")
+    val nickname: String
 )

app/src/main/java/com/example/findu/data/dataremote/model/response/CheckEmailResponseDto.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CheckEmailResponseDto(
-    @SerialName("isDuplicateEmail")
-    val isDuplicateEmail: Boolean
+data class CheckNicknameResponseDto(
+    @SerialName("isDuplicate")
+    val isDuplicate: Boolean
 )

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

@@ -1,38 +1,49 @@
 package com.example.findu.data.dataremote.service
 
 import com.example.findu.data.dataremote.model.base.BaseResponse
-import com.example.findu.data.dataremote.model.request.CheckEmailRequestDto
+import com.example.findu.data.dataremote.model.base.NullableBaseResponse
+import com.example.findu.data.dataremote.model.request.CheckNicknameRequestDto
 import com.example.findu.data.dataremote.model.request.GuestLoginRequestDto
 import com.example.findu.data.dataremote.model.request.LoginRequestDto
 import com.example.findu.data.dataremote.model.request.SignupRequestDto
-import com.example.findu.data.dataremote.model.response.CheckEmailResponseDto
+import com.example.findu.data.dataremote.model.response.CheckNicknameResponseDto
 import com.example.findu.data.dataremote.model.response.auth.GuestLoginResponseDto
 import com.example.findu.data.dataremote.model.response.auth.LoginResponseDto
+import com.example.findu.data.dataremote.model.response.auth.UserInfoDto
 import com.example.findu.data.dataremote.util.ApiConstraints.API
 import com.example.findu.data.dataremote.util.ApiConstraints.AUTH
 import com.example.findu.data.dataremote.util.ApiConstraints.VERSION
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
 import retrofit2.Response
 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
-    ): BaseResponse<LoginResponseDto>
+    ): NullableBaseResponse<LoginResponseDto>
 
     @POST("/$API/$VERSION/$AUTH/login/guest")
     suspend fun postGuestLogin(
         @Body guestLoginRequestDto: GuestLoginRequestDto
-    ): BaseResponse<GuestLoginResponseDto>
+    ): NullableBaseResponse<GuestLoginResponseDto>
 
-    @POST("/$API/$VERSION/$AUTH/check/duplicate-email")
-    suspend fun postCheckEmail(
-        @Body checkEmailRequestDto: CheckEmailRequestDto
-    ): BaseResponse<CheckEmailResponseDto>
+    @POST("/$API/$VERSION/users/check/duplicate-nickname")
+    suspend fun postCheckNickname(
+        @Body checkNicknameRequestDto: CheckNicknameRequestDto
+    ): BaseResponse<CheckNicknameResponseDto>
 
-    @POST("/$API/$VERSION/$AUTH/signup")
+    @Multipart
+    @POST("/$API/$VERSION/users")
     suspend fun postSignup(
-        @Body signupRequestBody: SignupRequestDto
-    ): Response<Unit>
+        @Part profileImage: MultipartBody.Part?,
+        @Part("defaultProfileImageName") defaultImageName: RequestBody?,
+        @Part("nickname") nickname: RequestBody,
+        @Part("kakaoId") kakaoId: RequestBody,
+        @Part("deviceId") deviceId: RequestBody
+    ): NullableBaseResponse<UserInfoDto>
 }

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

@@ -6,8 +6,7 @@ import com.example.findu.data.dataremote.model.base.NullableBaseResponse
 fun <T> BaseResponse<T>.handleBaseResponse(): Result<T> =
     when (this.code) {
         in 200..299 -> { // 성공
-            data?.let { Result.success(it) }
-                ?: Result.failure(IllegalStateException("data is null"))
+            Result.success(this.data)
         }
 
         in 400..499 -> { // 클라이언트 에러

app/src/main/java/com/example/findu/data/mapper/todomain/LoginResponseDtoMapper.kt

@@ -7,11 +7,5 @@ import com.example.findu.domain.model.UserInfo
 fun LoginResponseDto.toDomain(): LoginData =
     LoginData(
         isFirstLogin = isFirstLogin,
-        userInfo = userInfo?.let {
-            UserInfo(
-                userId = it.userId,
-                nickname = it.nickname,
-                accessToken = it.accessToken
-            )
-        }
+        userInfo = userInfo?.toDomain()
     )

app/src/main/java/com/example/findu/data/mapper/todomain/UserInfoDtoMapper.kt

@@ -0,0 +1,11 @@
+package com.example.findu.data.mapper.todomain
+
+import com.example.findu.data.dataremote.model.response.auth.UserInfoDto
+import com.example.findu.domain.model.UserInfo
+
+fun UserInfoDto.toDomain(): UserInfo =
+    UserInfo(
+        userId = this.userId,
+        nickname = this.nickname,
+        accessToken = this.accessToken
+    )

app/src/main/java/com/example/findu/data/mapper/torequest/TextRequestBodyMapper.kt

@@ -0,0 +1,18 @@
+package com.example.findu.data.mapper.torequest
+
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.File
+
+fun String.toPlainTextRequestBody(): RequestBody =
+    toRequestBody("text/plain".toMediaTypeOrNull())
+
+fun File.toImageMultipart(name: String): MultipartBody.Part =
+    MultipartBody.Part.createFormData(
+        name,
+        this.name,
+        asRequestBody("image/*".toMediaTypeOrNull())
+    )

app/src/main/java/com/example/findu/data/repositoryimpl/AuthRepositoryImpl.kt

@@ -4,50 +4,48 @@ import com.example.findu.data.dataremote.datasource.AuthRemoteDataSource
 import com.example.findu.data.dataremote.util.handleBaseResponse
 import com.example.findu.data.mapper.todomain.toDomain
 import com.example.findu.data.mapper.torequest.toRequestDto
-import com.example.findu.domain.model.CheckEmailData
 import com.example.findu.domain.model.GuestLoginData
 import com.example.findu.domain.model.LoginData
 import com.example.findu.domain.model.LoginInfo
+import com.example.findu.domain.model.UserInfo
 import com.example.findu.domain.repository.AuthRepository
-import retrofit2.Response
+import java.io.File
 import javax.inject.Inject
 
 class AuthRepositoryImpl @Inject constructor(
     private val authRemoteDataSource: AuthRemoteDataSource
 ) : AuthRepository {
     override suspend fun postLogin(loginInfo: LoginInfo): Result<LoginData> =
         runCatching {
-            authRemoteDataSource.postLogin(loginRequestDto = loginInfo.toRequestDto()).handleBaseResponse().getOrThrow().toDomain()
+            authRemoteDataSource.postLogin(loginRequestDto = loginInfo.toRequestDto()).handleBaseResponse().getOrThrow()
+                ?.toDomain() ?: error("Login data is null")
         }
 
-    override suspend fun postGuestLogin(deviceId:String): Result<GuestLoginData> =
+    override suspend fun postGuestLogin(deviceId: String): Result<GuestLoginData> =
         runCatching {
-            authRemoteDataSource.postGuestLogin(guestLoginRequestDto = deviceId.toRequestDto()).handleBaseResponse().getOrThrow().toDomain()
+            authRemoteDataSource.postGuestLogin(guestLoginRequestDto = deviceId.toRequestDto()).handleBaseResponse()
+                .getOrThrow()
+                ?.toDomain() ?: error("Login data is null")
         }
 
-    override suspend fun postCheckEmail(email: String): Result<CheckEmailData> =
+    override suspend fun postCheckNickname(nickname: String): Result<Boolean> =
         runCatching {
-            authRemoteDataSource.postCheckEmail(email).handleBaseResponse().getOrThrow().toDomain()
+            authRemoteDataSource.postCheckNickname(nickname = nickname).handleBaseResponse().getOrThrow().isDuplicate
         }
 
     override suspend fun postSignup(
-        email: String,
-        password: String,
-        nickname: String
-    ): Result<String> =
-        runCatching {
-            val response: Response<Unit> =
-                authRemoteDataSource.postSignup(email, password, nickname)
-
-            if (response.isSuccessful) {
-                val accessToken = response.headers()["Authorization"]?.removePrefix("Bearer ")
-                if (!accessToken.isNullOrEmpty()) {
-                    return@runCatching accessToken
-                } else {
-                    throw Exception("Access Token이 응답 헤더에 없음")
-                }
-            } else {
-                throw Exception("회원가입 실패: ${response.code()}")
-            }
-        }
+        profileImageFile: File?,
+        defaultImageName: String?,
+        nickname: String,
+        kakaoId: Long,
+        deviceId: String
+    ): Result<UserInfo> = runCatching {
+        authRemoteDataSource.postSignup(
+            profileImageFile = profileImageFile,
+            defaultImageName = defaultImageName,
+            nickname = nickname,
+            kakaoId = kakaoId,
+            deviceId = deviceId
+        ).handleBaseResponse().getOrThrow()?.toDomain() ?: error("Signup data is null")
+    }
 }