[Fix] #788 - 탭 바 전환 로직 수정

[Fix] #788 - 탭 바 전환 로직 수정

Author: yungu0010

SOPT-iOS/Projects/Core/Sources/Enum/TabBarItemType.swift

@@ -10,8 +10,8 @@ import Foundation
 
 public enum TabBarItemType: Int, CaseIterable {
     case home
-    case poke
     case soptamp
+    case poke
     case soptlog
 }
 
@@ -25,27 +25,34 @@ public extension TabBarItemType {
         }
     }
 
+    /// 유저타입 별 탭 바 인덱스 매핑
     func getTabIndex(userType: UserType) -> Int {
         switch userType {
         case .active:
-            switch self {
-            case .home:
-                0
-            case .soptamp:
-                1
-            case .poke:
-                2
-            case .soptlog:
-                3
-            }
+            return self.rawValue
         case .visitor, .inactive:
             switch self {
             case .home, .soptamp:
-                0
+                return 0
             case .poke:
-                1
+                return 1
             case .soptlog:
-                2
+                return 2
+            }
+        }
+    }
+    
+    /// 실제 탭바 인덱스 -> TabBarItemType
+    static func from(index: Int, userType: UserType) -> TabBarItemType? {
+        switch userType {
+        case .active:
+            return TabBarItemType(rawValue: index)
+        case .visitor, .inactive:
+            switch index {
+            case 0: return .home
+            case 1: return .poke
+            case 2: return .soptlog
+            default: return nil
             }
         }
     }

SOPT-iOS/Projects/Features/RootFeature/Sources/ApplicationCoordinator+Delegate.swift

@@ -48,7 +48,7 @@ extension ApplicationCoordinator: TabBarCoordinatorDelegate {
     }
 
     private func selectedTab(_ tab: TabBarItemType) {
-        self.tabBarController?.selectedIndex = tab.rawValue
+        self.tabBarController?.selectedIndex = tab.getTabIndex(userType: UserDefaultKeyList.Auth.getUserType())
     }
 }
 

SOPT-iOS/Projects/Features/TabBarFeature/Interface/Sources/TabBarPresentable.swift

@@ -13,7 +13,7 @@ import BaseFeatureDependency
 import Core
 
 public protocol TabBarCoordinatable {
-    var onTabBarItemTapped: ((Int) -> Void)? { get set }
+    var onTabBarItemTapped: ((TabBarItemType) -> Void)? { get set }
     var showTabBarAlert: (() -> Void)? { get set }
 }
 public typealias TabBarViewModelType = ViewModelType & TabBarCoordinatable

SOPT-iOS/Projects/Features/TabBarFeature/Sources/Coordinator/LegacyTabBarCoordinator.swift

@@ -38,12 +38,12 @@ public final class LegacyTabBarCoordinator: DefaultTabBarCoordinator {
     private func showTabBar() {
         var tabBar = factory
 
-        tabBar.vm.onTabBarItemTapped = { [weak self] index in
+        tabBar.vm.onTabBarItemTapped = { [weak self] tabType in
             // 각 탭의 코디네이터 실행
-            switch index {
-            case 0:
+            switch tabType {
+            case .home:
                 self?.requestCoordinating?(.home)
-            case 1:
+            case .soptlog:
                 self?.requestCoordinating?(.soptlog)
             default:
                 return

SOPT-iOS/Projects/Features/TabBarFeature/Sources/Coordinator/TabBarCoordinator.swift

@@ -67,17 +67,17 @@ public final class TabBarCoordinator: BaseCoordinator {
     private func showTabBar() {
         var tabBar = factory.makeTabBar(with: views, userType: userType, coordinator: self)
 
-        tabBar.vm.onTabBarItemTapped = { [weak self] index in
+        tabBar.vm.onTabBarItemTapped = { [weak self] tabType in
             // 각 탭의 코디네이터 실행
-            guard let self = self,
-                  let tabType = TabBarItemType(rawValue: index) else { return }
+            guard let self = self else { return }
+            
             switch tabType {
             case .home:
                 self.delegate?.tabBarCoordinator(self, to: .home)
-            case .poke:
-                self.delegate?.tabBarCoordinator(self, to: .poke)
             case .soptamp:
                 self.delegate?.tabBarCoordinator(self, to: .soptamp)
+            case .poke:
+                self.delegate?.tabBarCoordinator(self, to: .poke)
             case .soptlog:
                 self.delegate?.tabBarCoordinator(self, to: .soptlog)
             }

SOPT-iOS/Projects/Features/TabBarFeature/Sources/ViewModel/TabBarViewModel.swift

@@ -17,10 +17,11 @@ final public class TabBarViewModel: TabBarViewModelType {
 
     // MARK: - Properties
 
-    private let cancelBag = CancelBag()
-    private let userType: UserType
     private let coordinator: AnyCoordinatorObject
+    private let cancelBag = CancelBag()
     private let homeUseCase: HomeUseCase
+    
+    private let userType: UserType
     @Published public private(set) var tabBarBadges: [TabBarItemType: String] = [:]
 
     // MARK: - Inputs
@@ -38,7 +39,7 @@ final public class TabBarViewModel: TabBarViewModelType {
 
     // MARK: - TabBarCoordinating
 
-    public var onTabBarItemTapped: ((Int) -> Void)?
+    public var onTabBarItemTapped: ((TabBarItemType) -> Void)?
     public var showTabBarAlert: (() -> Void)?
 
     // MARK: - initialization
@@ -63,8 +64,9 @@ extension TabBarViewModel {
         input.isTabSelectedIndex
             .withUnretained(self)
             .sink { owner, index in
-                owner.onTabBarItemTapped?(index)
-                owner.trackAmplitude(itemIndex: index)
+                guard let tabBar = TabBarItemType.from(index: index, userType: owner.userType) else { return }
+                owner.onTabBarItemTapped?(tabBar)
+                owner.trackAmplitude(itemType: tabBar)
             }.store(in: cancelBag)
 
         return output
@@ -74,10 +76,8 @@ extension TabBarViewModel {
 // MARK: - Methods
 
 extension TabBarViewModel {
-    private func trackAmplitude(itemIndex: Int) {
-        if let item = TabBarItemType(rawValue: itemIndex) {
-            AmplitudeInstance.shared.trackWithUserType(event: item.toAmplitudeEventType)
-        }
+    private func trackAmplitude(itemType: TabBarItemType) {
+        AmplitudeInstance.shared.trackWithUserType(event: itemType.toAmplitudeEventType)
     }
 
     private func fetchAppServiceBadges() {