Analytics 로깅 추가

wafflestudio · Mar 1, 2025 · d12f170 · d12f170
1 parent 754e231
commit d12f170
Show file tree

Hide file tree

Showing 31 changed files with 88 additions and 11 deletions.
diff --git a/SNUTT-2022/SNUTT/AppState/States/UserState.swift b/SNUTT-2022/SNUTT/AppState/States/UserState.swift
@@ -6,12 +6,17 @@
 //
 
 import SwiftUI
+import FirebaseAnalytics
 
 class UserState {
     @Published var accessToken: String?
     @Published var current: User?
     @Published var socialProvider: SocialProvider?
 
     /// Primary key of User. Required to logout. This is not `localId`.
-    var userId: String?
+    var userId: String? {
+        didSet {
+            Analytics.setUserID(userId)
+        }
+    }
 }
diff --git a/SNUTT-2022/SNUTT/Models/Lecture.swift b/SNUTT-2022/SNUTT/Models/Lecture.swift
@@ -30,6 +30,11 @@ struct Lecture: Identifiable {
         quota - freshmanQuota
     }
 
+    /// DB에 저장된 강의 고유 ID
+    var referenceId: String {
+        lectureId ?? id
+    }
+
     var createdAt: String
     var updatedAt: String
     var quota: Int

diff --git a/SNUTT-2022/SNUTT/Services/AuthService.swift b/SNUTT-2022/SNUTT/Services/AuthService.swift
@@ -64,36 +64,42 @@ struct AuthService: AuthServiceProtocol, UserAuthHandler {
     }
 
     func loginWithLocalId(localId: String, localPassword: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.login(.init(provider: .local)))
         let dto = try await authRepository.loginWithLocalId(localId: localId, localPassword: localPassword)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
     }
 
     func registerWithLocalId(localId: String, localPassword: String, email: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.signUp)
         let dto = try await authRepository.registerWithLocalId(localId: localId, localPassword: localPassword, email: email)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
     }
 
     func loginWithApple(appleToken: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.login(.init(provider: .apple)))
         let dto = try await authRepository.loginWithApple(appleToken: appleToken)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
     }
 
     func loginWithFacebook(facebookToken: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.login(.init(provider: .facebook)))
         let dto = try await authRepository.loginWithFacebook(facebookToken: facebookToken)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
     }
 
     func loginWithGoogle(googleToken: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.login(.init(provider: .google)))
         let dto = try await authRepository.loginWithGoogle(googleToken: googleToken)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
     }
 
     func loginWithKakao(kakaoToken: String) async throws {
+        FirebaseAnalyticsLogger().logEvent(.login(.init(provider: .kakao)))
         let dto = try await authRepository.loginWithKakao(kakaoToken: kakaoToken)
         saveAccessTokenFromLoginResponse(dto: dto)
         try await registerFCMToken()
@@ -120,6 +126,7 @@ struct AuthService: AuthServiceProtocol, UserAuthHandler {
     }
 
     func logout() async throws {
+        FirebaseAnalyticsLogger().logEvent(.logout)
         let fcmToken = userDefaultsRepository.get(String.self, key: .fcmToken, defaultValue: "")
         guard let userId = appState.user.userId else { throw STError(.NO_USER_TOKEN) }
         let _ = try? await authRepository.logout(userId: userId, fcmToken: fcmToken)

diff --git a/SNUTT-2022/SNUTT/Services/LectureService.swift b/SNUTT-2022/SNUTT/Services/LectureService.swift
@@ -115,7 +115,8 @@ struct LectureService: LectureServiceProtocol {
     }
 
     func bookmarkLecture(lecture: Lecture) async throws {
-        try await lectureRepository.bookmarkLecture(lectureId: lecture.lectureId ?? lecture.id)
+        let lectureReferenceId = lecture.lectureId ?? lecture.id
+        try await lectureRepository.bookmarkLecture(lectureId: lectureReferenceId)
         guard let currentTimetable = appState.timetable.current else { return }
         let dto = try await lectureRepository.getBookmark(quarter: currentTimetable.quarter)
         let bookmark = Bookmark(from: dto)

diff --git a/SNUTT-2022/SNUTT/Services/SearchService.swift b/SNUTT-2022/SNUTT/Services/SearchService.swift
@@ -95,6 +95,7 @@ struct SearchService: SearchServiceProtocol {
                                                                 offset: offset,
                                                                 limit: searchState.perPage)
         let models: [Lecture] = dtos.map { Lecture(from: $0) }
+        FirebaseAnalyticsLogger().logEvent(.searchLecture(.init(query: searchState.searchText, quarter: currentTimetable.quarter.longString(), page: searchState.pageNum)))
         searchState.searchResult = offset == 0 ? models : (searchState.searchResult ?? []) + models
     }
 

diff --git a/SNUTT-2022/SNUTT/ViewModels/LectureDetailViewModel.swift b/SNUTT-2022/SNUTT/ViewModels/LectureDetailViewModel.swift
@@ -172,6 +172,7 @@ extension LectureDetailScene {
         }
 
         func bookmarkLecture(lecture: Lecture) async {
+            FirebaseAnalyticsLogger().logEvent(.addToBookmark(.init(lectureID: lecture.referenceId, referrer: .lectureDetail)))
             do {
                 try await services.lectureService.bookmarkLecture(lecture: lecture)
             } catch {
@@ -194,6 +195,7 @@ extension LectureDetailScene {
         }
 
         func addVacancyLecture(lecture: Lecture) async {
+            FirebaseAnalyticsLogger().logEvent(.addToVacancy(.init(lectureID: lecture.referenceId, referrer: .lectureDetail)))
             do {
                 try await services.vacancyService.addLecture(lecture: lecture)
             } catch let error as STError where error.code == .INVALID_SEMESTER_FOR_VACANCY_NOTIFICATION {

diff --git a/SNUTT-2022/SNUTT/Views/Components/Lecture/ExpandableLectureCell.swift b/SNUTT-2022/SNUTT/Views/Components/Lecture/ExpandableLectureCell.swift
@@ -120,6 +120,7 @@ struct ExpandableLectureCell: View {
                             isMainWebView: false,
                             detailId: reviewDetailId
                         )
+                        .analyticsScreen(.reviewDetail(.init(lectureID: lecture.referenceId, referrer: viewModel.detailReferrer)))
                         .id(reviewDetailId)
                     }
                     .sheet(isPresented: $isDetailPagePresented) {
@@ -129,6 +130,7 @@ struct ExpandableLectureCell: View {
                                 lecture: lecture,
                                 displayMode: .preview(shouldHideDismissButton: false)
                             )
+                            .analyticsScreen(.lectureDetail(.init(lectureID: lecture.referenceId, referrer: viewModel.detailReferrer)))
                         }
                     }
                 }
@@ -173,7 +175,7 @@ extension ExpandableLectureCell {
         var errorTitle: String = ""
         var errorMessage: String = ""
 
-        private var searchState: SearchState {
+        var searchState: SearchState {
             appState.search
         }
 
@@ -185,11 +187,30 @@ extension ExpandableLectureCell {
             get { appState.system.selectedTab }
             set { services.globalUIService.setSelectedTab(newValue) }
         }
+
+        var detailReferrer: LectureDetailParameter.Referrer {
+            switch searchState.displayMode {
+            case .search:
+                .search(query: searchState.searchText)
+            case .bookmark:
+                .bookmark
+            }
+        }
+
+        var lectureActionReferrer: LectureActionReferrer {
+            switch searchState.displayMode {
+            case .search:
+                return .search(query: searchState.searchText)
+            case .bookmark:
+                return .bookmark
+            }
+        }
     }
 }
 
 extension ExpandableLectureCell.ViewModel {
     func addLecture(_ lecture: Lecture) async {
+        FirebaseAnalyticsLogger().logEvent(.addToTimetable(.init(lectureID: lecture.referenceId, timetableID: appState.timetable.current?.id, referrer: lectureActionReferrer)))
         do {
             try await services.lectureService.addLecture(lecture: lecture)
         } catch {
@@ -225,6 +246,7 @@ extension ExpandableLectureCell.ViewModel {
     }
 
     func addVacancyLecture(_ lecture: Lecture) async {
+        FirebaseAnalyticsLogger().logEvent(.addToVacancy(.init(lectureID: lecture.referenceId, referrer: lectureActionReferrer)))
         do {
             try await services.vacancyService.addLecture(lecture: lecture)
         } catch {
@@ -241,6 +263,7 @@ extension ExpandableLectureCell.ViewModel {
     }
 
     func addBookmarkLecture(_ lecture: Lecture) async {
+        FirebaseAnalyticsLogger().logEvent(.addToBookmark(.init(lectureID: lecture.referenceId, referrer: lectureActionReferrer)))
         isFirstBookmarkAlertPresented = appState.timetable.isFirstBookmark ?? false
         do {
             try await services.lectureService.bookmarkLecture(lecture: lecture)

diff --git a/SNUTT-2022/SNUTT/Views/Components/LectureList.swift b/SNUTT-2022/SNUTT/Views/Components/LectureList.swift
@@ -17,6 +17,7 @@ struct LectureList: View {
                 ForEach(lectures) { lecture in
                     NavigationLink {
                         LectureDetailScene(viewModel: .init(container: viewModel.container), lecture: lecture, displayMode: .normal)
+                            .analyticsScreen(.lectureDetail(.init(lectureID: lecture.referenceId, referrer: .lectureList)))
                     } label: {
                         VStack(spacing: 0) {
                             Divider()

diff --git a/SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuSheet.swift b/SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuSheet.swift
@@ -93,6 +93,7 @@ struct MenuSheet: View {
                     }
                 }
             }
+            .analyticsScreen(.timetableMenu, isVisible: isOpen)
         }
     }
 }
diff --git a/SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuThemeSheet.swift b/SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuThemeSheet.swift
@@ -70,5 +70,6 @@ struct MenuThemeSheet: View {
                 Spacer()
             }
         }
+        .analyticsScreen(.themePreview, isVisible: isOpen)
     }
 }
diff --git a/SNUTT-2022/SNUTT/Views/Components/NotificationList.swift b/SNUTT-2022/SNUTT/Views/Components/NotificationList.swift
@@ -60,6 +60,7 @@ struct NotificationList: View {
             if let lecture = routingInfo.lecture {
                 ZStack {
                     LectureDetailScene(viewModel: .init(container: viewModel.container), lecture: lecture, displayMode: .preview(shouldHideDismissButton: true))
+                        .analyticsScreen(.lectureDetail(.init(lectureID: lecture.referenceId, referrer: .notification)))
                     if let timetableId = routingInfo.timetableId {
                         VStack {
                             Spacer()

diff --git a/SNUTT-2022/SNUTT/Views/Components/Timetable/LectureBlocks.swift b/SNUTT-2022/SNUTT/Views/Components/Timetable/LectureBlocks.swift
@@ -36,7 +36,7 @@ struct LectureBlocks: View {
                                            visibilityOptions: config.visibilityOptions)
                         #else
                             if let container = container {
-                                NavigationLink(destination: LectureDetailScene(viewModel: .init(container: container), lecture: lecture, displayMode: .normal)) {
+                                NavigationLink(destination: LectureDetailScene(viewModel: .init(container: container), lecture: lecture, displayMode: .normal).analyticsScreen(.lectureDetail(.init(lectureID: lecture.referenceId, referrer: .timetable)))) {
                                     TimetableBlock(lecture: lecture,
                                                    timePlace: timePlace,
                                                    theme: theme,

diff --git a/SNUTT-2022/SNUTT/Views/Components/UserSupportView.swift b/SNUTT-2022/SNUTT/Views/Components/UserSupportView.swift
@@ -67,6 +67,7 @@ struct UserSupportView: View {
                 }
             }
         }
+        .analyticsScreen(.settingsSupport)
         .alert("개발자 괴롭히기", isPresented: $alertSendFeedback) {
             Button("취소", role: .cancel, action: {})
             Button("전송", role: .none, action: {

diff --git a/SNUTT-2022/SNUTT/Views/Components/WebViews/DeveloperInfoView.swift b/SNUTT-2022/SNUTT/Views/Components/WebViews/DeveloperInfoView.swift
@@ -11,6 +11,7 @@ struct DeveloperInfoView: View {
     var body: some View {
         SingleWebView(url: WebViewType.developerInfo.url)
             .navigationTitle("개발자 정보")
+            .analyticsScreen(.settingsDevelopers)
     }
 }
 

diff --git a/SNUTT-2022/SNUTT/Views/SNUTTView.swift b/SNUTT-2022/SNUTT/Views/SNUTTView.swift
@@ -49,6 +49,7 @@ struct SNUTTView: View, Sendable {
                     }
                     TabScene(tabType: .review) {
                         ReviewScene(viewModel: .init(container: viewModel.container), isMainWebView: true)
+                            .analyticsScreen(.reviewHome)
                     }
                     TabScene(tabType: .friends) {
                         FriendsScene(viewModel: .init(container: viewModel.container))

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/BookmarkScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/BookmarkScene.swift
@@ -24,6 +24,7 @@ struct BookmarkScene: View {
                 .animation(.customSpring, value: viewModel.selectedLecture?.id)
             }
         }
+        .analyticsScreen(.bookmark)
         .navigationTitle("관심강좌")
         .navigationBarTitleDisplayMode(.inline)
         .animation(.customSpring, value: viewModel.bookmarkedLectures.count)

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/FilterSheetScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/FilterSheetScene.swift
@@ -35,6 +35,7 @@ struct FilterSheetScene: View {
                 FilterSheetContent(viewModel: viewModel)
             }
         }
+        .analyticsScreen(.searchFilter, isVisible: viewModel.isFilterOpen)
         .ignoresSafeArea(.keyboard)
     }
 }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/FriendsScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/FriendsScene.swift
@@ -23,6 +23,7 @@ struct FriendsScene: View {
                     .id(colorScheme)
                     .navigationBarHidden(true)
                     .background(STColor.systemBackground)
+                    .analyticsScreen(.friends)
             } else {
                 ProgressView()
             }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/LectureDetailScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/LectureDetailScene.swift
@@ -512,6 +512,7 @@ struct LectureDetailScene: View {
                     }
                 }.sheet(isPresented: $showSyllabusWebView) {
                     SyllabusWebView(lectureTitle: lecture.title, urlString: $syllabusURL)
+                        .analyticsScreen(.lectureSyllabus(.init(lectureID: lecture.referenceId)))
                         .ignoresSafeArea(edges: .bottom)
                         .interactiveDismissDisabled()
                 }
@@ -521,6 +522,7 @@ struct LectureDetailScene: View {
                 }
                 .sheet(isPresented: $showReviewWebView) {
                     ReviewScene(viewModel: .init(container: viewModel.container), isMainWebView: false, detailId: lecture.evLecture?.evLectureId)
+                        .analyticsScreen(.reviewDetail(.init(lectureID: lecture.referenceId, referrer: .lectureDetail)))
                         .id(colorScheme)
                 }
             }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/LectureListScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/LectureListScene.swift
@@ -22,6 +22,7 @@ struct LectureListScene: View {
                             lectures: viewModel.lectures)
             }
         }
+        .analyticsScreen(.lectureList)
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
@@ -35,6 +36,7 @@ struct LectureListScene: View {
             ZStack {
                 NavigationView {
                     LectureDetailScene(viewModel: .init(container: viewModel.container), lecture: viewModel.placeholderLecture, displayMode: .create)
+                        .analyticsScreen(.lectureCreate)
                 }
                 // this view is duplicated on purpose (i.e. there are 2 instances of LectureTimeSheetScene)
                 LectureTimeSheetScene(viewModel: .init(container: viewModel.container))

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/LoginScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/LoginScene.swift
@@ -68,6 +68,7 @@ struct LoginScene: View {
             .disabled(isButtonDisabled)
             .animation(.customSpring, value: isButtonDisabled)
         }
+        .analyticsScreen(.login)
         .padding()
         .navigationTitle(changeTitle ? "아이디 입력" : "로그인")
         .navigationBarTitleDisplayMode(.inline)

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/OnboardScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/OnboardScene.swift
@@ -112,6 +112,7 @@ struct OnboardScene: View {
                         Spacer().frame(height: proxy.size.height * 0.05)
                     }
                     .transition(.scale(scale: 1))
+                    .analyticsScreen(.onboard)
                 }
             } else {
                 VStack {

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/PopupScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/PopupScene.swift
@@ -21,6 +21,7 @@ struct PopupScene: View {
                     PopupView(popup: currentPopup,
                               dismiss: viewModel.dismiss(popup:dontShowForWhile:))
                         .padding(.horizontal, reader.size.width * 0.1)
+                        .analyticsScreen(.popup)
                 }
             }
         }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/SearchLectureScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/SearchLectureScene.swift
@@ -89,17 +89,22 @@ struct SearchLectureScene: View {
                         .onTapGesture {
                             isSearchBarFocused = false
                         }
+                        .analyticsScreen(.searchHome)
                 } else if viewModel.searchResult?.count == 0 {
                     EmptySearchResult()
+                        .analyticsScreen(.searchEmpty)
                 } else if let searchResult = viewModel.searchResult {
-                    ExpandableLectureList(
-                        viewModel: .init(container: viewModel.container),
-                        lectures: searchResult,
-                        selectedLecture: $viewModel.selectedLecture,
-                        fetchMoreLectures: viewModel.fetchMoreSearchResult
-                    )
+                    VStack(spacing: 0) {
+                        ExpandableLectureList(
+                            viewModel: .init(container: viewModel.container),
+                            lectures: searchResult,
+                            selectedLecture: $viewModel.selectedLecture,
+                            fetchMoreLectures: viewModel.fetchMoreSearchResult
+                        )
+                        .id(reloadSearchList) // reload everything when any of the search conditions changes
+                    }
+                    .analyticsScreen(.searchList)
                     .animation(.customSpring, value: viewModel.selectedLecture?.id)
-                    .id(reloadSearchList) // reload everything when any of the search conditions changes
                 }
             }
         }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/Settings/AccountSettingScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/Settings/AccountSettingScene.swift
@@ -64,6 +64,7 @@ struct AccountSettingScene: View {
                 }
             }
         }
+        .analyticsScreen(.settingsAccount)
         .animation(.customSpring, value: viewModel.currentUser?.fbName)
         .animation(.customSpring, value: viewModel.currentUser?.localId)
         .listStyle(.insetGrouped)

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/Settings/ColorSchemeSettingScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/Settings/ColorSchemeSettingScene.swift
@@ -30,5 +30,6 @@ struct ColorSchemeSettingScene: View {
         }
         .listStyle(.insetGrouped)
         .navigationTitle("화면 모드")
+        .analyticsScreen(.settingsColorScheme)
     }
 }
diff --git a/SNUTT-2022/SNUTT/Views/Scenes/Settings/SettingScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/Settings/SettingScene.swift
@@ -101,6 +101,7 @@ struct SettingScene: View {
                 }
             }
         }
+        .analyticsScreen(.settingsHome)
         .environment(\.defaultMinListHeaderHeight, 1)
         .environment(\.hasNewBadgeClosure) { name in viewModel.hasNewBadge(settingName: name) }
         .listStyle(.insetGrouped)
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,6 +93,7 @@ struct MenuSheet: View { @@
                         }
                     }
                 }
+                .analyticsScreen(.timetableMenu, isVisible: isOpen)
             }
         }
     }