refactor: API 수정사항 반영

CatchMate/app/build.gradle.kts

@@ -38,6 +38,16 @@ android {
             excludes.add("META-INF/DEPENDENCIES")
         }
     }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules-release.pro",
+            )
+        }
+    }
 }
 
 dependencies {

CatchMate/build-logic/src/main/kotlin/com/catchmate/app/KotlinAndroid.kt

@@ -37,7 +37,7 @@ internal fun Project.configureKotlinAndroid() {
                 )
             }
             getByName("release") {
-                isMinifyEnabled = true
+                isMinifyEnabled = false
                 proguardFiles(
                     getDefaultProguardFile("proguard-android-optimize.txt"),
                     "proguard-rules-release.pro",

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

@@ -52,10 +52,11 @@ interface BoardService {
         @Query("size") size: Int? = null,
     ): Response<GetBoardListResponseDTO?>
 
-    @GET("boards/list/{userId}")
+    @GET("api/boards/users/{userId}")
     suspend fun getUserBoardList(
         @Path("userId") userId: Long,
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetUserBoardListResponseDTO?>
 
     @GET("api/boards/{boardId}")

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

@@ -20,9 +20,10 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface ChattingService {
-    @GET("chat-rooms/list")
+    @GET("api/chat/rooms")
     suspend fun getChattingRoomList(
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetChattingRoomListResponseDTO?>
 
     @GET("chat-rooms/{chatRoomId}/user-list")

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

@@ -3,9 +3,9 @@ package com.catchmate.data.datasource.remote
 import com.catchmate.data.dto.enroll.DeleteEnrollResponseDTO
 import com.catchmate.data.dto.enroll.GetAllReceivedEnrollResponseDTO
 import com.catchmate.data.dto.enroll.GetEnrollNewCountResponseDTO
+import com.catchmate.data.dto.enroll.GetEnrollResponseDTO
 import com.catchmate.data.dto.enroll.GetReceivedEnrollResponseDTO
 import com.catchmate.data.dto.enroll.GetRequestedEnrollListResponseDTO
-import com.catchmate.data.dto.enroll.GetRequestedEnrollResponseDTO
 import com.catchmate.data.dto.enroll.PatchEnrollAcceptResponseDTO
 import com.catchmate.data.dto.enroll.PatchEnrollRejectResponseDTO
 import com.catchmate.data.dto.enroll.PostEnrollRequestDTO
@@ -20,46 +20,50 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface EnrollService {
-    @POST("enrolls/{boardId}")
+    @POST("api/boards/{boardId}/enrolls")
     suspend fun postEnroll(
         @Path("boardId") boardId: Long,
         @Body postEnrollRequestDTO: PostEnrollRequestDTO,
     ): Response<PostEnrollResponseDTO?>
 
-    @PATCH("enrolls/{enrollId}/reject")
+    @PATCH("api/enrolls/{enrollId}/reject")
     suspend fun patchEnrollReject(
         @Path("enrollId") enrollId: Long,
     ): Response<PatchEnrollRejectResponseDTO?>
 
-    @PATCH("enrolls/{enrollId}/accept")
+    @PATCH("api/enrolls/{enrollId}/accept")
     suspend fun patchEnrollAccept(
         @Path("enrollId") enrollId: Long,
     ): Response<PatchEnrollAcceptResponseDTO?>
 
-    @GET("enrolls/{boardId}/description")
-    suspend fun getRequestedEnroll(
-        @Path("boardId") boardId: Long,
-    ): Response<GetRequestedEnrollResponseDTO?>
+    @GET("api/enrolls/{enrollId}")
+    suspend fun getEnroll(
+        @Path("enrollId") enrollId: Long,
+    ): Response<GetEnrollResponseDTO?>
 
-    @GET("enrolls/request")
+    @GET("api/enrolls/request")
     suspend fun getRequestedEnrollList(
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetRequestedEnrollListResponseDTO?>
 
-    @GET("enrolls/receive")
+    @GET("api/enrolls/receive")
     suspend fun getReceivedEnroll(
         @Query("boardId") boardId: Long,
+        @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetReceivedEnrollResponseDTO?>
 
-    @GET("enrolls/receive/all")
+    @GET("api/enrolls/receive/all")
     suspend fun getAllReceivedEnroll(
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetAllReceivedEnrollResponseDTO?>
 
-    @GET("enrolls/new-count")
+    @GET("api/enrolls/count")
     suspend fun getEnrollNewCount(): Response<GetEnrollNewCountResponseDTO?>
 
-    @DELETE("enrolls/cancel/{enrollId}")
+    @DELETE("api/enrolls/{enrollId}")
     suspend fun deleteEnroll(
         @Path("enrollId") enrollId: Long,
     ): Response<DeleteEnrollResponseDTO?>

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

@@ -1,7 +1,8 @@
 package com.catchmate.data.datasource.remote
 
 import com.catchmate.data.dto.notification.DeleteReceivedNotificationResponseDTO
-import com.catchmate.data.dto.notification.GetReceivedNotificationListResponseDTO
+import com.catchmate.data.dto.notification.GetHasUnreadNotificationResponseDto
+import com.catchmate.data.dto.notification.GetNotificationListResponseDTO
 import com.catchmate.data.dto.notification.GetReceivedNotificationResponseDTO
 import retrofit2.Response
 import retrofit2.http.DELETE
@@ -10,18 +11,22 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface NotificationService {
-    @GET("notifications/receive")
-    suspend fun getReceivedNotificationList(
+    @GET("api/notifications")
+    suspend fun getNotificationList(
         @Query("page") page: Int,
-    ): Response<GetReceivedNotificationListResponseDTO?>
+        @Query("size") size: Int,
+    ): Response<GetNotificationListResponseDTO?>
+
+    @GET("api/notifications/unread")
+    suspend fun getHasUnreadNotification(): Response<GetHasUnreadNotificationResponseDto>
 
     @GET("notifications/receive/{notificationId}")
     suspend fun getReceivedNotification(
         @Path("notificationId") notificationId: Long,
     ): Response<GetReceivedNotificationResponseDTO?>
 
-    @DELETE("notifications/receive/{notificationId}")
-    suspend fun deleteReceivedNotification(
+    @DELETE("api/notifications/{notificationId}")
+    suspend fun deleteNotification(
         @Path("notificationId") notificationId: Long,
-    ): Response<DeleteReceivedNotificationResponseDTO?>
+    ): Response<Unit>
 }

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

@@ -15,28 +15,28 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface SupportService {
-    @GET("inquiries/{inquiryId}")
+    @GET("api/inquiries/{inquiryId}")
     suspend fun getInquiry(
         @Path("inquiryId") inquiryId: Long,
     ): Response<GetInquiryResponseDTO?>
 
-    @POST("inquiries")
+    @POST("api/inquiries")
     suspend fun postInquiry(
         @Body postInquiryRequestDTO: PostInquiryRequestDTO,
     ): Response<PostInquiryResponseDTO?>
 
-    @POST("reports/{reportedUserId}")
+    @POST("api/reports")
     suspend fun postUserReport(
-        @Path("reportedUserId") reportedUserId: Long,
         @Body postUserReportRequestDTO: PostUserReportRequestDTO,
     ): Response<PostUserReportResponseDTO?>
 
-    @GET("notices/list")
+    @GET("api/notices")
     suspend fun getNoticeList(
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetNoticeListResponseDTO?>
 
-    @GET("notices/{noticeId}")
+    @GET("api/notices/{noticeId}")
     suspend fun getNoticeDetail(
         @Path("noticeId") noticeId: Long,
     ): Response<NoticeInfoDTO?>

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

@@ -4,7 +4,7 @@ import com.catchmate.data.dto.user.DeleteBlockedUserResponseDTO
 import com.catchmate.data.dto.user.DeleteUserAccountResponseDTO
 import com.catchmate.data.dto.user.GetBlockedUserListResponseDTO
 import com.catchmate.data.dto.user.GetCheckNicknameResponseDTO
-import com.catchmate.data.dto.user.GetUnreadInfoResponseDTO
+import com.catchmate.data.dto.user.GetUserAlarmResponseDto
 import com.catchmate.data.dto.user.GetUserProfileByIdResponseDTO
 import com.catchmate.data.dto.user.GetUserProfileResponseDTO
 import com.catchmate.data.dto.user.PatchUserAlarmResponseDTO
@@ -34,22 +34,23 @@ interface UserService {
     @GET("api/users/profile")
     suspend fun getUserProfile(): Response<GetUserProfileResponseDTO?>
 
-    @GET("users/profile/{profileUserId}")
+    @GET("api/users/profile/{profileUserId}")
     suspend fun getUserProfileById(
         @Path("profileUserId") profileUserId: Long,
     ): Response<GetUserProfileByIdResponseDTO?>
 
-    @GET("users/block")
+    @GET("api/users/blocks")
     suspend fun getBlockedUserList(
         @Query("page") page: Int,
+        @Query("size") size: Int,
     ): Response<GetBlockedUserListResponseDTO?>
 
-    @GET("users/has-unread")
-    suspend fun getUnreadInfo(): Response<GetUnreadInfoResponseDTO?>
+    @GET("api/users/alarm")
+    suspend fun getUserAlarmState(): Response<GetUserAlarmResponseDto?>
 
-    @POST("users/block/{blockedUserId}")
+    @POST("api/users/blocks/{targetUserId}")
     suspend fun postUserBlock(
-        @Path("blockedUserId") blockedUserId: Long,
+        @Path("targetUserId") targetUserId: Long,
     ): Response<PostUserBlockResponseDTO?>
 
     @POST("api/users/additional-info")
@@ -58,7 +59,7 @@ interface UserService {
     ): Response<PostUserAdditionalInfoResponseDTO?>
 
     @Multipart
-    @PATCH("users/profile")
+    @PATCH("api/users/profile")
     suspend fun patchUserProfile(
         @Part("request") request: RequestBody,
         @Part profileImage: MultipartBody.Part,
@@ -70,9 +71,9 @@ interface UserService {
         @Query("isEnabled") isEnabled: Boolean,
     ): Response<PatchUserAlarmResponseDTO?>
 
-    @DELETE("users/block/{blockedUserId}")
+    @DELETE("api/users/blocks/{targetUserId}")
     suspend fun deleteBlockedUser(
-        @Path("blockedUserId") blockedUserId: Long,
+        @Path("targetUserId") targetUserId: Long,
     ): Response<DeleteBlockedUserResponseDTO?>
 
     @DELETE("users/withdraw")

CatchMate/data/src/main/java/com/catchmate/data/dto/board/GetBoardResponseDTO.kt

@@ -15,7 +15,8 @@ data class GetBoardResponseDTO(
     val liftUpDate: String,
     val bookMarked: Boolean,
     val buttonStatus: String,
-    val chatRoomId: Long?,
+    val myEnrollId: Long,
+    val chatRoomId: Long,
     val cheerClub: ClubDTO,
     val game: GameInfoDTO,
     val user: UserInfoDTO,

CatchMate/data/src/main/java/com/catchmate/data/dto/board/GetUserBoardListResponseDTO.kt

@@ -1,9 +1,9 @@
 package com.catchmate.data.dto.board
 
 data class GetUserBoardListResponseDTO(
-    val boardInfoList: List<BoardDTO>,
+    val content: List<BoardDTO>,
+    val pageNumber: Int,
     val totalPages: Int,
     val totalElements: Int,
-    val isFirst: Boolean,
-    val isLast: Boolean,
+    val hasNext: Boolean,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/board/PostBoardRequestDTO.kt

@@ -1,13 +1,12 @@
 package com.catchmate.data.dto.board
 
 data class PostBoardRequestDTO(
-    val boardId: Long? = null, // 임시저장 완성 시 임시저장 게시글 boardId 삽입, 새 게시글 생성 시 null
     val title: String?,
     val content: String?,
     val maxPerson: Int?,
     val cheerClubId: Int?,
     val preferredGender: String?,
     val preferredAgeRange: List<String>?,
-    val completed: Boolean, // 임시 저장 시 false, 게시글 작성 시 true
-    val gameRequest: GameRequestDto?,
+    val completed: Boolean, // 임시 저장 시 false, 게시글 등록 시 true
+    val gameCreateRequest: GameRequestDto?,
 ) // 임시 저장 시 미입력 항목은 전부 null로 보냄

CatchMate/data/src/main/java/com/catchmate/data/dto/board/PostBoardResponseDTO.kt

@@ -1,17 +1,6 @@
 package com.catchmate.data.dto.board
 
-import com.catchmate.data.dto.enroll.GameInfoDTO
-import com.catchmate.data.dto.enroll.UserInfoDTO
-import com.catchmate.data.dto.user.ClubDTO
-
 data class PostBoardResponseDTO(
     val boardId: Long,
-    val title: String,
-    val content: String,
-    val currentPerson: Int,
-    val maxPerson: Int,
-    val bookMarked: Boolean,
-    val cheerClub: ClubDTO,
-    val gameResponse: GameInfoDTO,
-    val userResponse: UserInfoDTO,
+    val createdAt: String,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/board/PutBoardRequestDTO.kt

@@ -8,5 +8,5 @@ data class PutBoardRequestDTO(
     val preferredGender: String?,
     val preferredAgeRange: List<String>?,
     val completed: Boolean,
-    val gameRequest: GameRequestDto,
+    val gameUpdateRequest: GameRequestDto,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/board/PutBoardResponseDTO.kt

@@ -1,17 +1,6 @@
 package com.catchmate.data.dto.board
 
-import com.catchmate.data.dto.enroll.GameInfoDTO
-import com.catchmate.data.dto.enroll.UserInfoDTO
-import com.catchmate.data.dto.user.ClubDTO
-
 data class PutBoardResponseDTO(
     val boardId: Long,
-    val title: String,
-    val content: String,
-    val currentPerson: Int,
-    val maxPerson: Int,
-    val bookMarked: Boolean,
-    val cheerClub: ClubDTO,
-    val gameResponse: GameInfoDTO,
-    val userResponse: UserInfoDTO,
+    val createdAt: String,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/chatting/ChatRoomInfoDTO.kt

@@ -4,12 +4,7 @@ import com.catchmate.data.dto.board.BoardDTO
 
 data class ChatRoomInfoDTO(
     val chatRoomId: Long,
-    val boardInfo: BoardDTO,
-    val participantCount: Int,
-    val lastMessageAt: String?,
-    val lastMessageContent: String?,
-    val chatRoomImage: String,
-    val unreadMessageCount: Int,
-    val isNewChatRoom: Boolean,
-    val isNotificationEnabled: Boolean,
+    val board: BoardDTO,
+    val lastMessage: LastMessageInfoDto?,
+    val createdAt: String,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/chatting/GetChattingRoomListResponseDTO.kt

@@ -1,9 +1,9 @@
 package com.catchmate.data.dto.chatting
 
 data class GetChattingRoomListResponseDTO(
-    val chatRoomInfoList: List<ChatRoomInfoDTO>,
+    val content: List<ChatRoomInfoDTO>,
+    val pageNumber: Int,
     val totalPages: Int,
     val totalElements: Int,
-    val isFirst: Boolean,
-    val isLast: Boolean,
+    val hasNext: Boolean,
 )

CatchMate/data/src/main/java/com/catchmate/data/dto/chatting/LastMessageInfoDto.kt

@@ -0,0 +1,12 @@
+package com.catchmate.data.dto.chatting
+
+data class LastMessageInfoDto(
+    val messageId: Long,
+    val chatRoomId: Long,
+    val senderId: Long,
+    val senderNickName: String,
+    val senderProfileImageUrl: String,
+    val content: String,
+    val messageType: String,
+    val createdAt: String,
+)

CatchMate/data/src/main/java/com/catchmate/data/dto/enroll/AllReceivedEnrollInfoResponseDTO.kt

@@ -1,6 +1,6 @@
 package com.catchmate.data.dto.enroll
 
 data class AllReceivedEnrollInfoResponseDTO(
-    val boardInfo: EnrollBoardInfoDTO,
-    val enrollReceiveInfoList: List<ReceivedEnrollInfoDTO>,
+    val boardResponse: EnrollBoardInfoDTO,
+    val enrollResponses: List<ReceivedEnrollInfoDTO>,
 )