Merge pull request #123 from DeveloperAcademy-POSTECH/feat/#122

[fix] 자잘한 버그 수정
DeveloperAcademy-POSTECH · Nov 29, 2024 · 52ed492 · 52ed492
2 parents cba7750 + 2339d55
commit 52ed492
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/AsyncC/Source/Data/Repositories/FirebaseRepository.swift b/AsyncC/Source/Data/Repositories/FirebaseRepository.swift
@@ -175,7 +175,7 @@ final class FirebaseRepository: FirebaseRepositoryProtocol
             if let error = error {
                 print("Failed to send syncRequest: \(error.localizedDescription)")
             } else {
-                print("Emoticon successfully sent!")
+                print("Sync successfully sent!")
             }
         }
     }
@@ -219,7 +219,7 @@ final class FirebaseRepository: FirebaseRepositoryProtocol
     func setupListenerForSyncRequest(userID: String, handler: @escaping (Result<SyncRequest, Error>) -> Void) {
         let db = Firestore.firestore()
         let docRef = db.collection("syncRequests").document(userID)
-        print("created listener for emoticons")
+        print("created listener for syncRequests")
 
         if syncRequestListener != nil {return}
 

diff --git a/AsyncC/Source/Domain/UseCases/SyncUseCase.swift b/AsyncC/Source/Domain/UseCases/SyncUseCase.swift
@@ -1,5 +1,5 @@
 //
-//  EmoticonUseCase.swift
+//  SyncUseCase.swift
 //  AsyncC
 //
 //  Created by Jin Lee on 11/8/24.
@@ -22,7 +22,7 @@ final class SyncUseCase {
         self.faceTimeUseCase = faceTimeUseCase
     }
 
-    // MARK: - Send Emoticon
+    // MARK: - Send Sync
 
     func requestForSync(receiver: String){
         let sessionID = UUID().uuidString

diff --git a/AsyncC/Source/Extension/Extension + DisbandConfirmation.swift b/AsyncC/Source/Extension/Extension + DisbandConfirmation.swift
@@ -27,7 +27,7 @@ extension AppDelegate {
         exitConfirmation?.isMovable = false
         exitConfirmation?.collectionBehavior = [.canJoinAllSpaces, .stationary, .fullScreenAuxiliary]
         exitConfirmation?.level = .popUpMenu
-        exitConfirmation?.contentViewController = NSHostingController(rootView: DisbandConfirmationView(viewModel: MainStatusViewModel(teamManagingUseCase: self.router.teamManagingUseCase, appTrackingUseCase: self.router.appTrackingUseCase, emoticonUseCase: self.router.syncUseCase, accountUseCase: self.router.accountManagingUseCase)).environmentObject(self.router))
+        exitConfirmation?.contentViewController = NSHostingController(rootView: DisbandConfirmationView(viewModel: MainStatusViewModel(teamManagingUseCase: self.router.teamManagingUseCase, appTrackingUseCase: self.router.appTrackingUseCase, syncUseCase: self.router.syncUseCase, accountUseCase: self.router.accountManagingUseCase)).environmentObject(self.router))
 
         // Set the CornerRadius for the View inside the NSPanel
         exitConfirmation?.contentView?.wantsLayer = true

diff --git a/AsyncC/Source/Extension/Extension + ExitConfirmation.swift b/AsyncC/Source/Extension/Extension + ExitConfirmation.swift
@@ -27,7 +27,7 @@ extension AppDelegate {
         exitConfirmation?.isMovable = false
         exitConfirmation?.collectionBehavior = [.canJoinAllSpaces, .stationary, .fullScreenAuxiliary]
         exitConfirmation?.level = .popUpMenu
-        exitConfirmation?.contentViewController = NSHostingController(rootView: ExitConfirmationView(viewModel: MainStatusViewModel(teamManagingUseCase: self.router.teamManagingUseCase, appTrackingUseCase: self.router.appTrackingUseCase, emoticonUseCase: self.router.syncUseCase, accountUseCase: self.router.accountManagingUseCase)).environmentObject(self.router))
+        exitConfirmation?.contentViewController = NSHostingController(rootView: ExitConfirmationView(viewModel: MainStatusViewModel(teamManagingUseCase: self.router.teamManagingUseCase, appTrackingUseCase: self.router.appTrackingUseCase, syncUseCase: self.router.syncUseCase, accountUseCase: self.router.accountManagingUseCase)).environmentObject(self.router))
 
         // Set the CornerRadius for the View inside the NSPanel
         exitConfirmation?.contentView?.wantsLayer = true

diff --git a/AsyncC/Source/Extension/Extension + HUDWindow.swift b/AsyncC/Source/Extension/Extension + HUDWindow.swift
@@ -34,7 +34,7 @@ extension AppDelegate {
                 viewModel: MainStatusViewModel(
                     teamManagingUseCase: self.router.teamManagingUseCase,
                     appTrackingUseCase: self.router.appTrackingUseCase,
-                    syncUseCasee: self.router.syncUseCase,
+                    syncUseCase: self.router.syncUseCase,
                     accountUseCase: self.router.accountManagingUseCase)
             ).environmentObject(self.router))
 

diff --git a/AsyncC/Source/Presentation/MainStatusView/Components/AppTrackingBoxView.swift b/AsyncC/Source/Presentation/MainStatusView/Components/AppTrackingBoxView.swift
@@ -32,27 +32,26 @@ extension AppTrackingBoxView {
                                     AppIconBoxContentView(viewModel: viewModel, key: key)
                                 }
                             }
-                                .padding(.trailing, 4)
-                            
-                            if viewModel.userName != key {
-                                SyncButton(viewModel: viewModel, key: key, action: {
-                                    if let userID = viewModel.userNameAndID[key] {
-                                        viewModel.syncUseCase.requestForSync(receiver: userID)
-                                    }
-                                })
-                            }
+                            .padding(.trailing, 4)
+
+                        if viewModel.userName != key {
+                            SyncButton(viewModel: viewModel, key: key, action: {
+                                if let userID = viewModel.userNameAndID[key] {
+                                    viewModel.syncUseCase.requestForSync(receiver: userID)
+                                }
+                            })
+                        }
                     }
-                                                                                     }
                     .padding(.vertical, 4.5)
                     .padding(.horizontal, 16)
-                        
-
-                        if key == viewModel.userName {
-                            Rectangle()
-                                .fill(.clear)
-                                .frame(height: 1)
-                                .overlay {
-                                    Divider()
+
+                    
+                    if key == viewModel.userName {
+                        Rectangle()
+                            .fill(.clear)
+                            .frame(height: 1)
+                            .overlay {
+                                Divider()
                             }
                             .padding(.vertical, 12)
                     }

diff --git a/AsyncC/Source/Presentation/MainStatusView/MainStatusViewModel.swift b/AsyncC/Source/Presentation/MainStatusView/MainStatusViewModel.swift
@@ -43,14 +43,13 @@ class MainStatusViewModel: ObservableObject {
     @Published var isToggled: Bool = true
     @Published var isMenuVisible: Bool = false
     @Published var userNameAndID: [String: String] = [:] // [userName: userID]
-    @Published var emailToUserId: [String: String] = [:] // Email-to-ID mapping
     @Published var isSelectedButton: Bool = false
     @Published var buttonStates: [String: Bool] = [:]
 
     init(teamManagingUseCase: TeamManagingUseCase, appTrackingUseCase: AppTrackingUseCase, syncUseCase: SyncUseCase, accountUseCase: AccountManagingUseCase) {
         self.teamManagingUseCase = teamManagingUseCase
         self.appTrackingUseCase = appTrackingUseCase
-        self.syncUseCase =  emoticonUseCase
+        self.syncUseCase =  syncUseCase
         self.accountUseCase = accountUseCase
 
         appTrackingUseCase.$teamTrackingStatus