[feat] #173 미분류 링크 이동 로직 추가

Author: stealmh

Projects/CoreKit/Sources/Data/DTO/Content/ContentMoveRequest.swift

@@ -0,0 +1,21 @@
+//
+//  ContentMoveRequest.swift
+//  CoreKit
+//
+//  Created by 김민호 on 12/29/24.
+//
+import Foundation
+/// 미분류 링크를 카테고리로 이동
+public struct ContentMoveRequest: Encodable {
+    let contentIds: [Int]
+    let categoryId: Int
+    
+    public init(contentIds: [Int], categoryId: Int) {
+        self.contentIds = contentIds
+        self.categoryId = categoryId
+    }
+}
+
+extension ContentMoveRequest {
+    public static let mock: Self = Self(contentIds: [123,456], categoryId: 444)
+}

Projects/CoreKit/Sources/Data/Network/Content/ContentClient+LiveKey.swift

@@ -55,6 +55,9 @@ extension ContentClient: DependencyKey {
                 try await provider.requestNoBody(
                     .썸네일_수정(contentId: id, model: model)
                 )
+            },
+            미분류_링크_포킷_이동: { model in
+                try await provider.requestNoBody(.미분류_링크_포킷_이동(model: model))
             }
         )
     }()

Projects/CoreKit/Sources/Data/Network/Content/ContentClient+TestKey.swift

@@ -18,7 +18,8 @@ extension ContentClient: TestDependencyKey {
             카테고리_내_컨텐츠_목록_조회: { _, _, _ in .mock },
             미분류_카테고리_컨텐츠_조회: { _ in .mock },
             컨텐츠_검색: { _, _ in .mock },
-            썸네일_수정: { _, _ in }
+            썸네일_수정: { _, _ in },
+            미분류_링크_포킷_이동: { _ in }
         )
     }()
 }

Projects/CoreKit/Sources/Data/Network/Content/ContentClient.swift

@@ -44,5 +44,8 @@ public struct ContentClient {
         _ contentId: String,
         _ model: ThumbnailRequest
     ) async throws -> Void
+    public var 미분류_링크_포킷_이동: @Sendable (
+        _ model: ContentMoveRequest
+    ) async throws -> Void
 }
 

Projects/CoreKit/Sources/Data/Network/Content/ContentEndpoint.swift

@@ -28,6 +28,7 @@ public enum ContentEndpoint {
         condition: BaseConditionRequest
     )
     case 썸네일_수정(contentId: String, model: ThumbnailRequest)
+    case 미분류_링크_포킷_이동(model: ContentMoveRequest)
 }
 
 extension ContentEndpoint: TargetType {
@@ -57,6 +58,8 @@ extension ContentEndpoint: TargetType {
             return ""
         case let .썸네일_수정(contentId, _):
             return "/thumbnail/\(contentId)"
+        case .미분류_링크_포킷_이동:
+            return ""
         }
     }
 
@@ -72,7 +75,8 @@ extension ContentEndpoint: TargetType {
             return .post
 
         case .컨텐츠_수정,
-             .썸네일_수정:
+             .썸네일_수정,
+             .미분류_링크_포킷_이동:
             return .patch
 
         case .카태고리_내_컨텐츠_목록_조회,
@@ -135,6 +139,9 @@ extension ContentEndpoint: TargetType {
             )
         case let .썸네일_수정(_, model):
             return .requestJSONEncodable(model)
+            
+        case let .미분류_링크_포킷_이동(model):
+            return .requestJSONEncodable(model)
         }
     }
 

Projects/Feature/FeaturePokit/Sources/PokitLinkEditFeature.swift

@@ -5,19 +5,28 @@
 //  Created by 김민호 on 12/24/24.
 
 import ComposableArchitecture
+import CoreKit
 import Domain
 import Util
 
 @Reducer
 public struct PokitLinkEditFeature {
     /// - Dependency
     @Dependency(\.dismiss) var dismiss
+    @Dependency(CategoryClient.self) var categoryClient
+    @Dependency(ContentClient.self) var contentClient
     /// - State
     @ObservableState
     public struct State: Equatable {
+        /// 링크 아이템 Doamin
         var item: BaseContentListInquiry
+        /// 카테고리 아이템 Domain
+        var category: BaseCategoryListInquiry?
+        /// 링크 목록
         var list = IdentifiedArrayOf<BaseContentItem>()
+        /// 선택한 링크 목록
         var selectedItems = IdentifiedArrayOf<BaseContentItem>()
+        /// 포킷 이동 눌렀을 때 sheet
         var isPresented: Bool = false
 
         public init(linkList: BaseContentListInquiry) {
@@ -40,12 +49,17 @@ public struct PokitLinkEditFeature {
         public enum View: BindableAction, Equatable {
             case binding(BindingAction<State>)
             case dismiss
+            case onAppear
 
+            case 카테고리_추가_버튼_눌렀을때
             case 체크박스_선택했을때(BaseContentItem)
             case 카테고리_선택했을때(BaseCategoryItem)
         }
 
-        public enum InnerAction: Equatable { case 없음 }
+        public enum InnerAction: Equatable {
+            case 카테고리_목록_조회_API_반영(BaseCategoryListInquiry)
+            case 미분류_카테고리_이동_API_반영
+        }
 
         public enum AsyncAction: Equatable { case 없음 }
 
@@ -101,6 +115,12 @@ private extension PokitLinkEditFeature {
         case .dismiss:
             return .run { _ in await dismiss() }
 
+        case .onAppear:
+            return fetchCateogryList()
+            
+        case .카테고리_추가_버튼_눌렀을때:
+            return .none
+            
         case let .체크박스_선택했을때(item):
             /// 이미 체크되어 있다면 해제
             if state.selectedItems.contains(item) {
@@ -111,15 +131,27 @@ private extension PokitLinkEditFeature {
             return .none
 
         case let .카테고리_선택했을때(pokit):
-            //TODO: 포킷이동 네트워크 구현
-            state.isPresented = false
-            return .none
+            return moveContentList(categoryId: pokit.id, state: &state)
         }
     }
 
     /// - Inner Effect
     func handleInnerAction(_ action: Action.InnerAction, state: inout State) -> Effect<Action> {
-        return .none
+        switch action {
+        case let .카테고리_목록_조회_API_반영(response):
+            state.category = response
+            return .none
+            
+        case .미분류_카테고리_이동_API_반영:
+            /// 1. 시트 내리기
+            state.isPresented = false
+            /// 2. 선택했던 체크리스트 삭제
+            state.selectedItems
+                .map { $0.id }
+                .forEach { state.list.remove(id: $0) }
+            state.selectedItems.removeAll()
+            return .none
+        }
     }
 
     /// - Async Effect
@@ -154,4 +186,23 @@ private extension PokitLinkEditFeature {
     func handleDelegateAction(_ action: Action.DelegateAction, state: inout State) -> Effect<Action> {
         return .none
     }
+    
+    /// 카테고리 목록 조회 API
+    func fetchCateogryList() -> Effect<Action> {
+        return .run { send in
+            let request: BasePageableRequest = BasePageableRequest(page: 0, size: 100, sort: ["createdAt", "desc"])
+            let response = try await categoryClient.카테고리_목록_조회(model: request, filterUncategorized: false).toDomain()
+            await send(.inner(.카테고리_목록_조회_API_반영(response)))
+        }
+    }
+    
+    /// 미분류 링크 카테고리 이동 API
+    func moveContentList(categoryId: Int, state: inout State) -> Effect<Action> {
+        return .run { [contentIds = state.selectedItems] send in
+            let contentIds = contentIds.map { $0.id }
+            let request = ContentMoveRequest(contentIds: contentIds, categoryId: categoryId)
+            try await contentClient.미분류_링크_포킷_이동(request)
+            await send(.inner(.미분류_카테고리_이동_API_반영))
+        }
+    }
 }

Projects/Feature/FeaturePokit/Sources/PokitLinkEditView.swift

@@ -10,6 +10,7 @@ import ComposableArchitecture
 import DSKit
 import Domain
 import CoreKit
+import Util
 
 @ViewAction(for: PokitLinkEditFeature.self)
 public struct PokitLinkEditView: View {
@@ -30,32 +31,35 @@ public extension PokitLinkEditView {
                     ForEach(store.list, id: \.id) { item in
                         let isFirst = item.id == self.store.list.first?.id
                         let isLast = item.id == self.store.list.last?.id
-                        PokitLinkCard(
-                            link: item,
-                            state: isFirst
-                            ? .top
-                            : isLast ? .bottom : .middle,
-                            type: .unCatgorized(isSelected: store.selectedItems.contains(item)),
-                            action: nil,
-                            kebabAction: nil,
-                            fetchMetaData: {},
-                            favoriteAction: nil,
-                            selectAction: { send(.체크박스_선택했을때(item)) }
-                        )
+                        WithPerceptionTracking {
+                            PokitLinkCard(
+                                link: item,
+                                state: isFirst
+                                ? .top
+                                : isLast ? .bottom : .middle,
+                                type: .unCatgorized(isSelected: store.selectedItems.contains(item)),
+                                action: nil,
+                                kebabAction: nil,
+                                fetchMetaData: {},
+                                favoriteAction: nil,
+                                selectAction: { send(.체크박스_선택했을때(item)) }
+                            )
+                        }
                     }
                 }
+                .padding(.bottom, 38)
             }
             .padding(.top, 16)
-            .pokitNavigationBar(navigationBar)
             .overlay(alignment: .bottom) {
                 actionFloatButtonView
             }
             .padding(.horizontal, 20)
-            .ignoresSafeArea(edges: .bottom)
             .padding(.bottom, 24)
+            .pokitNavigationBar(navigationBar)
+            .ignoresSafeArea(edges: .bottom)
             .sheet(isPresented: $store.isPresented) {
                 PokitSelectSheet(
-                    list: nil,
+                    list: store.category?.data ?? nil,
                     itemSelected: { send(.카테고리_선택했을때($0)) },
                     pokitAddAction: {}
                 )
@@ -64,6 +68,7 @@ public extension PokitLinkEditView {
                 .presentationDetents([.height(564)])
                 .pokitPresentationBackground()
             }
+            .task { await send(.onAppear).finish() }
         }
     }
 }
@@ -92,7 +97,7 @@ private extension PokitLinkEditView {
         store: Store(
             initialState: .init(
                 linkList: BaseContentListInquiry(
-                    data: nil,
+                    data: [BaseContentItem(id: 3, categoryName: "23", categoryId: 255, title: "2323", memo: nil, thumbNail: Constants.mockImageUrl, data: "", domain: "", createdAt: "", isRead: false, isFavorite: false)],
                     page: 0,
                     size: 0,
                     sort: [],

Projects/Feature/FeaturePokit/Sources/PokitRootView.swift

@@ -59,8 +59,10 @@ public extension PokitRootView {
                     state: \.linkEdit,
                     action: \.scope.linkEdit
                 )
-            ) {
-                PokitLinkEditView(store: $0)
+            ) { store in
+                WithPerceptionTracking {
+                    PokitLinkEditView(store: store)
+                }
             }
             .task { await send(.뷰가_나타났을때).finish() }
         }