refactor: Searching 메서드 통합

boostcampwm-2024 · Nov 30, 2024 · abb72bb · abb72bb
1 parent a7f0093
commit abb72bb
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 46 deletions.
diff --git a/DataSource/DataSource/Sources/Interface/NearbyNetworkInterface.swift b/DataSource/DataSource/Sources/Interface/NearbyNetworkInterface.swift
@@ -12,15 +12,12 @@ public protocol NearbyNetworkInterface {
     var reciptDataPublisher: AnyPublisher<Data, Never> { get }
     var reciptURLPublisher: AnyPublisher<(url: URL, dataInfo: DataInformationDTO), Never> { get }
     var connectionDelegate: NearbyNetworkConnectionDelegate? { get set }
-
-    /// 주변 기기를 검색합니다.
-    func startSearching()
-
+
     /// 주변 기기 검색을 중지합니다.
     func stopSearching()
 
-    /// 주변 기기 검색을 중지 후 다시 시작합니다. 
-    func restartSearching()
+    /// 주변 기기를 검색합니다.
+    func startSearching()
 
     /// 주변에 내 기기를 정보와 함께 알립니다.
     /// - Parameter data: 담을 정보

diff --git a/DataSource/DataSource/Sources/Repository/WhiteboardRepository.swift b/DataSource/DataSource/Sources/Repository/WhiteboardRepository.swift
@@ -34,10 +34,6 @@ public final class WhiteboardRepository: WhiteboardRepositoryInterface {
         nearbyNetwork.startPublishing(with: participantsInfo)
     }
 
-    public func startSearching() {
-        nearbyNetwork.startSearching()
-    }
-
     public func disconnectWhiteboard() {
         nearbyNetwork.disconnectAll()
         nearbyNetwork.stopPublishing()
@@ -64,8 +60,8 @@ public final class WhiteboardRepository: WhiteboardRepositoryInterface {
         nearbyNetwork.stopSearching()
     }
 
-    public func restartSearching() {
-        nearbyNetwork.restartSearching()
+    public func startSearching() {
+        nearbyNetwork.startSearching()
     }
 
     private func updatePublishingInfo(myProfile: Profile) {

diff --git a/Domain/Domain/Sources/Interface/Repository/WhiteboardRepositoryInterface.swift b/Domain/Domain/Sources/Interface/Repository/WhiteboardRepositoryInterface.swift
@@ -13,14 +13,11 @@ public protocol WhiteboardRepositoryInterface {
     /// - Parameter myProfile: 나의 프로필
     func startPublishing(myProfile: Profile)
 
-    /// 주변 화이트보드를 탐색합니다.
-    func startSearching()
-
     /// 화이트보드 탐색을 중지합니다.
     func stopSearching()
 
-    /// 화이트보드 탐색을 중단 후 다시 시작합니다. 
-    func restartSearching()
+    /// 화이트보드 탐색을 시작합니다. 
+    func startSearching()
 
     /// 화이트보드와 연결을 끊습니다. 
     func disconnectWhiteboard()

diff --git a/Domain/Domain/Sources/Interface/UseCase/WhiteboardUseCaseInterface.swift b/Domain/Domain/Sources/Interface/UseCase/WhiteboardUseCaseInterface.swift
@@ -16,10 +16,7 @@ public protocol WhiteboardUseCaseInterface {
     /// 주변에 내 기기를 정보와 함께 알립니다.
     func startPublishingWhiteboard()
 
-    /// 주변 화이트보드를 탐색합니다.
-    func startSearchingWhiteboard()
-
-    /// 화이트보드와 연결을 끊습니다. 
+    /// 화이트보드와 연결을 끊습니다.
     func disconnectWhiteboard()
 
     /// 선택한 화이트보드와 연결을 시도합니다.
@@ -29,6 +26,6 @@ public protocol WhiteboardUseCaseInterface {
     /// 화이트보드 탐색을 중지합니다.
     func stopSearchingWhiteboard()
 
-    /// 화이트보드 탐색을 중단 후 다시 시작합니다. 
-    func refreshWhiteboardList()
+    /// 주변 화이트보드를 탐색합니다.
+    func startSearchingWhiteboards()
 }
diff --git a/Domain/Domain/Sources/UseCase/WhiteboardUseCase.swift b/Domain/Domain/Sources/UseCase/WhiteboardUseCase.swift
@@ -38,10 +38,6 @@ public final class WhiteboardUseCase: WhiteboardUseCaseInterface {
         whiteboardRepository.startPublishing(myProfile: myProfile)
     }
 
-    public func startSearchingWhiteboard() {
-        whiteboardRepository.startSearching()
-    }
-
     public func stopSearchingWhiteboard() {
         whiteboardRepository.stopSearching()
     }
@@ -55,8 +51,8 @@ public final class WhiteboardUseCase: WhiteboardUseCaseInterface {
         try whiteboardRepository.joinWhiteboard(whiteboard: whiteboard, myProfile: profile)
     }
 
-    public func refreshWhiteboardList() {
-        whiteboardRepository.restartSearching()
+    public func startSearchingWhiteboards() {
+        whiteboardRepository.startSearching()
     }
 }
 

diff --git a/NearbyNetwork/NearbyNetwork/Sources/NearbyNetworkService.swift b/NearbyNetwork/NearbyNetwork/Sources/NearbyNetworkService.swift
@@ -52,15 +52,11 @@ public final class NearbyNetworkService: NSObject {
 
 // MARK: - NearbyNetworkInterface
 extension NearbyNetworkService: NearbyNetworkInterface {
-    public func startSearching() {
-        serviceBrowser.startBrowsingForPeers()
-    }
-
     public func stopSearching() {
         serviceBrowser.stopBrowsingForPeers()
     }
 
-    public func restartSearching() {
+    public func startSearching() {
         serialQueue.sync {
             serviceBrowser.stopBrowsingForPeers()
             foundPeers.removeAll()

diff --git a/Presentation/Presentation/Sources/WhiteboardList/View/WhiteboardListViewController.swift b/Presentation/Presentation/Sources/WhiteboardList/View/WhiteboardListViewController.swift
@@ -97,7 +97,7 @@ public final class WhiteboardListViewController: UIViewController {
 
     public override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        viewModel.action(input: .searchWhiteboard)
+        viewModel.action(input: .startSearchingWhiteboards)
     }
 
     public override func viewDidDisappear(_ animated: Bool) {
@@ -267,7 +267,7 @@ public final class WhiteboardListViewController: UIViewController {
     }
 
     private func refreshWhiteboardList() {
-        viewModel.action(input: .refreshWhiteboardList)
+        viewModel.action(input: .startSearchingWhiteboards)
         DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) { [weak self] in
             self?.refreshControl.endRefreshing()
         }

diff --git a/Presentation/Presentation/Sources/WhiteboardList/ViewModel/WhiteboardListViewModel.swift b/Presentation/Presentation/Sources/WhiteboardList/ViewModel/WhiteboardListViewModel.swift
@@ -15,10 +15,9 @@ public final class WhiteboardListViewModel: ViewModel {
 
     enum Input {
         case createWhiteboard
-        case searchWhiteboard
         case joinWhiteboard(whiteboard: Whiteboard)
         case stopSearchingWhiteboard
-        case refreshWhiteboardList
+        case startSearchingWhiteboards
     }
 
     struct Output {
@@ -39,13 +38,11 @@ public final class WhiteboardListViewModel: ViewModel {
         switch input {
         case .createWhiteboard:
             createWhiteboard()
-        case .searchWhiteboard:
-            searchWhiteboard()
         case .joinWhiteboard(let whiteboard):
             joinWhiteboard(whiteboard: whiteboard)
         case .stopSearchingWhiteboard:
             stopSearchingWhiteboard()
-        case .refreshWhiteboardList:
+        case .startSearchingWhiteboards:
             refreshWhiteboardList()
         }
     }
@@ -56,10 +53,6 @@ public final class WhiteboardListViewModel: ViewModel {
         whiteboardSubject.send(whiteboard)
     }
 
-    private func searchWhiteboard() {
-        whiteboardUseCase.startSearchingWhiteboard()
-    }
-
     private func joinWhiteboard(whiteboard: Whiteboard) {
         do {
             try whiteboardUseCase.joinWhiteboard(whiteboard: whiteboard)
@@ -73,6 +66,6 @@ public final class WhiteboardListViewModel: ViewModel {
     }
 
     private func refreshWhiteboardList() {
-        whiteboardUseCase.refreshWhiteboardList()
+        whiteboardUseCase.startSearchingWhiteboards()
     }
 }