[fix] 즐겨찾기 카테고리 수정

stealmh · stealmh · commit 947435176c4a · 2025-02-02T12:02:22.000+09:00
- isFavorite field 추가로 인한 DTO, Domain 수정
diff --git a/Projects/App/Sources/MainTab/MainTabPath.swift b/Projects/App/Sources/MainTab/MainTabPath.swift
@@ -245,7 +245,8 @@ public extension MainTabFeature {
                     createdAt: "",
                     openType: .공개,
                     keywordType: .default,
-                    userCount: 0
+                    userCount: 0,
+                    isFavorite: false
                 )
                 state.path.append(.포킷추가및수정(PokitCategorySettingFeature.State(
                     type: .공유추가,
diff --git a/Projects/CoreKit/Sources/Data/DTO/Category/CategoryListInquiryResponse.swift b/Projects/CoreKit/Sources/Data/DTO/Category/CategoryListInquiryResponse.swift
@@ -28,6 +28,7 @@ public struct CategoryItemInquiryResponse: Decodable {
     public let openType: String
     public let keywordType: String
     public let userCount: Int
+    public let isFavorite: Bool
 }
 /// Sort
 public struct ItemInquirySortResponse: Decodable {
@@ -51,7 +52,8 @@ public extension CategoryItemInquiryResponse {
         createdAt: "",
         openType: "PRIVATE",
         keywordType: "스포츠/레저",
-        userCount: 0
+        userCount: 0,
+        isFavorite: false
     )
 }
 
@@ -70,7 +72,8 @@ extension CategoryListInquiryResponse {
                 createdAt: "",
                 openType: "PRIVATE",
                 keywordType: "스포츠/레저",
-                userCount: 0
+                userCount: 0,
+                isFavorite: false
             ),
             CategoryItemInquiryResponse(
                 categoryId: 2,
@@ -84,7 +87,8 @@ extension CategoryListInquiryResponse {
                 createdAt: "",
                 openType: "PUBLIC",
                 keywordType: "스포츠/레저",
-                userCount: 1
+                userCount: 1,
+                isFavorite: false
             ),
             CategoryItemInquiryResponse(
                 categoryId: 3,
@@ -98,7 +102,8 @@ extension CategoryListInquiryResponse {
                 createdAt: "",
                 openType: "PUBLIC",
                 keywordType: "스포츠/레저",
-                userCount: 5
+                userCount: 5,
+                isFavorite: false
             )
         ],
         page: 1,
diff --git a/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+LiveKey.swift b/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+LiveKey.swift
@@ -21,8 +21,14 @@ extension CategoryClient: DependencyKey {
             카테고리_수정: { id, model in
                 try await provider.request(.카테고리_수정(categoryId: id, model: model))
             },
-            카테고리_목록_조회: { model, categoryFilter in
-                try await provider.request(.카테고리_목록_조회(model: model, filterUncategorized: categoryFilter))
+            카테고리_목록_조회: { model, categoryFilter, favoriteFilter in
+                try await provider.request(
+                    .카테고리_목록_조회(
+                        model: model,
+                        filterUncategorized: categoryFilter,
+                        filterFavoriteCategorized: favoriteFilter
+                    )
+                )
             },
             카테고리_생성: { model in
                 try await provider.request(.카테고리생성(model: model))
diff --git a/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+TestKey.swift b/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient+TestKey.swift
@@ -12,7 +12,7 @@ extension CategoryClient: TestDependencyKey {
         Self(
             카테고리_삭제: { _ in },
             카테고리_수정: { _, _ in .mock },
-            카테고리_목록_조회: { _, _ in .mock },
+            카테고리_목록_조회: { _, _, _ in .mock },
             카테고리_생성: { _ in .mock },
             카테고리_프로필_목록_조회: { CategoryImageResponse.mock },
             유저_카테고리_개수_조회: { .mock },
diff --git a/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient.swift b/Projects/CoreKit/Sources/Data/Network/Category/CategoryClient.swift
@@ -16,7 +16,8 @@ public struct CategoryClient {
     ) async throws -> CategoryEditResponse
     public var 카테고리_목록_조회: @Sendable (
         _ model: BasePageableRequest,
-        _ filterUncategorized: Bool
+        _ filterUncategorized: Bool,
+        _ filterFavoriteCategorized: Bool
     ) async throws -> CategoryListInquiryResponse
     public var 카테고리_생성: @Sendable (
         _ model: CategoryEditRequest
diff --git a/Projects/CoreKit/Sources/Data/Network/Category/CategoryEndpoint.swift b/Projects/CoreKit/Sources/Data/Network/Category/CategoryEndpoint.swift
@@ -13,7 +13,7 @@ import Moya
 public enum CategoryEndpoint {
     case 카테고리_삭제(categoryId: Int)
     case 카테고리_수정(categoryId: Int, model: CategoryEditRequest)
-    case 카테고리_목록_조회(model: BasePageableRequest, filterUncategorized: Bool)
+    case 카테고리_목록_조회(model: BasePageableRequest, filterUncategorized: Bool, filterFavoriteCategorized: Bool)
     case 카테고리생성(model: CategoryEditRequest)
     case 카테고리_프로필_목록_조회
     case 유저_카테고리_개수_조회
@@ -83,13 +83,14 @@ extension CategoryEndpoint: TargetType {
             return .requestPlain
         case let .카테고리_수정(_, model):
             return .requestJSONEncodable(model)
-        case let .카테고리_목록_조회(model, categorized):
+        case let .카테고리_목록_조회(model, categorized, favoriteCategorized):
             return .requestParameters(
                 parameters: [
                     "page": model.page,
                     "size": model.size,
                     "sort": model.sort.map { String($0) }.joined(separator: ","),
-                    "filterUncategorized": categorized
+                    "filterUncategorized": categorized,
+                    "filterFavorite": favoriteCategorized
                 ],
                 encoding: URLEncoding.default
             )
diff --git a/Projects/Domain/Sources/Base/BaseCategoryItem.swift b/Projects/Domain/Sources/Base/BaseCategoryItem.swift
@@ -19,6 +19,7 @@ public struct BaseCategoryItem: Identifiable, Equatable, PokitSelectItem, PokitC
     public let openType: BaseOpenType
     public let keywordType: BaseInterestType
     public let userCount: Int
+    public let isFavorite: Bool
     
     public init(
         id: Int,
@@ -29,7 +30,8 @@ public struct BaseCategoryItem: Identifiable, Equatable, PokitSelectItem, PokitC
         createdAt: String,
         openType: BaseOpenType,
         keywordType: BaseInterestType,
-        userCount: Int
+        userCount: Int,
+        isFavorite: Bool
     ) {
         self.id = id
         self.userId = userId
@@ -40,5 +42,6 @@ public struct BaseCategoryItem: Identifiable, Equatable, PokitSelectItem, PokitC
         self.openType = openType
         self.keywordType = keywordType
         self.userCount = userCount
+        self.isFavorite = isFavorite
     }
 }
diff --git a/Projects/Domain/Sources/DTO/Category/CategoryListInquiryResponse+Extention.swift b/Projects/Domain/Sources/DTO/Category/CategoryListInquiryResponse+Extention.swift
@@ -33,7 +33,8 @@ public extension CategoryItemInquiryResponse {
             createdAt: self.createdAt,
             openType: BaseOpenType(rawValue: self.openType) ?? .비공개,
             keywordType: BaseInterestType(rawValue: self.keywordType.slashConvertUnderBar) ?? .default,
-            userCount: self.userCount
+            userCount: self.userCount,
+            isFavorite: self.isFavorite
         )
     }
 }
diff --git a/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift b/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailFeature.swift
@@ -267,7 +267,7 @@ private extension CategoryDetailFeature {
         case .카테고리_목록_조회_API:
             return .run { send in
                 let request = BasePageableRequest(page: 0, size: 30, sort: ["createdAt,desc"])
-                let response = try await categoryClient.카테고리_목록_조회(request, true).toDomain()
+                let response = try await categoryClient.카테고리_목록_조회(request, true, true).toDomain()
                 await send(.inner(.카테고리_목록_조회_API_반영(response)))
             }
             
diff --git a/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailView.swift b/Projects/Feature/FeatureCategoryDetail/Sources/CategoryDetailView.swift
@@ -210,7 +210,8 @@ private extension CategoryDetailView {
                         //TODO: v2 property 수정
                         openType: .비공개,
                         keywordType: .IT,
-                        userCount: 0
+                        userCount: 0,
+                        isFavorite: false
                     )
                 ),
                 reducer: { CategoryDetailFeature() }
diff --git a/Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingFeature.swift b/Projects/Feature/FeatureCategorySetting/Sources/PokitCategorySettingFeature.swift
@@ -211,7 +211,8 @@ private extension PokitCategorySettingFeature {
                             //TODO: v2 property 수정
                             openType: domain.openType,
                             keywordType: domain.keywordType,
-                            userCount: 0
+                            userCount: 0,
+                            isFavorite: false
                         )
                         await send(.inner(.카테고리_인메모리_저장(responseToCategoryDomain)))
                         await send(.delegate(.settingSuccess))
diff --git a/Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingFeature.swift b/Projects/Feature/FeatureContentSetting/Sources/ContentSetting/ContentSettingFeature.swift
@@ -308,7 +308,8 @@ private extension ContentSettingFeature {
                 //TODO: v2 property 수정
                 openType: .비공개,
                 keywordType: .default,
-                userCount: 0
+                userCount: 0,
+                isFavorite: false
             )
             return .none
         case .카테고리_목록_조회_API_반영(categoryList: let categoryList):
@@ -456,7 +457,7 @@ private extension ContentSettingFeature {
     
     func categoryListFetch(request: BasePageableRequest) -> Effect<Action> {
         return .run { send in
-            let categoryList = try await categoryClient.카테고리_목록_조회(request, false).toDomain()
+            let categoryList = try await categoryClient.카테고리_목록_조회(request, false, true).toDomain()
             await send(.inner(.카테고리_목록_조회_API_반영(categoryList: categoryList)), animation: .pokitDissolve)
         }
     }
diff --git a/Projects/Feature/FeaturePokit/Sources/PokitLinkEditFeature.swift b/Projects/Feature/FeaturePokit/Sources/PokitLinkEditFeature.swift
@@ -285,7 +285,7 @@ private extension PokitLinkEditFeature {
     func fetchCateogryList() -> Effect<Action> {
         return .run { send in
             let request: BasePageableRequest = BasePageableRequest(page: 0, size: 100, sort: ["createdAt", "desc"])
-            let response = try await categoryClient.카테고리_목록_조회(request, true).toDomain()
+            let response = try await categoryClient.카테고리_목록_조회(request, true, true).toDomain()
             await send(.inner(.카테고리_목록_조회_API_반영(response)))
         }
     }
diff --git a/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift b/Projects/Feature/FeaturePokit/Sources/PokitRootFeature.swift
@@ -394,7 +394,7 @@ private extension PokitRootFeature {
             state.domain.pageable.page += 1
             return .run { [pageable = state.domain.pageable] send in
                 let request = BasePageableRequest(page: pageable.page, size: pageable.size, sort: pageable.sort)
-                let classified = try await categoryClient.카테고리_목록_조회(request, true).toDomain()
+                let classified = try await categoryClient.카테고리_목록_조회(request, true, false).toDomain()
                 await send(.inner(.카테고리_페이징_조회_API_반영(contentList: classified)))
             }
             
@@ -417,7 +417,7 @@ private extension PokitRootFeature {
             state.domain.pageable.page = 0
             return .run { [pageable = state.domain.pageable] send in
                 let request = BasePageableRequest(page: pageable.page, size: pageable.size, sort: pageable.sort)
-                let classified = try await categoryClient.카테고리_목록_조회(request, true).toDomain()
+                let classified = try await categoryClient.카테고리_목록_조회(request, true, false).toDomain()
                 await send(.inner(.카테고리_조회_API_반영(categoryList: classified)), animation: .pokitSpring)
             }
             
@@ -462,7 +462,8 @@ private extension PokitRootFeature {
                                     size: pageable.size,
                                     sort: pageable.sort
                                 ),
-                                true
+                                true,
+                                false
                             ).toDomain()
                             continuation.yield(categoryList)
                         }
diff --git a/Projects/Feature/FeaturePokit/Sources/PokitRootView.swift b/Projects/Feature/FeaturePokit/Sources/PokitRootView.swift
@@ -157,15 +157,21 @@ private extension PokitRootView {
         ScrollView {
             LazyVStack(spacing: 0) {
                 LazyVGrid(columns: column, spacing: 12) {
-                    if let linkCount = store.favoriteContentCount {
-                        PokitFavoriteCard(linkCount: linkCount, action: {})
-                    }
                     ForEach(categories, id: \.id) { item in
-                        PokitCard(
-                            category: item,
-                            action: { send(.카테고리_눌렀을때(item)) },
-                            kebabAction: { send(.케밥_버튼_눌렀을때(item)) }
-                        )
+                        if let linkCount = store.favoriteContentCount,
+                           item.isFavorite {
+                            PokitFavoriteCard(
+                                linkCount: linkCount,
+                                action: { send(.카테고리_눌렀을때(item)) }
+                            )
+                        }
+                        else {
+                            PokitCard(
+                                category: item,
+                                action: { send(.카테고리_눌렀을때(item)) },
+                                kebabAction: { send(.케밥_버튼_눌렀을때(item)) }
+                            )
+                        }
                     }
                 }
 
diff --git a/Projects/Feature/FeatureSetting/Sources/Search/Sheet/FilterBottomFeature.swift b/Projects/Feature/FeatureSetting/Sources/Search/Sheet/FilterBottomFeature.swift
@@ -229,6 +229,7 @@ private extension FilterBottomFeature {
                         size: pageable.size,
                         sort: pageable.sort
                     ),
+                    true,
                     true
                 ).toDomain()
                 await send(.inner(.카테고리_목록_조회_API_반영(categoryList: categoryList)), animation: .pokitDissolve)

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public extension CategoryItemInquiryResponse {`
`33`	`33`	`createdAt: self.createdAt,`
`34`	`34`	`openType: BaseOpenType(rawValue: self.openType) ?? .비공개,`
`35`	`35`	`keywordType: BaseInterestType(rawValue: self.keywordType.slashConvertUnderBar) ?? .default,`
`36`		`- userCount: self.userCount`
	`36`	`+ userCount: self.userCount,`
	`37`	`+ isFavorite: self.isFavorite`
`37`	`38`	`)`
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private extension CategoryDetailFeature {`
`267`	`267`	`case .카테고리_목록_조회_API:`
`268`	`268`	`return .run { send in`
`269`	`269`	`let request = BasePageableRequest(page: 0, size: 30, sort: ["createdAt,desc"])`
`270`		`- let response = try await categoryClient.카테고리_목록_조회(request, true).toDomain()`
	`270`	`+ let response = try await categoryClient.카테고리_목록_조회(request, true, true).toDomain()`
`271`	`271`	`await send(.inner(.카테고리_목록_조회_API_반영(response)))`
`272`	`272`	`}`
`273`	`273`