[Feat] [운세] Fortune 홈 후속 상세 및 사주풀이 3종 구현 (#79)

Projects/App/Sources/MainTab/MainTabFeature.swift

@@ -4,7 +4,7 @@ import Foundation
 import MyPageFeature
 
 @Reducer
-struct MainTabFeature: Sendable {
+struct MainTabFeature {
     init() {}
 
     enum Tab: Equatable, Sendable {
@@ -15,10 +15,13 @@ struct MainTabFeature: Sendable {
     }
 
     @ObservableState
-    struct State: Equatable, Sendable {
+    struct State: Equatable {
         var selectedTab: Tab
         var fortune: FortuneFeature.State
         var myPage: MyPageFeature.State
+        /// 궁합 화면에서 시작된 내 정보 편집 요청의 출처를 보관한다.
+        /// 경로가 사라진 뒤 도착한 응답이 편집 화면을 표시하지 않도록 App에서 수명을 관리한다.
+        var compatibilityEditSourceID: StackElementID?
 
         init(
             selectedTab: Tab = .fortune,
@@ -31,8 +34,9 @@ struct MainTabFeature: Sendable {
         }
     }
 
-    enum Action: Equatable, Sendable {
+    enum Action: Equatable {
         case selectedTabChanged(Tab)
+        case fortuneNavigationChanged
         case fortune(FortuneFeature.Action)
         case myPage(MyPageFeature.Action)
     }
@@ -49,16 +53,75 @@ struct MainTabFeature: Sendable {
         Reduce { state, action in
             switch action {
             case let .selectedTabChanged(tab):
+                let shouldDiscardEditPresentation = tab != .fortune
+                    && state.compatibilityEditSourceID != nil
                 state.selectedTab = tab
+                if shouldDiscardEditPresentation {
+                    state.compatibilityEditSourceID = nil
+                    return .send(.myPage(.discardPendingEditPresentation))
+                }
                 return .none
 
+            case .fortuneNavigationChanged:
+                guard let sourceID = state.compatibilityEditSourceID,
+                      sourceID != currentCompatibilityDestinationID(in: state)
+                else {
+                    return .none
+                }
+                state.compatibilityEditSourceID = nil
+                return .send(.myPage(.discardPendingEditPresentation))
+
             case .fortune(.delegate(.luckyActionRequested)):
                 state.selectedTab = .luckyAction
                 return .none
 
+            case .fortune(.delegate(.todakRequested)):
+                state.selectedTab = .todak
+                return .none
+
+            case .fortune(.delegate(.myPageRequested)):
+                state.selectedTab = .myPage
+                return .none
+
+            case .fortune(.delegate(.myInfoEditRequested)):
+                guard let destinationID = currentCompatibilityDestinationID(in: state) else {
+                    return .none
+                }
+                state.compatibilityEditSourceID = destinationID
+                return .send(.myPage(.presentEdit))
+
+            case .myPage(.editDismissButtonTapped):
+                state.compatibilityEditSourceID = nil
+                return .none
+
+            case .myPage(.delegate(.profileUpdated)):
+                state.compatibilityEditSourceID = nil
+                guard let destinationID = currentCompatibilityDestinationID(in: state) else {
+                    return .none
+                }
+                return .send(
+                    .fortune(
+                        .path(
+                            .element(
+                                id: destinationID,
+                                action: .compatibility(.mySajuRefreshRequested)
+                            )
+                        )
+                    )
+                )
+
             case .fortune, .myPage:
                 return .none
             }
         }
     }
+
+    private func currentCompatibilityDestinationID(in state: State) -> StackElementID? {
+        guard let destinationID = state.fortune.path.ids.last,
+              case .compatibility = state.fortune.path[id: destinationID]
+        else {
+            return nil
+        }
+        return destinationID
+    }
 }

Projects/App/Sources/MainTab/MainTabView.swift

@@ -31,6 +31,18 @@ struct MainTabView: View {
                     store: store.scope(state: \.myPage, action: \.myPage)
                 )
             }
+
+            if isMyInfoEditPresented {
+                MyPageEditView(
+                    store: store.scope(state: \.myPage, action: \.myPage)
+                )
+                .transition(.move(edge: .trailing))
+                .zIndex(1)
+            }
+        }
+        .animation(.easeInOut(duration: 0.25), value: isMyInfoEditPresented)
+        .onChange(of: currentCompatibilityDestinationID) { _, _ in
+            store.send(.fortuneNavigationChanged)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .safeAreaInset(edge: .bottom, spacing: 0) {
@@ -43,12 +55,32 @@ struct MainTabView: View {
     }
 
     private var shouldShowBottomNavigation: Bool {
-        store.myPage.edit == nil
+        let fortuneShowing = store.selectedTab != .fortune || !store.fortune.isShowingDetail
+        let myPageShowing = store.selectedTab != .myPage || (
+            store.myPage.edit == nil
             && store.myPage.sajuDetail == nil
             && store.myPage.notificationSettings == nil
             && store.myPage.appSettings == nil
             && store.myPage.withdrawal == nil
             && store.myPage.sajuManagement == nil
+        )
+        return fortuneShowing && myPageShowing && !isMyInfoEditPresented
+    }
+
+    private var isMyInfoEditPresented: Bool {
+        guard let currentCompatibilityDestinationID else { return false }
+        return store.selectedTab == .fortune
+            && store.compatibilityEditSourceID == currentCompatibilityDestinationID
+            && store.myPage.edit != nil
+    }
+
+    private var currentCompatibilityDestinationID: StackElementID? {
+        guard let destinationID = store.fortune.path.ids.last,
+              case .compatibility = store.fortune.path[id: destinationID]
+        else {
+            return nil
+        }
+        return destinationID
     }
 
     private var bottomNavigationBinding: Binding<DSBottomNavigationItem> {

Projects/App/Tests/MainTabFeatureTests.swift

@@ -42,12 +42,84 @@ struct MainTabFeatureTests {
     }
 
     @Test
-    func otherFortuneDelegateDoesNotChangeTab() async {
+    func fortuneDelegateTodakRequestedSwitchesTab() async {
         let store = TestStore(initialState: MainTabFeature.State()) {
             MainTabFeature()
         }
 
-        await store.send(.fortune(.delegate(.notificationRequested)))
+        await store.send(.fortune(.delegate(.todakRequested))) {
+            $0.selectedTab = .todak
+        }
+    }
+
+    @Test
+    func fortuneDelegateMyPageRequestedSwitchesTab() async {
+        let store = TestStore(initialState: MainTabFeature.State()) {
+            MainTabFeature()
+        }
+
+        await store.send(.fortune(.delegate(.myPageRequested))) {
+            $0.selectedTab = .myPage
+        }
+    }
+
+    @Test
+    func fortuneDelegateMyInfoEditRequestedPresentsEditWithoutSwitchingTab() async {
+        var state = MainTabFeature.State()
+        state.fortune.path.append(.compatibility(.init()))
+        let store = TestStore(initialState: state) {
+            MainTabFeature()
+        }
+        store.exhaustivity = .off(showSkippedAssertions: false)
+
+        await store.send(.fortune(.delegate(.myInfoEditRequested))) {
+            $0.compatibilityEditSourceID = 0
+        }
+        await store.receive(.myPage(.presentEdit))
+
+        #expect(store.state.selectedTab == .fortune)
+    }
+
+    @Test
+    func poppedCompatibilityDiscardsPendingMyInfoEditPresentation() async {
+        var state = MainTabFeature.State()
+        state.fortune.path.append(.compatibility(.init()))
+        state.compatibilityEditSourceID = 0
+        state.myPage.isPendingEditPresentation = true
+        state.fortune.path.removeLast()
+
+        let store = TestStore(initialState: state) {
+            MainTabFeature()
+        }
+
+        await store.send(.fortuneNavigationChanged) {
+            $0.compatibilityEditSourceID = nil
+        }
+        await store.receive(.myPage(.discardPendingEditPresentation)) {
+            $0.myPage.isPendingEditPresentation = false
+        }
+    }
+
+    @Test
+    func profileUpdateRefreshesMySajuInCurrentCompatibilityScreen() async {
+        var state = MainTabFeature.State()
+        state.fortune.path.append(.compatibility(.init()))
+        let store = TestStore(initialState: state) {
+            MainTabFeature()
+        }
+        store.exhaustivity = .off(showSkippedAssertions: false)
+
+        await store.send(.myPage(.delegate(.profileUpdated)))
+        await store.receive(
+            .fortune(
+                .path(
+                    .element(
+                        id: 0,
+                        action: .compatibility(.mySajuRefreshRequested)
+                    )
+                )
+            )
+        )
     }
 
     @Test

Projects/Core/AuthSession/Project.swift

@@ -4,6 +4,6 @@ import ProjectDescriptionHelpers
 let project = Project.makeCore(
     name: "AuthSession",
     dependencies: [
-        .external(name: "ComposableArchitecture")
+        .external(name: "Dependencies")
     ]
 )

Projects/Core/AuthSession/Sources/AuthSessionClient.swift

@@ -1,4 +1,4 @@
-import ComposableArchitecture
+import Dependencies
 import Foundation
 
 public struct SessionRefreshOperation: Sendable {

Projects/Core/DesignSystem/Docs/Components/Saju_Pillar_Cell.md

@@ -0,0 +1,22 @@
+# Saju Pillar Cell (사주 기둥 셀)
+
+사주 만세력 기둥의 천간(Heavenly Stem)과 지지(Earthly Branch)를 표시하는 표준 사주 기둥 타일 컴포넌트입니다.
+
+## Specification
+
+- **Size**: 48x48 pt
+- **Corner Radius**: 12 pt
+- **Typography**:
+  - Main Hanja Text: 18pt Bold (`gray975`)
+  - Sublabel (독음 / 오행): 10pt Regular (`gray975`)
+
+## Variants & Five Elements (오행 컬러)
+
+| Element | 한글 | 한자 | Background Asset |
+| :--- | :--- | :--- | :--- |
+| `.wood` | 목 | 木 | `Color.ds.teal200` |
+| `.fire` | 화 | 火 | `Color.ds.red200` |
+| `.earth` | 토 | 土 | `Color.ds.orange200` |
+| `.metal` | 금 | 金 | `Color.ds.coolGray300` |
+| `.water` | 수 | 水 | `Color.ds.sky200` |
+| `.unknown` | - | - | `Color.ds.gray100` |

Projects/Core/DesignSystem/Docs/Figma_Specification.md

@@ -312,3 +312,12 @@
 📄 [자세한 픽셀 수치 및 레이아웃 명세 보기](Components/Shadow_m.md)
 
 ![Shadow_m](Images/Shadow_m.png)
+
+## 7. 사주 만세력 컴포넌트 (Saju Components)
+
+### 🧩 Saju Pillar Cell
+
+📄 [자세한 픽셀 수치 및 레이아웃 명세 보기](Components/Saju_Pillar_Cell.md)
+
+- 천간/지지 한자 및 독음, 오행 컬러를 표시하는 48x48 규격 셀 (`DSSajuPillarCell`)
+

Projects/Core/DesignSystem/Example/Sources/Catalogs/ComponentsCatalogView.swift

@@ -197,6 +197,12 @@ struct ComponentsCatalogView: View {
                 title: "Conversation History List",
                 subtitle: "대화 제목, 시간, 읽지 않은 상태와 삭제 동작을 표시하는 행"
             )
+            catalogLink(
+                destination: SajuPillarCellPlaygroundView(),
+                systemImage: "square.grid.2x2.fill",
+                title: "Saju Pillar Cell",
+                subtitle: "사주 만세력 기둥의 천간/지지와 오행을 표시하는 셀"
+            )
         }
     }
 

Projects/Core/DesignSystem/Example/Sources/Playgrounds/SajuPillarCellPlaygroundView.swift

@@ -0,0 +1,58 @@
+import SwiftUI
+import DesignSystem
+
+// MARK: - Saju Pillar Cell Playground Sandbox
+struct SajuPillarCellPlaygroundView: View {
+    @State private var hanjaText: String = "辛"
+    @State private var readingText: String = "신"
+    @State private var selectedElement: DSSajuElement = .metal
+    @State private var showElementHanja: Bool = true
+    @State private var isDarkBackground: Bool = false
+
+    private var specification: DSSajuPillarCell.Specification {
+        DSSajuPillarCell.specification(element: selectedElement)
+    }
+
+    var body: some View {
+        VStack(spacing: 0) {
+            DSPlaygroundPreviewCard(
+                title: String(describing: DSSajuPillarCell.self),
+                isDarkBackground: $isDarkBackground
+            ) {
+                DSSajuPillarCell(
+                    hanja: hanjaText,
+                    reading: readingText,
+                    element: selectedElement,
+                    showElementHanja: showElementHanja
+                )
+            }
+
+            Form {
+                Section(header: Text("Content")) {
+                    TextField("Hanja", text: $hanjaText)
+                        .autocorrectionDisabled()
+                    TextField("Reading", text: $readingText)
+                        .autocorrectionDisabled()
+                    Toggle("Show Element Hanja", isOn: $showElementHanja)
+                }
+
+                Section(header: Text("Five Element")) {
+                    Picker("Element", selection: $selectedElement) {
+                        ForEach([DSSajuElement.wood, .fire, .earth, .metal, .water, .unknown], id: \.self) { element in
+                            Text("\(element.label) (\(element.hanja))").tag(element)
+                        }
+                    }
+                }
+
+                Section(header: Text("Figma Specification Check")) {
+                    DSSpecificationRow(title: "Shape", value: specification.shape.specName)
+                    DSSpecificationRow(title: "Size", value: specification.size.ptDescription)
+                    DSSpecificationRow(title: "Bg Color", value: specification.backgroundAsset.specDescription)
+                    DSSpecificationRow(title: "Text Color", value: specification.foregroundAsset.specDescription)
+                }
+            }
+        }
+        .navigationTitle("Saju Pillar Cell Playground")
+        .navigationBarTitleDisplayMode(.inline)
+    }
+}

Projects/Core/DesignSystem/Resources/Assets.xcassets/Icons/bell.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Bell.svg",
+      "filename" : "bell.svg",
       "idiom" : "universal"
     }
   ],