[API] Rooms 나머지 API 연결

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

@@ -1,7 +1,7 @@
 package com.texthip.thip.data.di
 
 import com.texthip.thip.data.service.BookService
-import com.texthip.thip.data.service.GroupService
+import com.texthip.thip.data.service.RecentSearchService
 import com.texthip.thip.data.service.RoomsService
 import com.texthip.thip.data.service.UserService
 import dagger.Module
@@ -14,12 +14,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
@@ -36,4 +30,10 @@ object ServiceModule {
     fun provideUserService(retrofit: Retrofit): UserService {
         return retrofit.create(UserService::class.java)
     }
+
+    @Provides
+    @Singleton
+    fun provideRecentSearchService(retrofit: Retrofit): RecentSearchService {
+        return retrofit.create(RecentSearchService::class.java)
+    }
 }

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

app/src/main/java/com/texthip/thip/data/model/group/request/CreateRoomRequest.kt → 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

app/src/main/java/com/texthip/thip/data/model/group/request/RoomJoinRequest.kt → 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/RoomSecreteRoomRequest.kt

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

app/src/main/java/com/texthip/thip/data/model/group/response/CreateRoomResponse.kt → 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

app/src/main/java/com/texthip/thip/data/model/group/response/JoinedRoomListResponse.kt → 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

app/src/main/java/com/texthip/thip/data/model/group/response/MyRoomListResponse.kt → 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
+)

app/src/main/java/com/texthip/thip/data/model/group/response/RoomJoinResponse.kt → 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

app/src/main/java/com/texthip/thip/data/model/group/response/RoomMainResponse.kt → app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomMainResponse.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/group/response/RoomRecruitingResponse.kt → app/src/main/java/com/texthip/thip/data/model/rooms/response/RoomRecruitingResponse.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
@@ -15,6 +15,7 @@ data class RoomRecruitingResponse(
     @SerialName("progressEndDate") val progressEndDate: String,
     @SerialName("recruitEndDate") val recruitEndDate: String,
     @SerialName("category") val category: String,
+    @SerialName("categoryColor") val categoryColor: String,
     @SerialName("roomDescription") val roomDescription: String,
     @SerialName("memberCount") val memberCount: Int,
     @SerialName("recruitCount") val recruitCount: Int,

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

@@ -0,0 +1,11 @@
+package com.texthip.thip.data.model.rooms.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class RoomSecreteRoomResponse(
+    @SerialName("matched") val matched: Boolean = false,
+    @SerialName("roomId") val roomId: Int = 0
+)

app/src/main/java/com/texthip/thip/data/provider/StringResourceProvider.kt

@@ -0,0 +1,21 @@
+package com.texthip.thip.data.provider
+
+import android.content.Context
+import androidx.annotation.StringRes
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StringResourceProvider @Inject constructor(
+    @param:ApplicationContext private val context: Context
+) {
+
+    fun getString(@StringRes resId: Int): String {
+        return context.getString(resId)
+    }
+
+    fun getString(@StringRes resId: Int, vararg formatArgs: Any): String {
+        return context.getString(resId, *formatArgs)
+    }
+}

app/src/main/java/com/texthip/thip/data/repository/BookRepository.kt

@@ -3,11 +3,10 @@ package com.texthip.thip.data.repository
 import com.texthip.thip.data.model.base.handleBaseResponse
 import com.texthip.thip.data.model.book.request.BookSaveRequest
 import com.texthip.thip.data.model.book.response.BookDetailResponse
+import com.texthip.thip.data.model.book.response.BookListResponse
 import com.texthip.thip.data.model.book.response.BookSaveResponse
-import com.texthip.thip.data.model.book.response.BookSavedResponse
 import com.texthip.thip.data.model.book.response.BookSearchResponse
 import com.texthip.thip.data.model.book.response.MostSearchedBooksResponse
-import com.texthip.thip.data.model.book.response.RecentSearchResponse
 import com.texthip.thip.data.model.book.response.RecruitingRoomsResponse
 import com.texthip.thip.data.service.BookService
 import javax.inject.Inject
@@ -19,11 +18,10 @@ class BookRepository @Inject constructor(
 ) {
 
     /** 저장된 책 또는 모임 책 목록 조회 */
-    suspend fun getBooks(type: String): Result<List<BookSavedResponse>> = runCatching {
+    suspend fun getBooks(type: String): Result<BookListResponse?> = runCatching {
         bookService.getBooks(type)
             .handleBaseResponse()
             .getOrThrow()
-            ?.bookList ?: emptyList()
     }
 
     /** 책 검색 */
@@ -40,20 +38,6 @@ class BookRepository @Inject constructor(
             .getOrThrow()
     }
 
-    /** 최근 검색어 조회 */
-    suspend fun getRecentSearches(type: String = "BOOK"): Result<RecentSearchResponse?> = runCatching {
-        bookService.getRecentSearches(type)
-            .handleBaseResponse()
-            .getOrThrow()
-    }
-
-    /** 최근 검색어 삭제 */
-    suspend fun deleteRecentSearch(recentSearchId: Int): Result<Unit> = runCatching {
-        bookService.deleteRecentSearch(recentSearchId)
-            .handleBaseResponse()
-            .getOrThrow()
-    }
-
     /** 책 상세 조회 */
     suspend fun getBookDetail(isbn: String): Result<BookDetailResponse?> = runCatching {
         bookService.getBookDetail(isbn)

app/src/main/java/com/texthip/thip/data/repository/RecentSearchRepository.kt

@@ -0,0 +1,28 @@
+package com.texthip.thip.data.repository
+
+import com.texthip.thip.data.model.base.handleBaseResponse
+import com.texthip.thip.data.model.book.response.RecentSearchResponse
+import com.texthip.thip.data.service.RecentSearchService
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class RecentSearchRepository @Inject constructor(
+    private val recentSearchService: RecentSearchService
+) {
+
+    /** 최근 검색어 조회 */
+    suspend fun getRecentSearches(type: String): Result<RecentSearchResponse?> = runCatching {
+        recentSearchService.getRecentSearches(type)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    /** 최근 검색어 삭제 */
+    suspend fun deleteRecentSearch(recentSearchId: Int): Result<Unit> = runCatching {
+        recentSearchService.deleteRecentSearch(recentSearchId)
+            .handleBaseResponse()
+            .getOrThrow()
+            ?: Unit
+    }
+}