[FEAT] 책 검색 화면 API 연결

app/src/main/AndroidManifest.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-
+    
     <application
         android:name=".ThipApplication"
         android:allowBackup="true"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"

app/src/main/java/com/texthip/thip/data/manager/Genre.kt

@@ -9,7 +9,7 @@ enum class Genre(
     val networkApiCategory: String = apiCategory
 ) {
     LITERATURE("literature", "문학"),
-    SCIENCE_IT("science_it", "과학·IT", "과학/IT"),
+    SCIENCE_IT("science_it", "과학·IT", "과학·IT"),
     SOCIAL_SCIENCE("social_science", "사회과학"),
     HUMANITIES("humanities", "인문학"),
     ART("art", "예술");

app/src/main/java/com/texthip/thip/data/model/book/request/BookSaveRequest.kt

@@ -0,0 +1,9 @@
+package com.texthip.thip.data.model.book.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BookSaveRequest(
+    @SerialName("type") val type: Boolean = false
+)

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

@@ -0,0 +1,17 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BookDetailResponse(
+    @SerialName("title") val title: String = "",
+    @SerialName("imageUrl") val imageUrl: String? = null,
+    @SerialName("authorName") val authorName: String = "",
+    @SerialName("publisher") val publisher: String = "",
+    @SerialName("isbn") val isbn: String = "",
+    @SerialName("description") val description: String = "",
+    @SerialName("recruitingRoomCount") val recruitingRoomCount: Int = 0,
+    @SerialName("readCount") val readCount: Int = 0,
+    @SerialName("isSaved") val isSaved: Boolean = false
+)

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

@@ -6,14 +6,14 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class BookListResponse(
-    @SerialName("bookList") val bookList: List<BookSavedResponse>
+    @SerialName("bookList") val bookList: List<BookSavedResponse> = emptyList()
 )
 
 @Serializable
 data class BookSavedResponse(
-    @SerialName("isbn") val isbn: String,
-    @SerialName("bookTitle") val bookTitle: String,
-    @SerialName("authorName") val authorName: String,
-    @SerialName("publisher") val publisher: String,
-    @SerialName("imageUrl") val imageUrl: String?
+    @SerialName("isbn") val isbn: String = "",
+    @SerialName("bookTitle") val bookTitle: String = "",
+    @SerialName("authorName") val authorName: String = "",
+    @SerialName("publisher") val publisher: String = "",
+    @SerialName("imageUrl") val imageUrl: String? = null
 )

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

@@ -0,0 +1,10 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BookSaveResponse(
+    @SerialName("isbn") val isbn: String = "",
+    @SerialName("isSaved") val isSaved: Boolean = false
+)

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

@@ -0,0 +1,24 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class BookSearchResponse(
+    @SerialName("searchResult") val searchResult: List<BookSearchItem> = emptyList(),
+    @SerialName("page") val page: Int = 0,
+    @SerialName("size") val size: Int = 0,
+    @SerialName("totalElements") val totalElements: Int = 0,
+    @SerialName("totalPages") val totalPages: Int = 0,
+    @SerialName("last") val last: Boolean = true,
+    @SerialName("first") val first: Boolean = true
+)
+
+@Serializable
+data class BookSearchItem(
+    @SerialName("title") val title: String = "",
+    @SerialName("imageUrl") val imageUrl: String? = null,
+    @SerialName("authorName") val authorName: String = "",
+    @SerialName("publisher") val publisher: String = "",
+    @SerialName("isbn") val isbn: String = ""
+)

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

@@ -0,0 +1,17 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MostSearchedBooksResponse(
+    @SerialName("bookList") val bookList: List<PopularBookItem> = emptyList()
+)
+
+@Serializable
+data class PopularBookItem(
+    @SerialName("rank") val rank: Int = 0,
+    @SerialName("title") val title: String = "",
+    @SerialName("imageUrl") val imageUrl: String? = null,
+    @SerialName("isbn") val isbn: String = ""
+)

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

@@ -0,0 +1,15 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecentSearchResponse(
+    @SerialName("recentSearchList") val recentSearchList: List<RecentSearchItem> = emptyList()
+)
+
+@Serializable
+data class RecentSearchItem(
+    @SerialName("recentSearchId") val recentSearchId: Int = 0,
+    @SerialName("searchTerm") val searchTerm: String = ""
+)

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

@@ -0,0 +1,22 @@
+package com.texthip.thip.data.model.book.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RecruitingRoomsResponse(
+    @SerialName("recruitingRoomList") val recruitingRoomList: List<RecruitingRoomItem> = emptyList(),
+    @SerialName("totalRoomCount") val totalRoomCount: Int = 0,
+    @SerialName("nextCursor") val nextCursor: String? = null,
+    @SerialName("isLast") val isLast: Boolean = true
+)
+
+@Serializable
+data class RecruitingRoomItem(
+    @SerialName("roomId") val roomId: Int = 0,
+    @SerialName("bookImageUrl") val bookImageUrl: String? = null,
+    @SerialName("roomName") val roomName: String = "",
+    @SerialName("memberCount") val memberCount: Int = 0,
+    @SerialName("recruitCount") val recruitCount: Int = 0,
+    @SerialName("deadlineEndDate") val deadlineEndDate: String = ""
+)

app/src/main/java/com/texthip/thip/data/model/group/response/JoinedRoomListResponse.kt

@@ -18,7 +18,7 @@ data class JoinedRoomListResponse(
 data class JoinedRoomResponse(
     @SerialName("roomId") val roomId: Int,
     @SerialName("bookImageUrl") val bookImageUrl: String?,
-    @SerialName("bookTitle") val bookTitle: String,
+    @SerialName("roomTitle") val roomTitle: String,
     @SerialName("memberCount") val memberCount: Int,
     @SerialName("userPercentage") val userPercentage: Int
 )

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

@@ -1,6 +1,14 @@
 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.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
 import javax.inject.Singleton
@@ -11,10 +19,59 @@ class BookRepository @Inject constructor(
 ) {
 
     /** 저장된 책 또는 모임 책 목록 조회 */
-    suspend fun getBooks(type: String) = runCatching {
+    suspend fun getBooks(type: String): Result<List<BookSavedResponse>> = runCatching {
         bookService.getBooks(type)
             .handleBaseResponse()
             .getOrThrow()
             ?.bookList ?: emptyList()
     }
+
+    /** 책 검색 */
+    suspend fun searchBooks(keyword: String, page: Int = 1, isFinalized: Boolean = false): Result<BookSearchResponse?> = runCatching {
+        bookService.searchBooks(keyword, page, isFinalized)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    /** 인기 책 조회 */
+    suspend fun getMostSearchedBooks(): Result<MostSearchedBooksResponse?> = runCatching {
+        bookService.getMostSearchedBooks()
+            .handleBaseResponse()
+            .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)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    /** 책 저장/저장취소 */
+    suspend fun saveBook(isbn: String, type: Boolean): Result<BookSaveResponse?> = runCatching {
+        bookService.saveBook(isbn, BookSaveRequest(type))
+            .handleBaseResponse()
+            .getOrThrow()
+    }
+
+    /** 모집중인 방 조회 */
+    suspend fun getRecruitingRooms(isbn: String, cursor: String? = null): Result<RecruitingRoomsResponse?> = runCatching {
+        bookService.getRecruitingRooms(isbn, cursor)
+            .handleBaseResponse()
+            .getOrThrow()
+    }
 }

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

@@ -65,23 +65,26 @@ class GroupRepository @Inject constructor(
     suspend fun getRoomRecruiting(roomId: Int): Result<RoomRecruitingResponse> = runCatching {
         groupService.getRoomRecruiting(roomId)
             .handleBaseResponse()
-            .getOrThrow()!!
+            .getOrThrow()
+            ?: throw NoSuchElementException("모집중인 모임방 정보를 찾을 수 없습니다.")
     }
 
     /** 새 모임방 생성 */
     suspend fun createRoom(request: CreateRoomRequest): Result<Int> = runCatching {
-        groupService.createRoom(request)
+        val response = groupService.createRoom(request)
             .handleBaseResponse()
-            .getOrThrow()!!
-            .roomId
+            .getOrThrow()
+            ?: throw NoSuchElementException("모임방 생성 응답을 받을 수 없습니다.")
+        response.roomId
     }
 
     /** 모임방 참여 또는 취소 */
     suspend fun joinOrCancelRoom(roomId: Int, type: String): Result<String> = runCatching {
         val request = RoomJoinRequest(type = type)
-        groupService.joinOrCancelRoom(roomId, request)
+        val response = groupService.joinOrCancelRoom(roomId, request)
             .handleBaseResponse()
-            .getOrThrow()!!
-            .type
+            .getOrThrow()
+            ?: throw NoSuchElementException("모임방 참여/취소 응답을 받을 수 없습니다.")
+        response.type
     }
 }

app/src/main/java/com/texthip/thip/data/service/BookService.kt

@@ -1,8 +1,19 @@
 package com.texthip.thip.data.service
 
 import com.texthip.thip.data.model.base.BaseResponse
+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.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 retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface BookService {
@@ -12,4 +23,48 @@ interface BookService {
     suspend fun getBooks(
         @Query("type") type: String
     ): BaseResponse<BookListResponse>
+
+    /** 책 검색 */
+    @GET("books")
+    suspend fun searchBooks(
+        @Query("keyword") keyword: String,
+        @Query("page") page: Int = 1,
+        @Query("isFinalized") isFinalized: Boolean = false
+    ): BaseResponse<BookSearchResponse>
+
+    /** 인기 책 조회 */
+    @GET("books/most-searched")
+    suspend fun getMostSearchedBooks(): BaseResponse<MostSearchedBooksResponse>
+
+    /** 최근 검색어 조회 */
+    @GET("recent-searches")
+    suspend fun getRecentSearches(
+        @Query("type") type: String
+    ): BaseResponse<RecentSearchResponse>
+
+    /** 최근 검색어 삭제 */
+    @DELETE("recent-searches/{recentSearchId}")
+    suspend fun deleteRecentSearch(
+        @Path("recentSearchId") recentSearchId: Int
+    ): BaseResponse<Unit>
+
+    /** 책 상세 조회 */
+    @GET("books/{isbn}")
+    suspend fun getBookDetail(
+        @Path("isbn") isbn: String
+    ): BaseResponse<BookDetailResponse>
+
+    /** 책 저장/저장취소 */
+    @POST("books/{isbn}/saved")
+    suspend fun saveBook(
+        @Path("isbn") isbn: String,
+        @Body request: BookSaveRequest
+    ): BaseResponse<BookSaveResponse>
+
+    /** 모집중인 방 조회 */
+    @GET("books/{isbn}/recruiting-rooms")
+    suspend fun getRecruitingRooms(
+        @Path("isbn") isbn: String,
+        @Query("cursor") cursor: String? = null
+    ): BaseResponse<RecruitingRoomsResponse>
 }