Merge pull request #86 from rbqks529/feat/#83_API_Rooms

[API] Rooms 나머지 API 연결

Author: rbqks529

app/src/main/java/com/texthip/thip/data/di/ServiceModule.kt

@@ -1,6 +1,7 @@
 package com.texthip.thip.data.di
 
 import com.texthip.thip.data.service.BookService
+import com.texthip.thip.data.service.RecentSearchService
 import com.texthip.thip.data.service.CommentsService
 import com.texthip.thip.data.service.GroupService
 import com.texthip.thip.data.service.RoomsService
@@ -15,12 +16,6 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object ServiceModule {
-    
-    @Provides
-    @Singleton
-    fun provideGroupService(retrofit: Retrofit): GroupService {
-        return retrofit.create(GroupService::class.java)
-    }
 
     @Provides
     @Singleton
@@ -38,6 +33,12 @@ object ServiceModule {
         return retrofit.create(UserService::class.java)
     }
 
+    @Provides
+    @Singleton
+    fun provideRecentSearchService(retrofit: Retrofit): RecentSearchService {
+        return retrofit.create(RecentSearchService::class.java)
+    }
+
     @Provides
     @Singleton
     fun providesCommentsService(retrofit: Retrofit): CommentsService =

app/src/main/java/com/texthip/thip/data/model/book/response/BookListResponse.kt

@@ -11,9 +11,10 @@ data class BookListResponse(
 
 @Serializable
 data class BookSavedResponse(
-    @SerialName("isbn") val isbn: String = "",
+    @SerialName("bookId") val bookId: Int = 0,
     @SerialName("bookTitle") val bookTitle: String = "",
     @SerialName("authorName") val authorName: String = "",
     @SerialName("publisher") val publisher: String = "",
-    @SerialName("imageUrl") val imageUrl: String? = null
+    @SerialName("bookImageUrl") val bookImageUrl: String? = null,
+    @SerialName("isbn") val isbn: String = "",
 )

…model/group/request/CreateRoomRequest.kt …model/rooms/request/CreateRoomRequest.ktapp/src/main/java/com/texthip/thip/data/model/group/request/CreateRoomRequest.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/request/CreateRoomRequest.kt app/src/main/java/com/texthip/thip/data/model/group/request/CreateRoomRequest.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/request/CreateRoomRequest.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.request
+package com.texthip.thip.data.model.rooms.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

…a/model/group/request/RoomJoinRequest.kt …a/model/rooms/request/RoomJoinRequest.ktapp/src/main/java/com/texthip/thip/data/model/group/request/RoomJoinRequest.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/request/RoomJoinRequest.kt app/src/main/java/com/texthip/thip/data/model/group/request/RoomJoinRequest.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/request/RoomJoinRequest.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.request
+package com.texthip.thip.data.model.rooms.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/texthip/thip/data/model/rooms/request/RoomSecretRoomRequest.kt

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.rooms.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class RoomSecretRoomRequest(
+    @SerialName("password") val password: String
+)

…del/group/response/CreateRoomResponse.kt …del/rooms/response/CreateRoomResponse.ktapp/src/main/java/com/texthip/thip/data/model/group/response/CreateRoomResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/CreateRoomResponse.kt app/src/main/java/com/texthip/thip/data/model/group/response/CreateRoomResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/CreateRoomResponse.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.response
+package com.texthip.thip.data.model.rooms.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

…group/response/JoinedRoomListResponse.kt …rooms/response/JoinedRoomListResponse.ktapp/src/main/java/com/texthip/thip/data/model/group/response/JoinedRoomListResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt app/src/main/java/com/texthip/thip/data/model/group/response/JoinedRoomListResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/JoinedRoomListResponse.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.response
+package com.texthip.thip.data.model.rooms.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

…del/group/response/MyRoomListResponse.kt …del/rooms/response/MyRoomListResponse.ktapp/src/main/java/com/texthip/thip/data/model/group/response/MyRoomListResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/MyRoomListResponse.kt app/src/main/java/com/texthip/thip/data/model/group/response/MyRoomListResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/MyRoomListResponse.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.response
+package com.texthip.thip.data.model.rooms.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomCloseResponse.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RoomCloseResponse(
+    @SerialName("roomId") val roomId: Int
+)

…model/group/response/RoomJoinResponse.kt …model/rooms/response/RoomJoinResponse.ktapp/src/main/java/com/texthip/thip/data/model/group/response/RoomJoinResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomJoinResponse.kt app/src/main/java/com/texthip/thip/data/model/group/response/RoomJoinResponse.kt renamed to app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomJoinResponse.kt

@@ -1,4 +1,4 @@
-package com.texthip.thip.data.model.group.response
+package com.texthip.thip.data.model.rooms.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable