로그 이슈 수정 (#348)

* 로그 이슈 수정

* Apply SwiftFormat changes

---------

Co-authored-by: shp7724 <shp7724@users.noreply.github.com>

Author: shp7724

SNUTT-2022/SNUTT/Services/SearchService.swift

@@ -101,11 +101,6 @@ 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
     }
 
@@ -116,6 +111,12 @@ struct SearchService: SearchServiceProtocol {
         }
         searchState.pageNum = 0
         try await _fetchSearchResult()
+        if let current = timetableState.current {
+            FirebaseAnalyticsLogger().logEvent(.searchLecture(.init(
+                query: searchState.searchText,
+                quarter: current.quarter.longString()
+            )))
+        }
     }
 
     func fetchMoreSearchResult() async throws {

SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuSheet.swift

@@ -93,7 +93,7 @@ struct MenuSheet: View {
                     }
                 }
             }
-            .analyticsScreen(.timetableMenu, isVisible: isOpen)
+            .analyticsScreen(.timetableMenu, shouldLogEvent: isOpen)
         }
     }
 }

SNUTT-2022/SNUTT/Views/Components/MenuSheets/MenuThemeSheet.swift

@@ -71,6 +71,6 @@ struct MenuThemeSheet: View {
                 Spacer()
             }
         }
-        .analyticsScreen(.themePreview, isVisible: isOpen)
+        .analyticsScreen(.themePreview, shouldLogEvent: isOpen)
     }
 }

SNUTT-2022/SNUTT/Views/Scenes/FilterSheetScene.swift

@@ -35,7 +35,7 @@ struct FilterSheetScene: View {
                 FilterSheetContent(viewModel: viewModel)
             }
         }
-        .analyticsScreen(.searchFilter, isVisible: viewModel.isFilterOpen)
+        .analyticsScreen(.searchFilter, shouldLogEvent: viewModel.isFilterOpen)
         .ignoresSafeArea(.keyboard)
     }
 }

SNUTT-2022/SNUTT/Views/Scenes/LoginScene.swift

@@ -68,7 +68,7 @@ struct LoginScene: View {
             .disabled(isButtonDisabled)
             .animation(.customSpring, value: isButtonDisabled)
         }
-        .analyticsScreen(.login)
+        .analyticsScreen(.login, shouldLogEvent: viewModel.appState.user.accessToken == nil)
         .padding()
         .navigationTitle(changeTitle ? "아이디 입력" : "로그인")
         .navigationBarTitleDisplayMode(.inline)

SNUTT-2022/SNUTT/Views/Scenes/OnboardScene.swift

@@ -112,7 +112,7 @@ struct OnboardScene: View {
                         Spacer().frame(height: proxy.size.height * 0.05)
                     }
                     .transition(.scale(scale: 1))
-                    .analyticsScreen(.onboard)
+                    .analyticsScreen(.onboard, shouldLogEvent: viewModel.appState.user.accessToken == nil)
                 }
             } else {
                 VStack {

SNUTT-2022/SNUTT/Views/Scenes/PopupScene.swift

@@ -21,11 +21,15 @@ struct PopupScene: View {
                     PopupView(popup: currentPopup,
                               dismiss: viewModel.dismiss(popup:dontShowForWhile:))
                         .padding(.horizontal, reader.size.width * 0.1)
-                        .analyticsScreen(.popup)
                 }
             }
         }
         .animation(.customSpring, value: viewModel.currentPopup?.id)
+        .onChange(of: viewModel.currentPopup?.id) { newPopupId in
+            if newPopupId != nil {
+                FirebaseAnalyticsLogger().logScreen(.popup)
+            }
+        }
         .onLoad {
             await viewModel.getRecentPopupList()
         }

SNUTT-2022/SNUTT/Views/Scenes/Settings/ThemeSettingScene.swift

@@ -51,7 +51,6 @@ struct ThemeSettingScene: View {
                         theme: viewModel.newTheme,
                         themeType: .new
                     )
-                    .analyticsScreen(.themeCustomNew)
                 }
             }
             .accentColor(Color(UIColor.label))
@@ -64,7 +63,6 @@ struct ThemeSettingScene: View {
                         theme: viewModel.targetTheme ?? viewModel.newTheme,
                         themeType: .basic
                     )
-                    .analyticsScreen(.themeBasicDetail)
                 }
             }
             .accentColor(Color(UIColor.label))
@@ -76,17 +74,6 @@ struct ThemeSettingScene: View {
                     theme: viewModel.targetTheme ?? viewModel.newTheme,
                     themeType: .custom
                 )
-                .analyticsScreen(.themeCustomEdit)
-            }
-            .accentColor(Color(UIColor.label))
-        })
-        .sheet(isPresented: $viewModel.isDownloadedThemeSheetOpen, content: {
-            NavigationView {
-                ThemeDetailScene(
-                    viewModel: .init(container: viewModel.container),
-                    theme: viewModel.targetTheme ?? viewModel.newTheme,
-                    themeType: .downloaded
-                )
             }
             .accentColor(Color(UIColor.label))
         })

SNUTT-2022/SNUTT/Views/Scenes/SharedUIAnalytics/AnalyticsEvent.swift

@@ -71,8 +71,6 @@ public struct SearchLectureParameter: Encodable {
 
     /// 예: "2022년 겨울학기"
     let quarter: String
-
-    let page: Int
 }
 
 extension AnalyticsEvent {

SNUTT-2022/SNUTT/Views/Scenes/SharedUIAnalytics/AnalyticsScreen.swift

@@ -38,6 +38,7 @@ public enum AnalyticsScreen: SnakeCaseConvertible {
     case themeCustomNew
     case themeCustomEdit
     case themePreview
+    case themeDownloaded
 
     case vacancy
     case popup