이메일 미인증시 CTA 개선 (2) (#208)

* refactor error alert logic * show email verify alert on lecture detail page
wafflestudio · Jan 18, 2023 · aca6600 · aca6600
1 parent 3bd0096
commit aca6600
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/SNUTT-2022/SNUTT/ViewModels/LectureDetailViewModel.swift b/SNUTT-2022/SNUTT/ViewModels/LectureDetailViewModel.swift
@@ -13,11 +13,13 @@ extension LectureDetailScene {
     class ViewModel: BaseViewModel, ObservableObject {
         @Published var isErrorAlertPresented = false
         @Published var isLectureOverlapped: Bool = false
+        @Published var isEmailVerifyAlertPresented = false
         var errorTitle: String = ""
         var errorMessage: String = ""
 
         override init(container: DIContainer) {
             super.init(container: container)
+            appState.system.$selectedTab.assign(to: &$_selectedTab)
         }
 
         var lectureService: LectureServiceProtocol {
@@ -27,6 +29,21 @@ extension LectureDetailScene {
         var currentTimetable: Timetable? {
             appState.timetable.current
         }
+
+        @Published private var _selectedTab: TabType = .review
+        var selectedTab: TabType {
+            get { _selectedTab }
+            set { services.globalUIService.setSelectedTab(newValue) }
+        }
+
+        func presentEmailVerifyAlert() {
+            let emailVerifyError = STError(.EMAIL_NOT_VERIFIED)
+            errorTitle = emailVerifyError.title
+            errorMessage = emailVerifyError.content
+            DispatchQueue.main.async {
+                self.isEmailVerifyAlertPresented = true
+            }
+        }
 
         func addCustomLecture(lecture: Lecture, isForced: Bool = false) async -> Bool {
             do {

diff --git a/SNUTT-2022/SNUTT/ViewModels/SearchSceneViewModel.swift b/SNUTT-2022/SNUTT/ViewModels/SearchSceneViewModel.swift
@@ -19,9 +19,7 @@ class SearchSceneViewModel: BaseViewModel, ObservableObject {
     @Published var selectedTagList: [SearchTag] = []
     @Published var isLoading: Bool = false
     @Published var isLectureOverlapped: Bool = false
-
-    @Published var emailVerifyError: STError? = nil
-    @Published var presentEmailVerifyAlert = false
+    @Published var isEmailVerifyAlertPresented = false
 
     var errorTitle: String = ""
     var errorMessage: String = ""
@@ -140,8 +138,11 @@ class SearchSceneViewModel: BaseViewModel, ObservableObject {
         do {
             return try await services.lectureService.fetchReviewId(courseNumber: lecture.courseNumber, instructor: lecture.instructor)
         } catch let error as STError where error.code == .EMAIL_NOT_VERIFIED {
-            emailVerifyError = error
-            presentEmailVerifyAlert = true
+            await MainActor.run {
+                errorTitle = error.title
+                errorMessage = error.content
+                isEmailVerifyAlertPresented = true
+            }
         } catch {
             services.globalUIService.presentErrorAlert(error: error)
         }

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/LectureDetailScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/LectureDetailScene.swift
@@ -195,8 +195,20 @@ struct LectureDetailScene: View {
                         }
 
                         DetailButton(text: "강의평") {
-                            showReviewWebView = true
+                            if reviewId == nil {
+                                viewModel.presentEmailVerifyAlert()
+                            } else {
+                                showReviewWebView = true
+                            }
                         }
+                        .alert(viewModel.errorTitle, isPresented: $viewModel.isEmailVerifyAlertPresented, actions: {
+                            Button("확인") {
+                                viewModel.selectedTab = .review
+                            }
+                            Button("취소", role: .cancel) {}
+                        }, message: {
+                            Text(viewModel.errorMessage)
+                        })
                         .onAppear {
                             Task {
                                 reviewId = await viewModel.fetchReviewId(of: lecture)

diff --git a/SNUTT-2022/SNUTT/Views/Scenes/SearchLectureScene.swift b/SNUTT-2022/SNUTT/Views/Scenes/SearchLectureScene.swift
@@ -82,16 +82,13 @@ struct SearchLectureScene: View {
             .task {
                 await viewModel.fetchTags()
             }
-            .alert(viewModel.emailVerifyError?.title ?? "", isPresented: $viewModel.presentEmailVerifyAlert, actions: {
+            .alert(viewModel.errorTitle, isPresented: $viewModel.isEmailVerifyAlertPresented, actions: {
                 Button("확인") {
-                    viewModel.emailVerifyError = nil
                     viewModel.selectedTab = .review
                 }
-                Button("취소", role: .cancel) {
-                    viewModel.emailVerifyError = nil
-                }
+                Button("취소", role: .cancel) {}
             }, message: {
-                Text(viewModel.emailVerifyError?.content ?? "")
+                Text(viewModel.errorMessage)
             })
             .navigationBarHidden(true)
             .animation(.customSpring, value: viewModel.searchResult?.count)