✨ :: [#496] 로그아웃, 로그인에 Analytics UserID 지정

wakmusic · Apr 21, 2024 · 77aa9f6 · 77aa9f6
1 parent 3ee6a90
commit 77aa9f6
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 13 deletions.
diff --git a/Projects/Features/BaseFeature/Sources/ViewModels/ContainSongsViewModel.swift b/Projects/Features/BaseFeature/Sources/ViewModels/ContainSongsViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import ErrorModule
 import Foundation
@@ -65,6 +66,7 @@ public final class ContainSongsViewModel: ViewModelType {
                         let wmError = error.asWMError
                         if wmError == .tokenExpired {
                             logoutRelay.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {

diff --git a/Projects/Features/BaseFeature/Sources/ViewModels/MultiPurposePopupViewModel.swift b/Projects/Features/BaseFeature/Sources/ViewModels/MultiPurposePopupViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeatureInterface
@@ -81,6 +82,7 @@ public final class MultiPurposePopupViewModel: ViewModelType {
                             let wmError = error.asWMError
                             if wmError == .tokenExpired {
                                 logoutRelay.accept(error)
+                                AnalyticsLogManager.setUserID(userID: nil)
                                 return logoutUseCase.execute()
                                     .andThen(.never())
                             } else {
@@ -116,6 +118,7 @@ public final class MultiPurposePopupViewModel: ViewModelType {
                             let wmError = error.asWMError
                             if wmError == .tokenExpired {
                                 logoutRelay.accept(error)
+                                AnalyticsLogManager.setUserID(userID: nil)
                                 return logoutUseCase.execute()
                                     .andThen(.never())
                             } else {
@@ -145,6 +148,7 @@ public final class MultiPurposePopupViewModel: ViewModelType {
                             let wmError = error.asWMError
                             if wmError == .tokenExpired {
                                 logoutRelay.accept(error)
+                                AnalyticsLogManager.setUserID(userID: nil)
                                 return logoutUseCase.execute()
                                     .andThen(.never())
                             } else {
@@ -179,6 +183,7 @@ public final class MultiPurposePopupViewModel: ViewModelType {
                             let wmError = error.asWMError
                             if wmError == .tokenExpired {
                                 logoutRelay.accept(error)
+                                AnalyticsLogManager.setUserID(userID: nil)
                                 return logoutUseCase.execute()
                                     .andThen(.never())
                             } else {

diff --git a/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel.swift b/Projects/Features/PlayerFeature/Sources/ViewModels/PlayerViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseFeature
 import Combine
@@ -212,6 +213,7 @@ final class PlayerViewModel: ViewModelType {
                 logoutUseCase.execute()
                     .andThen(Observable.just(()))
                     .bind { _ in
+                        AnalyticsLogManager.setUserID(userID: nil)
                         output.onLogout.send(())
                     }
                     .disposed(by: disposeBag)

diff --git a/Projects/Features/PlaylistFeature/Sources/PlayListDetailViewModel.swift b/Projects/Features/PlaylistFeature/Sources/PlayListDetailViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeature
@@ -151,6 +152,7 @@ public final class PlayListDetailViewModel: ViewModelType {
 
                         if wmError == .tokenExpired {
                             logoutRelay.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         }
@@ -219,6 +221,7 @@ public final class PlayListDetailViewModel: ViewModelType {
                         let wmError = error.asWMError
                         if wmError == .tokenExpired {
                             logoutRelay.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {

diff --git a/Projects/Features/RootFeature/Sources/ViewModels/IntroViewModel.swift b/Projects/Features/RootFeature/Sources/ViewModels/IntroViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AppDomainInterface
 import AuthDomainInterface
 import BaseFeature
@@ -112,6 +113,7 @@ public final class IntroViewModel: ViewModelType {
                         .flatMap { isExist in
                             output.userInfoResult.onNext(.success(""))
                             if isExist {
+                                AnalyticsLogManager.setUserID(userID: nil)
                                 return logoutUseCase.execute()
                                     .andThen(Observable.just(false))
                             } else {
@@ -136,6 +138,7 @@ public final class IntroViewModel: ViewModelType {
                     logoutUseCase.execute()
                         .andThen(Observable.just(()))
                         .bind {
+                            AnalyticsLogManager.setUserID(userID: nil)
                             Utility.PreferenceManager.startPage = 4
                         }
                         .disposed(by: disposeBag)

diff --git a/Projects/Features/SignInFeature/Sources/ViewModels/LoginViewModel.swift b/Projects/Features/SignInFeature/Sources/ViewModels/LoginViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import AuthenticationServices
 import BaseFeature
@@ -82,6 +83,7 @@ public final class LoginViewModel: NSObject, ViewModelType { // 네이버 델리
                     .asObservable()
             }
             .bind {
+                AnalyticsLogManager.setUserID(userID: $0.id)
                 PreferenceManager.shared.setUserInfo(
                     ID: AES256.encrypt(string: $0.id),
                     platform: $0.platform,

diff --git a/Projects/Features/StorageFeature/Sources/ViewModels/AfterLoginStorageViewModel.swift b/Projects/Features/StorageFeature/Sources/ViewModels/AfterLoginStorageViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseFeature
 import Foundation
@@ -66,6 +67,7 @@ public final class AfterLoginViewModel: ViewModelType {
         input.pressLogOut
             .compactMap { PreferenceManager.userInfo?.platform }
             .flatMap { [naverLoginInstance, logoutUseCase] platform in
+                AnalyticsLogManager.setUserID(userID: nil)
                 switch platform {
                 case "naver":
                     naverLoginInstance?.resetToken()

diff --git a/Projects/Features/StorageFeature/Sources/ViewModels/FavoriteViewModel.swift b/Projects/Features/StorageFeature/Sources/ViewModels/FavoriteViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeature
@@ -170,6 +171,7 @@ public final class FavoriteViewModel: ViewModelType {
 
                         if wmError == .tokenExpired {
                             output.onLogout.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         }
@@ -241,6 +243,7 @@ public final class FavoriteViewModel: ViewModelType {
 
                         if wmError == .tokenExpired {
                             output.onLogout.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {

diff --git a/Projects/Features/StorageFeature/Sources/ViewModels/MyPlayListViewModel.swift b/Projects/Features/StorageFeature/Sources/ViewModels/MyPlayListViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeature
@@ -168,6 +169,7 @@ public final class MyPlayListViewModel: ViewModelType {
                         let wmError = error.asWMError
                         if wmError == .tokenExpired {
                             output.onLogout.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {
@@ -221,6 +223,7 @@ public final class MyPlayListViewModel: ViewModelType {
                         let wmError = error.asWMError
                         if wmError == .tokenExpired {
                             output.onLogout.accept(wmError)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {

diff --git a/Projects/Features/StorageFeature/Sources/ViewModels/ProfilePopViewModel.swift b/Projects/Features/StorageFeature/Sources/ViewModels/ProfilePopViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeature
@@ -91,6 +92,7 @@ public final class ProfilePopViewModel {
 
                         if wmError == .tokenExpired {
                             output.onLogout.accept(error)
+                            AnalyticsLogManager.setUserID(userID: nil)
                             return logoutUseCase.execute()
                                 .andThen(.never())
                         } else {

diff --git a/Projects/Features/StorageFeature/Sources/ViewModels/RequestViewModel.swift b/Projects/Features/StorageFeature/Sources/ViewModels/RequestViewModel.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2023 yongbeomkwak. All rights reserved.
 //
 
+import AnalyticsLogManager
 import AuthDomainInterface
 import BaseDomainInterface
 import BaseFeature
@@ -60,6 +61,7 @@ public final class RequestViewModel: ViewModelType {
                     naverLoginInstance?.requestDeleteToken()
                 }
 
+                AnalyticsLogManager.setUserID(userID: nil)
                 return logoutUseCase.execute()
                     .andThen(Single.just(entity))
             }

diff --git a/Projects/Modules/AnalyticsLogManager/Sources/AnalyticsLogManager.swift b/Projects/Modules/AnalyticsLogManager/Sources/AnalyticsLogManager.swift
@@ -18,21 +18,21 @@ private extension AnalyticsLogManager {
         line: Int = #line
     ) {
         #if DEBUG
-        let logger = Logger(subsystem: OSLog.subSystem, category: level.category)
+            let logger = Logger(subsystem: OSLog.subSystem, category: level.category)
 
-        let fileName = file.components(separatedBy: "/").last ?? "unknown.swift"
-        let functionName = function.components(separatedBy: "(").first ?? "unknown"
-        let footerMessage = "\(fileName) \(functionName):\(line)"
+            let fileName = file.components(separatedBy: "/").last ?? "unknown.swift"
+            let functionName = function.components(separatedBy: "(").first ?? "unknown"
+            let footerMessage = "\(fileName) \(functionName):\(line)"
 
-        let logMessage = "[\(level.symbol) \(level.category)] > \(message)\n-> \(footerMessage)"
-        switch level {
-        case .debug:
-            logger.debug("\(logMessage)")
-        case .analytics:
-            logger.info("\(logMessage)")
-        case .error:
-            logger.error("\(logMessage)")
-        }
+            let logMessage = "[\(level.symbol) \(level.category)] > \(message)\n-> \(footerMessage)"
+            switch level {
+            case .debug:
+                logger.debug("\(logMessage)")
+            case .analytics:
+                logger.info("\(logMessage)")
+            case .error:
+                logger.error("\(logMessage)")
+            }
         #endif
     }
 }