Merge pull request #196 from YAPP-Github/BOOK-284-feature/#185

feat: 독서 기록에 대해 수정 / 삭제 기능 구현 및 기능 연결

Author: clxxrlove

src/Projects/BKData/Sources/API/BookAPI.swift

@@ -9,6 +9,7 @@ enum BookAPI {
     case search(dto: SearchBookRequestDTO)
     case guestSearch(dto: SearchBookRequestDTO)
     case upsert(dto: UserBookRegisterRequestDTO)
+    case delete(bookId: String)
 }
 
 extension BookAPI: RequestTarget {
@@ -28,6 +29,8 @@ extension BookAPI: RequestTarget {
             return "/guest/search"
         case .upsert:
             return "/upsert"
+        case .delete(let bookId):
+            return "/my-library/\(bookId)"
         }
     }
 
@@ -37,6 +40,8 @@ extension BookAPI: RequestTarget {
             return .put
         case .detail, .myLibrary, .search, .guestSearch:
             return .get
+        case .delete:
+            return .delete
         }
     }
 
@@ -46,14 +51,14 @@ extension BookAPI: RequestTarget {
             return [
                 "Content-Type": "application/json"
             ]
-        case .detail, .myLibrary, .search, .guestSearch:
+        case .detail, .myLibrary, .search, .guestSearch, .delete:
             return [:]
         }
     }
 
     var body: Encodable? {
         switch self {
-        case .detail, .myLibrary, .search, .guestSearch:
+        case .detail, .myLibrary, .search, .guestSearch, .delete:
             return nil
         case .upsert(let dto):
             return dto
@@ -70,7 +75,7 @@ extension BookAPI: RequestTarget {
             return dto.dictionary
         case .guestSearch(let dto):
             return dto.dictionary
-        case .upsert:
+        case .upsert, .delete:
             return [:]
         }
     }

src/Projects/BKData/Sources/API/RecordAPI.swift

@@ -8,6 +8,8 @@ enum RecordAPI {
     case fetch(userBookId: String, dto: FetchRecordRequestDTO)
     case detail(userRecordId: String)
     case seed(userRecordId: String)
+    case patch(readingRecordId: String, recordData: RecordVO)
+    case delete(readingRecordId: String)
 }
 
 extension RecordAPI: RequestTarget {
@@ -25,6 +27,10 @@ extension RecordAPI: RequestTarget {
             return "/detail/\(userRecordId)"
         case .seed(let userRecordId):
             return "/\(userRecordId)/seed/stats"
+        case .patch(let readingRecordId, _):
+            return "/\(readingRecordId)"
+        case .delete(let readingRecordId):
+            return "/\(readingRecordId)"
         }
     }
 
@@ -34,6 +40,10 @@ extension RecordAPI: RequestTarget {
             return .post
         case .fetch, .detail, .seed:
             return .get
+        case .patch:
+            return .patch
+        case .delete:
+            return .delete
         }
     }
 
@@ -48,16 +58,16 @@ extension RecordAPI: RequestTarget {
 
     var body: Encodable? {
         switch self {
-        case .insert(_, let data):
+        case .insert(_, let data), .patch(_, let data):
             return InsertRecordRequestDTO(data: data)
-        case .fetch, .detail, .seed:
+        case .fetch, .detail, .seed, .delete:
             return nil
         }
     }
 
     var query: [String: Any] {
         switch self {
-        case .insert, .seed:
+        case .insert, .seed, .patch, .delete:
             return [:]
         case .fetch(_, let dto):
             return dto.toDictionary()

src/Projects/BKData/Sources/DataAssembly.swift

@@ -81,7 +81,11 @@ public struct DataAssembly: Assembly {
             type: BookRepository.self
         ) { _ in
             @Autowired(name: "OAuth") var networkProvider: NetworkProvider
-            return DefaultBookRepository(networkProvider: networkProvider)
+            @Autowired(name: "Default") var defaultNetworkProvider: NetworkProvider
+            return DefaultBookRepository(
+                networkProvider: networkProvider,
+                defaultNetworkProvider: defaultNetworkProvider
+            )
         }
 
         container.register(

src/Projects/BKData/Sources/Repository/DefaultBookRepository.swift

@@ -7,9 +7,11 @@ import Foundation
 
 public struct DefaultBookRepository: BookRepository {
     private let networkProvider: NetworkProvider
+    private let defaultNetworkProvider: NetworkProvider
 
-    public init(networkProvider: NetworkProvider) {
+    public init(networkProvider: NetworkProvider, defaultNetworkProvider: NetworkProvider) {
         self.networkProvider = networkProvider
+        self.defaultNetworkProvider = defaultNetworkProvider
     }
 
     public func search(
@@ -42,7 +44,7 @@ public struct DefaultBookRepository: BookRepository {
     public func guestSearch(
         _ parameters: SearchBookParameters
     ) -> AnyPublisher<([Book], totalResults: Int), DomainError> {
-        networkProvider.request(
+        defaultNetworkProvider.request(
             target: BookAPI.guestSearch(
                 dto: SearchBookRequestDTO(
                     query: parameters.query,
@@ -132,4 +134,19 @@ public struct DefaultBookRepository: BookRepository {
         .map { $0.toBook() }
         .eraseToAnyPublisher()
     }
+    
+    public func delete(
+        bookId: String
+    ) -> AnyPublisher<Void, DomainError> {
+        networkProvider.request(
+            target: BookAPI.delete(
+                bookId: bookId
+            ),
+            type: EmptyResponse.self
+        )
+        .mapError { $0.toDomainError() }
+        .debugError(logger: AppLogger.network)
+        .map { _ in }
+        .eraseToAnyPublisher()
+    }
 }

src/Projects/BKData/Sources/Repository/DefaultRecordRepository.swift

@@ -62,4 +62,36 @@ public final class DefaultRecordRepository: RecordRepository {
         .map { $0.toRecordInfo() }
         .eraseToAnyPublisher()
     }
+    
+    public func patch(
+        recordId: String,
+        recordData: RecordVO
+    ) -> AnyPublisher<RecordInfo, DomainError> {
+        networkProvider.request(
+            target: RecordAPI.patch(
+                readingRecordId: recordId,
+                recordData: recordData
+            ),
+            type: InsertRecordResponseDTO.self
+        )
+        .mapError { $0.toDomainError() }
+        .debugError(logger: AppLogger.network)
+        .map { $0.toRecordInfo() }
+        .eraseToAnyPublisher()
+    }
+    
+    public func delete(
+        recordId: String
+    ) -> AnyPublisher<Void, DomainError> {
+        networkProvider.request(
+            target: RecordAPI.delete(
+                readingRecordId: recordId
+            ),
+            type: EmptyResponse.self
+        )
+        .mapError { $0.toDomainError() }
+        .debugError(logger: AppLogger.network)
+        .map { _ in }
+        .eraseToAnyPublisher()
+    }
 }

src/Projects/BKDesign/Resources/Assets.xcassets/icons/share.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "share.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "share@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "share@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

src/Projects/BKDesign/Resources/Assets.xcassets/icons/share.imageset/share.svg

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "trash.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "trash@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "trash@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}