[feat] #180 리마인드 -> 추천으로 플로우 교체

ShapeKim98 · ShapeKim98 · commit 502675a7c281 · 2025-01-30T15:06:30.000+09:00
diff --git a/Projects/App/Sources/MainTab/MainTab.swift b/Projects/App/Sources/MainTab/MainTab.swift
@@ -11,14 +11,14 @@ import DSKit
 
 public enum MainTab: String, CaseIterable {
     case pokit = "포킷"
-    case remind = "리마인드"
+    case recommend = "링크추천"
     
     var title: String { return self.rawValue }
     
     var icon: PokitImage {
         switch self {
         case .pokit:  return .icon(.folderFill)
-        case .remind: return .icon(.remind)
+        case .recommend: return .icon(.remind)
         }
     }
 }
diff --git a/Projects/App/Sources/MainTab/MainTabFeature.swift b/Projects/App/Sources/MainTab/MainTabFeature.swift
@@ -8,7 +8,7 @@ import SwiftUI
 
 import ComposableArchitecture
 import FeaturePokit
-import FeatureRemind
+import FeatureRecommend
 import FeatureContentDetail
 import Domain
 import DSKit
@@ -37,7 +37,7 @@ public struct MainTabFeature {
 
         var path: StackState<MainTabPath.State> = .init()
         var pokit: PokitRootFeature.State
-        var remind: RemindFeature.State = .init()
+        var recommend: RecommendFeature.State = .init()
         @Presents var contentDetail: ContentDetailFeature.State?
         @Shared(.inMemory("SelectCategory")) var categoryId: Int?
         @Shared(.inMemory("PushTapped")) var isPushTapped: Bool = false
@@ -59,7 +59,7 @@ public struct MainTabFeature {
         /// Todo: scope로 이동
         case path(StackAction<MainTabPath.State, MainTabPath.Action>)
         case pokit(PokitRootFeature.Action)
-        case remind(RemindFeature.Action)
+        case recommend(RecommendFeature.Action)
         case contentDetail(PresentationAction<ContentDetailFeature.Action>)
 
         @CasePathable
@@ -70,6 +70,8 @@ public struct MainTabFeature {
             case onAppear
             case onOpenURL(url: URL)
             case 경고_확인버튼_클릭
+            case 검색_버튼_눌렀을때
+            case 알림_버튼_눌렀을때
         }
         public enum InnerAction: Equatable {
             case 링크추가및수정이동(contentId: Int)
@@ -129,7 +131,7 @@ public struct MainTabFeature {
             return .none
         case .pokit:
             return .none
-        case .remind:
+        case .recommend:
             return .none
         case .contentDetail:
             return .none
@@ -138,7 +140,14 @@ public struct MainTabFeature {
     /// - Reducer body
     public var body: some ReducerOf<Self> {
         Scope(state: \.pokit, action: \.pokit) { PokitRootFeature() }
-        Scope(state: \.remind, action: \.remind) { RemindFeature() }
+        Scope(state: \.recommend, action: \.recommend) {
+            withDependencies {
+                $0[UserClient.self] = .testValue
+                $0[ContentClient.self] = .testValue
+            } operation: {
+                RecommendFeature()
+            }
+        }
 
         BindingReducer()
         navigationReducer
@@ -198,6 +207,28 @@ private extension MainTabFeature {
         case .경고_확인버튼_클릭:
             state.error = nil
             return .run { send in await send(.inner(.errorSheetPresented(false))) }
+        case .검색_버튼_눌렀을때:
+            switch state.selectedTab {
+            case .pokit: return .none
+            case .recommend:
+                return RecommendFeature()
+                    .reduce(
+                        into: &state.recommend,
+                        action: .view(.검색_버튼_눌렀을때)
+                    )
+                    .map(Action.recommend)
+            }
+        case .알림_버튼_눌렀을때:
+            switch state.selectedTab {
+            case .pokit: return .none
+            case .recommend:
+                return RecommendFeature()
+                    .reduce(
+                        into: &state.recommend,
+                        action: .view(.알림_버튼_눌렀을때)
+                    )
+                    .map(Action.recommend)
+            }
         }
     }
     /// - Inner Effect
diff --git a/Projects/App/Sources/MainTab/MainTabFeatureView.swift b/Projects/App/Sources/MainTab/MainTabFeatureView.swift
@@ -9,7 +9,7 @@ import SwiftUI
 import ComposableArchitecture
 import DSKit
 import FeaturePokit
-import FeatureRemind
+import FeatureRecommend
 import FeatureSetting
 import FeatureCategorySetting
 import FeatureContentDetail
@@ -135,8 +135,8 @@ private extension MainTabView {
                     .pokitNavigationBar { pokitNavigationBar }
                     .toolbarBackground(.hidden, for: .tabBar)
                 
-            case .remind:
-                RemindView(store: store.scope(state: \.remind, action: \.remind))
+            case .recommend:
+                RecommendView(store: store.scope(state: \.recommend, action: \.recommend))
                     .pokitNavigationBar { remindNavigationBar }
                     .toolbarBackground(.hidden, for: .tabBar)
             }
@@ -181,11 +181,11 @@ private extension MainTabView {
             PokitHeaderItems(placement: .trailing) {
                 PokitToolbarButton(
                     .icon(.search),
-                    action: { store.send(.remind(.view(.검색_버튼_눌렀을때))) }
+                    action: { send(.검색_버튼_눌렀을때) }
                 )
                 PokitToolbarButton(
                     .icon(.bell),
-                    action: { store.send(.remind(.view(.알림_버튼_눌렀을때))) }
+                    action: { send(.알림_버튼_눌렀을때) }
                 )
             }
         }
@@ -198,7 +198,7 @@ private extension MainTabView {
             
             Spacer()
             
-            bottomTabBarItem(.remind)
+            bottomTabBarItem(.recommend)
         }
         .padding(.horizontal, 48)
         .padding(.top, 12)
diff --git a/Projects/App/Sources/MainTab/MainTabPath.swift b/Projects/App/Sources/MainTab/MainTabPath.swift
@@ -61,15 +61,15 @@ public extension MainTabFeature {
             switch action {
             /// - 네비게이션 바 `알림`버튼 눌렀을 때
             case .pokit(.delegate(.alertButtonTapped)),
-                 .remind(.delegate(.alertButtonTapped)),
+                 .recommend(.delegate(.알림_버튼_눌렀을때)),
                  .delegate(.알림함이동):
                 state.isPushTapped = false
                 state.path.append(.알림함(PokitAlertBoxFeature.State()))
                 return .none
 
             /// - 네비게이션 바 `검색`버튼 눌렀을 때
             case .pokit(.delegate(.searchButtonTapped)),
-                 .remind(.delegate(.searchButtonTapped)):
+                 .recommend(.delegate(.검색_버튼_눌렀을때)):
                 state.path.append(.검색(PokitSearchFeature.State()))
                 return .none
 
@@ -120,7 +120,6 @@ public extension MainTabFeature {
             /// - 링크 상세
             case let .path(.element(_, action: .카테고리상세(.delegate(.contentItemTapped(content))))),
                  let .pokit(.delegate(.contentDetailTapped(content))),
-                 let .remind(.delegate(.링크상세(content))),
                  let .path(.element(_, action: .링크목록(.delegate(.링크상세(content: content))))),
                  let .path(.element(_, action: .검색(.delegate(.linkCardTapped(content: content))))):
                 
@@ -130,7 +129,7 @@ public extension MainTabFeature {
             /// - 링크상세 바텀시트에서 링크수정으로 이동
             case let .contentDetail(.presented(.delegate(.editButtonTapped(id)))),
                  let .pokit(.delegate(.링크수정하기(id))),
-                 let .remind(.delegate(.링크수정(id))),
+                 let .recommend(.delegate(.추가하기_버튼_눌렀을때(id))),
                  let .path(.element(_, action: .카테고리상세(.delegate(.링크수정(id))))),
                  let .path(.element(_, action: .링크목록(.delegate(.링크수정(id))))),
                  let .path(.element(_, action: .검색(.delegate(.링크수정(id))))),
@@ -148,8 +147,8 @@ public extension MainTabFeature {
                     switch state.selectedTab {
                     case .pokit:
                         return .send(.pokit(.delegate(.미분류_카테고리_컨텐츠_조회)))
-                    case .remind:
-                        return .send(.remind(.delegate(.컨텐츠_상세보기_delegate_위임)))
+                    case .recommend:
+                        return .none
                     }
                 }
                 switch lastPath {
@@ -200,14 +199,6 @@ public extension MainTabFeature {
             case let .pokit(.delegate(.linkPopup(text))):
                 state.linkPopup = .text(title: text)
                 return .none
-            /// 링크목록 `안읽음`
-            case .remind(.delegate(.링크목록_안읽음)):
-                state.path.append(.링크목록(ContentListFeature.State(contentType: .unread)))
-                return .none
-            /// 링크목록 `즐겨찾기`
-            case .remind(.delegate(.링크목록_즐겨찾기)):
-                state.path.append(.링크목록(ContentListFeature.State(contentType: .favorite)))
-                return .none
                 
             case .path(.element(_, action: .설정(.delegate(.로그아웃)))):
                 return .send(.delegate(.로그아웃))
diff --git a/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendFeature.swift b/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendFeature.swift
@@ -69,6 +69,8 @@ public struct RecommendFeature {
             case 전체보기_버튼_눌렀을때(ScrollViewProxy)
             case 관심사_버튼_눌렀을때(BaseInterest, ScrollViewProxy)
             case 링크_공유_완료되었을때
+            case 검색_버튼_눌렀을때
+            case 알림_버튼_눌렀을때
         }
         
         public enum InnerAction: Equatable {
@@ -86,7 +88,9 @@ public struct RecommendFeature {
         public enum ScopeAction: Equatable { case doNothing }
         
         public enum DelegateAction: Equatable {
-            case 추가하기_버튼_눌렀을때(BaseContentItem)
+            case 추가하기_버튼_눌렀을때(Int)
+            case 검색_버튼_눌렀을때
+            case 알림_버튼_눌렀을때
         }
     }
     
@@ -139,7 +143,7 @@ private extension RecommendFeature {
         case .pagination:
             return shared(.async(.추천_조회_페이징_API), state: &state)
         case let .추가하기_버튼_눌렀을때(content):
-            return .send(.delegate(.추가하기_버튼_눌렀을때(content)))
+            return .send(.delegate(.추가하기_버튼_눌렀을때(content.id)))
         case let .공유하기_버튼_눌렀을때(content):
             state.shareContent = content
             return .none
@@ -160,6 +164,10 @@ private extension RecommendFeature {
         case .링크_공유_완료되었을때:
             state.shareContent = nil
             return .none
+        case .검색_버튼_눌렀을때:
+            return .send(.delegate(.검색_버튼_눌렀을때))
+        case .알림_버튼_눌렀을때:
+            return .send(.delegate(.알림_버튼_눌렀을때))
         }
     }
     
@@ -198,8 +206,8 @@ private extension RecommendFeature {
                 keyword = state.selectedInterest?.description
             ] send in
                 let contentList = try await contentClient.추천_컨텐츠_조회(
-                    pageable: pageableRequest,
-                    keyword: keyword
+                    pageableRequest,
+                    keyword
                 ).toDomain()
                 
                 await send(.inner(.추천_조회_페이징_API_반영(contentList)))
@@ -254,8 +262,8 @@ private extension RecommendFeature {
                             sort: pageable.sort
                         )
                         let contentList = try await contentClient.추천_컨텐츠_조회(
-                            pageable: pageableRequest,
-                            keyword: keyword
+                            pageableRequest,
+                            keyword
                         ).toDomain()
                         continuation.yield(contentList)
                     }
diff --git a/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendView.swift b/Projects/Feature/FeatureRecommend/Sources/Recommend/RecommendView.swift
@@ -168,7 +168,7 @@ private extension RecommendView {
                 }
             }
             .padding(.horizontal, 20)
-            .padding(.bottom, 36)
+            .padding(.bottom, 150)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ import DSKit`
`11`	`11`
`12`	`12`	`public enum MainTab: String, CaseIterable {`
`13`	`13`	`case pokit = "포킷"`
`14`		`- case remind = "리마인드"`
	`14`	`+ case recommend = "링크추천"`
`15`	`15`
`16`	`16`	`var title: String { return self.rawValue }`
`17`	`17`
`18`	`18`	`var icon: PokitImage {`
`19`	`19`	`switch self {`
`20`	`20`	`case .pokit: return .icon(.folderFill)`
`21`		`- case .remind: return .icon(.remind)`
	`21`	`+ case .recommend: return .icon(.remind)`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ private extension RecommendView {`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`.padding(.horizontal, 20)`
`171`		`- .padding(.bottom, 36)`
	`171`	`+ .padding(.bottom, 150)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`