refactor: [공방] - 파일 구조 리팩토링 🟡

Keychy/Keychy/Core/Navigation/Routes/WorkshopRoute.swift

@@ -4,12 +4,19 @@
 //
 //  Created by 길지훈 on 10/16/25.
 //
-import UIKit
+import Foundation
 
-/// 공방 탭 라우팅
+/// 공방 탭 라우팅 (마켓플레이스 + 키링 제작)
 enum WorkshopRoute: Hashable {
-    // MARK: - 공통 프리뷰
+    // MARK: - 공방 마켓플레이스
     case workshopPreview(item: AnyHashable)
+    case coinCharge
+    case myItems
+    case workshopTemplates
+
+    // MARK: - Festival 임시 라우트 (추후 정리 예정)
+    case showcase25BoardView
+    case festivalKeyringDetailView(Keyring)
 
     // MARK: - 아크릴 포토 템플릿
     case acrylicPhotoPreview
@@ -18,12 +25,9 @@ enum WorkshopRoute: Hashable {
     case acrylicPhotoCustomizing
     case acrylicPhotoInfoInput
     case acrylicPhotoComplete
-    case coinCharge
-    case myItems
-    case workshopTemplates
 
     // MARK: - 네온 사인 템플릿
-    case NeonSignPreView
+    case neonSignPreview
     case neonSignCustomizing
     case neonSignInfoInput
     case neonSignComplete
@@ -33,7 +37,7 @@ enum WorkshopRoute: Hashable {
     case polaroidCustomizing
     case polaroidInfoInput
     case polaroidComplete
-    
+
     // MARK: - 클리어 스케치 템플릿
     case clearSketchPreview
     case clearSketchDrawing
@@ -48,30 +52,20 @@ enum WorkshopRoute: Hashable {
     case pixelCustomizing
     case pixelInfoInput
     case pixelComplete
-
-    // MARK: - 임시 페스티벌 라우트
-    case showcase25BoardView
-    case festivalKeyringDetailView(Keyring)
 
     // MARK: - 말풍선 키링 템플릿
     case speechBubblePreview
     case speechBubbleCustomizing
     case speechBubbleInfoInput
     case speechBubbleComplete
 
-    // MARK: - 새로운 템플릿의 루트는 이렇게 추가해주면 됩니다. (예정)
-    // case hkPreview
-    // case hkCustomizing
-    // case hkInfoInput
-    // case hkComplete
-
     /// template.id 문자열을 WorkshopRoute로 변환
     static func from(string: String) -> WorkshopRoute? {
         switch string {
         case "AcrylicPhoto":
             return .acrylicPhotoPreview
         case "NeonSign":
-            return .NeonSignPreView
+            return .neonSignPreview
         case "Polaroid":
             return .polaroidPreview
         case "ClearSketch":
@@ -80,11 +74,8 @@ enum WorkshopRoute: Hashable {
             return .pixelPreview
         case "SpeechBubble":
             return .speechBubblePreview
-
-            // 필요한 프리뷰 케이스들 추가
         default:
             return nil
         }
     }
 }
-

Keychy/Keychy/Presentation/Festival/ViewModels/Showcase25BoardViewModel.swift

@@ -20,7 +20,7 @@ class Showcase25BoardViewModel {
     var userKeyrings: [Keyring] = []
     var selectedKeyringIndex: Int = 0
 
-    // MARK: - Festival에서 Workshop으로 갔을 때 사용
+    // MARK: - Festival에서 KeyringMaker로 갔을 때 사용
     var isFromFestivalTab: Bool = false
     var onKeyringCompleteFromFestival: ((NavigationRouter<WorkshopRoute>) -> Void)?
 

Keychy/Keychy/Presentation/Festival/Views/FestivalKeyringDetailView.swift

@@ -12,7 +12,6 @@ import Photos
 
 struct FestivalKeyringDetailView: View {
     @Bindable var festivalRouter: NavigationRouter<FestivalRoute>
-    @Bindable var workshopRouter: NavigationRouter<WorkshopRoute>
     @Bindable var viewModel: Showcase25BoardViewModel
 
     @State var userManager = UserManager.shared

Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView+Sheet.swift

@@ -23,12 +23,6 @@ extension Showcase25BoardView {
                     Button {
                         dismissSheet()
                         viewModel.isFromFestivalTab = true
-
-                        viewModel.onKeyringCompleteFromFestival = { workshopRouter in
-                            workshopRouter.reset()
-                            workshopRouter.push(.showcase25BoardView)
-                        }
-
                         onNavigateToWorkshop?(.workshopTemplates)
                     } label: {
                         Text("+ 만들기")

Keychy/Keychy/Presentation/Festival/Views/Showcase25Board/Showcase25BoardView.swift

@@ -10,15 +10,15 @@ import NukeUI
 import FirebaseFirestore
 
 struct Showcase25BoardView: View {
-    
+
     @Bindable var festivalRouter: NavigationRouter<FestivalRoute>
-    @Bindable var workshopRouter: NavigationRouter<WorkshopRoute>
     @Bindable var viewModel: Showcase25BoardViewModel
     @Environment(\.scenePhase) private var scenePhase
-    
+
     // 위치 기반 체크용
     @State var locationManager = LocationManager()
-
+
+    var onNavigateToKeyringMaker: ((WorkshopRoute) -> Void)? = nil
     var onNavigateToWorkshop: ((WorkshopRoute) -> Void)? = nil
     var isFromFestivalTab: Bool = false
 

Keychy/Keychy/Presentation/Workshop/Making/Shared/Views/KeyringCompleteView.swift → Keychy/Keychy/Presentation/KeyringMaker/Shared/Views/KeyringCompleteView.swift

@@ -17,7 +17,7 @@ struct KeyringCompleteView<VM: KeyringViewModelProtocol>: View {
 
     var userManager: UserManager = UserManager.shared
     var reviewManager: ReviewManager = ReviewManager.shared
-    
+
     // Festival에서 왔을 때 처리용 옵셔널 콜백
     var onCloseFromFestival: ((NavigationRouter<WorkshopRoute>) -> Void)?
 

Keychy/Keychy/Presentation/Tab/ViewModels/MainTabViewModel.swift

@@ -81,6 +81,18 @@ class MainTabViewModel {
     /// Festival 탭에서 Workshop 탭으로 전환하고 특정 라우트로 이동
     /// - Parameter route: 이동할 WorkshopRoute
     func handleSwitchToWorkshop(_ route: WorkshopRoute) {
+        festivalViewModel.isFromFestivalTab = true
+
+        selectedTab = TabIndex.workshop.rawValue
+        Task { @MainActor in
+            try? await Task.sleep(for: .seconds(Delay.tabSwitchAnimation))
+            workshopRouter.push(route)
+        }
+    }
+
+    /// Festival 탭에서 KeyringMaker로 전환하고 특정 라우트로 이동
+    /// - Parameter route: 이동할 WorkshopRoute (키링 제작 라우트)
+    func handleSwitchToKeyringMaker(_ route: WorkshopRoute) {
         setupFestivalReturnCallback()
 
         selectedTab = TabIndex.workshop.rawValue
@@ -91,10 +103,10 @@ class MainTabViewModel {
     }
 
     // MARK: - Private Methods
-    /// Festival → Workshop 이동 시 완료 후 복귀 콜백 설정
+    /// Festival → KeyringMaker 이동 시 완료 후 복귀 콜백 설정
     private func setupFestivalReturnCallback() {
         festivalViewModel.isFromFestivalTab = true
-        festivalViewModel.onKeyringCompleteFromFestival = { [weak self] router in
+        festivalViewModel.onKeyringCompleteFromFestival = { [weak self] (router: NavigationRouter<WorkshopRoute>) in
             guard let self = self else { return }
             router.reset()
             self.selectedTab = TabIndex.festival.rawValue

Keychy/Keychy/Presentation/Tab/Views/FestivalTab.swift

@@ -9,10 +9,10 @@ import SwiftUI
 
 struct FestivalTab: View {
     @Bindable var router: NavigationRouter<FestivalRoute>
-    @Bindable var workshopRouter: NavigationRouter<WorkshopRoute>
     @Bindable var showcaseVM: Showcase25BoardViewModel
+    var onSwitchToKeyringMaker: ((WorkshopRoute) -> Void)? = nil
     var onSwitchToWorkshop: ((WorkshopRoute) -> Void)? = nil
-    
+
     var body: some View {
         NavigationStack(path: $router.path) {
             FestivalView(router: router)
@@ -21,19 +21,20 @@ struct FestivalTab: View {
                     case .showcase25BoardView:
                         Showcase25BoardView(
                             festivalRouter: router,
-                            workshopRouter: workshopRouter,
                             viewModel: showcaseVM,
+                            onNavigateToKeyringMaker: { route in
+                                onSwitchToKeyringMaker?(route)
+                            },
                             onNavigateToWorkshop: { route in
                                 onSwitchToWorkshop?(route)
                             }
                         )
-                        
+
                     case .festivalView:
                         FestivalView(router: router)
                     case .festivalKeyringDetailView(let keyring):
                         FestivalKeyringDetailView(
                             festivalRouter: router,
-                            workshopRouter: workshopRouter,
                             viewModel: showcaseVM,
                             keyring: keyring
                         )

Keychy/Keychy/Presentation/Tab/Views/MainTabView.swift

@@ -124,8 +124,10 @@ extension MainTabView {
     private var festivalTab: some View {
         FestivalTab(
             router: viewModel.festivalRouter,
-            workshopRouter: viewModel.workshopRouter,
             showcaseVM: viewModel.festivalViewModel,
+            onSwitchToKeyringMaker: { route in
+                viewModel.handleSwitchToKeyringMaker(route)
+            },
             onSwitchToWorkshop: { route in
                 viewModel.handleSwitchToWorkshop(route)
             }