refactor: Repository 및 UseCase 구조 변경

CatchMate/data/src/main/java/com/catchmate/data/datasource/local/GoogleLoginDataSource.kt

@@ -8,7 +8,7 @@ import androidx.credentials.GetCredentialRequest
 import androidx.credentials.GetCredentialResponse
 import com.catchmate.data.BuildConfig
 import com.catchmate.data.datasource.remote.FCMTokenService
-import com.catchmate.data.dto.LoginRequestDTO
+import com.catchmate.data.dto.PostLoginRequestDTO
 import com.catchmate.domain.model.LoginPlatform
 import com.google.android.libraries.identity.googleid.GetGoogleIdOption
 import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential
@@ -44,7 +44,7 @@ class GoogleLoginDataSource
             return credentialManager.getCredential(context, request)
         }
 
-        fun handleSignIn(result: GetCredentialResponse): LoginRequestDTO? {
+        fun handleSignIn(result: GetCredentialResponse): PostLoginRequestDTO? {
             val credential = result.credential
 
             return if (credential is CustomCredential) {
@@ -56,7 +56,7 @@ class GoogleLoginDataSource
                         val profileUri = googleIdTokenCredential.profilePictureUri
 
                         Log.i("GoogleInfoSuccess", "idToken : $idToken  email : $email profileUri : $profileUri")
-                        LoginRequestDTO(
+                        PostLoginRequestDTO(
                             email = email,
                             providerId = idToken,
                             provider = LoginPlatform.GOOGLE.toString().lowercase(),

CatchMate/data/src/main/java/com/catchmate/data/datasource/local/KakaoLoginDataSource.kt

@@ -3,7 +3,7 @@ package com.catchmate.data.datasource.local
 import android.content.Context
 import android.util.Log
 import com.catchmate.data.datasource.remote.FCMTokenService
-import com.catchmate.data.dto.LoginRequestDTO
+import com.catchmate.data.dto.PostLoginRequestDTO
 import com.catchmate.domain.model.LoginPlatform
 import com.kakao.sdk.auth.model.OAuthToken
 import com.kakao.sdk.user.UserApiClient
@@ -24,7 +24,7 @@ class KakaoLoginDataSource
         private val isKakaoTalkLoginAvailable: Boolean
             get() = userApiClient.isKakaoTalkLoginAvailable(context)
 
-        suspend fun loginWithKakao(): LoginRequestDTO =
+        suspend fun loginWithKakao(): PostLoginRequestDTO =
             suspendCancellableCoroutine { continuation ->
                 val callback: (OAuthToken?, Throwable?) -> Unit = { token, error ->
                     if (error != null) {
@@ -42,8 +42,8 @@ class KakaoLoginDataSource
                             } else if (user != null) {
                                 Log.d("KakaoInfoSuccess", "providerId : ${user.id}")
                                 user.let {
-                                    val loginRequestDTO =
-                                        LoginRequestDTO(
+                                    val postLoginRequestDTO =
+                                        PostLoginRequestDTO(
                                             email = it.kakaoAccount?.email!!,
                                             providerId = it.id.toString(),
                                             provider = LoginPlatform.KAKAO.toString().lowercase(),
@@ -53,7 +53,7 @@ class KakaoLoginDataSource
                                                     fcmTokenService.getToken()
                                                 },
                                         )
-                                    continuation.resume(loginRequestDTO)
+                                    continuation.resume(postLoginRequestDTO)
                                 }
                             } else {
                                 continuation.resumeWithException(Exception("Profile is null"))

CatchMate/data/src/main/java/com/catchmate/data/datasource/local/NaverLoginDataSource.kt

@@ -3,7 +3,7 @@ package com.catchmate.data.datasource.local
 import android.content.Context
 import android.util.Log
 import com.catchmate.data.datasource.remote.FCMTokenService
-import com.catchmate.data.dto.LoginRequestDTO
+import com.catchmate.data.dto.PostLoginRequestDTO
 import com.catchmate.domain.model.LoginPlatform
 import com.navercorp.nid.NaverIdLoginSDK
 import com.navercorp.nid.oauth.NidOAuthLogin
@@ -23,7 +23,7 @@ class NaverLoginDataSource
         @ApplicationContext private val context: Context,
         private val fcmTokenService: FCMTokenService,
     ) {
-        suspend fun loginWithNaver(): LoginRequestDTO =
+        suspend fun loginWithNaver(): PostLoginRequestDTO =
             suspendCancellableCoroutine { continuation ->
                 val nidProfileCallback =
                     object : NidProfileCallback<NidProfileResponse> {
@@ -47,8 +47,8 @@ class NaverLoginDataSource
                             if (result.profile != null) {
                                 Log.d("NaverInfoSuccess", "providerId : ${result.profile?.id} email : ${result.profile?.email}")
                                 result.profile?.let {
-                                    val loginRequestDTO =
-                                        LoginRequestDTO(
+                                    val postLoginRequestDTO =
+                                        PostLoginRequestDTO(
                                             email = it.email!!,
                                             providerId = it.id!!,
                                             provider = LoginPlatform.NAVER.toString().lowercase(),
@@ -58,7 +58,7 @@ class NaverLoginDataSource
                                                     fcmTokenService.getToken()
                                                 },
                                         )
-                                    continuation.resume(loginRequestDTO)
+                                    continuation.resume(postLoginRequestDTO)
                                 } ?: continuation.resumeWithException(Exception("Profile is null"))
                             }
                         }

CatchMate/data/src/main/java/com/catchmate/data/datasource/remote/AuthAuthenticator.kt

@@ -26,7 +26,7 @@ class AuthAuthenticator
 
             val reissueResponse =
                 runBlocking {
-                    authRetrofitClient.retrofit.postReissue(refreshToken)
+                    authRetrofitClient.retrofit.postAuthReissue(refreshToken)
                 }
 
             return if (reissueResponse.isSuccessful) {

CatchMate/data/src/main/java/com/catchmate/data/datasource/remote/AuthService.kt

@@ -1,21 +1,29 @@
 package com.catchmate.data.datasource.remote
 
-import com.catchmate.data.dto.LoginRequestDTO
-import com.catchmate.data.dto.LoginResponseDTO
-import com.catchmate.data.dto.ReissueResponseDTO
+import com.catchmate.data.dto.GetCheckNicknameResponseDTO
+import com.catchmate.data.dto.PostLoginRequestDTO
+import com.catchmate.data.dto.PostLoginResponseDTO
+import com.catchmate.data.dto.PostReissueResponseDTO
 import retrofit2.Response
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
+import retrofit2.http.Query
 
 interface AuthService {
     @POST("auth/login")
-    suspend fun postLogin(
-        @Body loginRequestDTO: LoginRequestDTO,
-    ): Response<LoginResponseDTO?>
+    suspend fun postAuthLogin(
+        @Body loginRequestDTO: PostLoginRequestDTO,
+    ): Response<PostLoginResponseDTO?>
 
     @POST("auth/reissue")
-    suspend fun postReissue(
+    suspend fun postAuthReissue(
         @Header("RefreshToken") refreshToken: String,
-    ): Response<ReissueResponseDTO?>
+    ): Response<PostReissueResponseDTO?>
+
+    @GET("auth/check-nickname")
+    suspend fun getAuthCheckNickname(
+        @Query("nickName") nickName: String,
+    ): Response<GetCheckNicknameResponseDTO?>
 }

CatchMate/data/src/main/java/com/catchmate/data/datasource/remote/BoardService.kt

@@ -0,0 +1,57 @@
+package com.catchmate.data.datasource.remote
+
+import com.catchmate.data.dto.DeleteBoardRequestDTO
+import com.catchmate.data.dto.GetBoardPagingResponseDTO
+import com.catchmate.data.dto.GetBoardResponseDTO
+import com.catchmate.data.dto.GetLikedBoardResponseDTO
+import com.catchmate.data.dto.PostBoardRequestDTO
+import com.catchmate.data.dto.PostBoardResponseDTO
+import com.catchmate.data.dto.PutBoardRequestDTO
+import com.catchmate.data.dto.PutBoardResponseDTO
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+interface BoardService {
+    @POST("board/write")
+    suspend fun postBoard(
+        @Body postBoardRequestDTO: PostBoardRequestDTO,
+    ): Response<PostBoardResponseDTO?>
+
+    @POST("board/like/{boardId}")
+    suspend fun postBoardLike(
+        @Path("boardId") boardId: Long,
+        @Query("flag") flag: Int,
+    ): Response<Int>
+
+    @PUT("board/edit")
+    suspend fun putBoard(
+        @Body putBoardRequestDTO: PutBoardRequestDTO,
+    ): Response<PutBoardResponseDTO?>
+
+    @GET("board/page/{pageNum}")
+    suspend fun getBoardPaging(
+        @Path("pageNum") pageNum: Long,
+        @Query("gudans") gudans: String,
+        @Query("people") people: Int,
+        @Query("gameDate") gameDate: String,
+    ): Response<List<GetBoardPagingResponseDTO>?>
+
+    @GET("board/{boardId}")
+    suspend fun getBoard(
+        @Path("boardId") boardId: Long,
+    ): Response<GetBoardResponseDTO?>
+
+    @GET("board/likes")
+    suspend fun getLikedBoard(): Response<List<GetLikedBoardResponseDTO>?>
+
+    @DELETE("board/remove")
+    suspend fun deleteBoard(
+        @Body deleteBoardRequest: DeleteBoardRequestDTO,
+    ): Response<Int>
+}

CatchMate/data/src/main/java/com/catchmate/data/datasource/remote/EnrollService.kt

@@ -1,22 +1,23 @@
 package com.catchmate.data.datasource.remote
 
-import com.catchmate.data.dto.EnrollCancelResponseDTO
-import com.catchmate.data.dto.EnrollRequestDTO
-import com.catchmate.data.dto.EnrollResponseDTO
+import com.catchmate.data.dto.PatchEnrollRejectResponseDTO
+import com.catchmate.data.dto.PostEnrollRequestDTO
+import com.catchmate.data.dto.PostEnrollResponseDTO
 import retrofit2.Response
 import retrofit2.http.Body
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface EnrollService {
     @POST("enroll/{boardId}")
     suspend fun postEnroll(
         @Path("boardId") boardId: Long,
-        @Body enrollRequestDTO: EnrollRequestDTO,
-    ): Response<EnrollResponseDTO?>
+        @Body postEnrollRequestDTO: PostEnrollRequestDTO,
+    ): Response<PostEnrollResponseDTO?>
 
-    @POST("enroll/cancel/{enrollId}")
-    suspend fun postEnrollCancel(
+    @PATCH("enroll/{enrollId}/reject")
+    suspend fun patchEnrollReject(
         @Path("enrollId") enrollId: Long,
-    ): Response<EnrollCancelResponseDTO?>
+    ): Response<PatchEnrollRejectResponseDTO?>
 }

CatchMate/data/src/main/java/com/catchmate/data/datasource/remote/UserService.kt

@@ -1,10 +1,19 @@
 package com.catchmate.data.datasource.remote
 
 import com.catchmate.data.dto.GetUserProfileResponseDTO
+import com.catchmate.data.dto.PostUserAdditionalInfoRequestDTO
+import com.catchmate.data.dto.PostUserAdditionalInfoResponseDTO
 import retrofit2.Response
+import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.POST
 
 interface UserService {
     @GET("user/profile")
     suspend fun getUserProfile(): Response<GetUserProfileResponseDTO?>
+
+    @POST("user/additional-info")
+    suspend fun postUserAdditionalInfo(
+        @Body postUserAdditionalInfoRequestDTO: PostUserAdditionalInfoRequestDTO,
+    ): Response<PostUserAdditionalInfoResponseDTO?>
 }