Remove debug command enum, protocol, and usage

duckduckgo · May 9, 2024 · eb505a0 · eb505a0
1 parent 44a4b7b
commit eb505a0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 77 deletions.
diff --git a/...es/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerDebugCommand.swift b/...es/DataBrokerProtection/Sources/DataBrokerProtection/DebugUI/DataBrokerDebugCommand.swift
diff --git a/...rProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionQueueManager.swift b/...rProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionQueueManager.swift
@@ -45,7 +45,7 @@ enum DataBrokerProtectionQueueMode {
     }
 }
 
-protocol DataBrokerProtectionQueueManager: DataBrokerDebugCommandExecutor {
+protocol DataBrokerProtectionQueueManager {
 
     init(operationQueue: DataBrokerProtectionOperationQueue,
          operationsCreator: DataBrokerOperationsCreator,
@@ -113,19 +113,6 @@ final class DefaultDataBrokerProtectionQueueManager: DataBrokerProtectionQueueMa
     }
 }
 
-extension DefaultDataBrokerProtectionQueueManager {
-    func execute(_ command: DataBrokerDebugCommand) {
-        guard case .startOptOutOperations(let showWebView,
-                                          let operationDependencies,
-                                          let completion) = command else { return }
-
-        addOperations(withType: .optOut,
-                      showWebView: showWebView,
-                      operationDependencies: operationDependencies,
-                      completion: completion)
-    }
-}
-
 private extension DefaultDataBrokerProtectionQueueManager {
 
     func startOperationsIfPermitted(forNewMode newMode: DataBrokerProtectionQueueMode,

diff --git a/...okerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift b/...okerProtection/Sources/DataBrokerProtection/Scheduler/DataBrokerProtectionScheduler.swift
@@ -335,20 +335,25 @@ public final class DefaultDataBrokerProtectionScheduler: DataBrokerProtectionSch
 
         os_log("Opting out all brokers...", log: .dataBrokerProtection)
         self.currentOperation = .optOutAll
-        queueManager.execute(.startOptOutOperations(showWebView: showWebView, operationDependencies: operationDependencies) { [weak self] errors in
-            if let errors = errors {
-                if let oneTimeError = errors.oneTimeError {
-                    os_log("Error during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
-                    self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.optOutAllBrokers"))
-                }
-                if let operationErrors = errors.operationErrors,
-                          operationErrors.count != 0 {
-                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
-                }
-            }
-            self?.currentOperation = .idle
-            completion?(errors)
-        })
+        // TODO: Re-implement based on WIP debug command protocol
+        /*
+         This was based on my implementation of `debugCommands`. However, based on Elle's work and the outcomes, my approach is not feasible.
+         we will need to implement the debug protocol including as part of Elle's work
+         */
+//        queueManager.execute(.startOptOutOperations(showWebView: showWebView, operationDependencies: operationDependencies) { [weak self] errors in
+//            if let errors = errors {
+//                if let oneTimeError = errors.oneTimeError {
+//                    os_log("Error during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), error: %{public}@", log: .dataBrokerProtection, oneTimeError.localizedDescription)
+//                    self?.pixelHandler.fire(.generalError(error: oneTimeError, functionOccurredIn: "DefaultDataBrokerProtectionScheduler.optOutAllBrokers"))
+//                }
+//                if let operationErrors = errors.operationErrors,
+//                          operationErrors.count != 0 {
+//                    os_log("Operation error(s) during DefaultDataBrokerProtectionScheduler.optOutAllBrokers in dataBrokerProcessor.runAllOptOutOperations(), count: %{public}d", log: .dataBrokerProtection, operationErrors.count)
+//                }
+//            }
+//            self?.currentOperation = .idle
+//            completion?(errors)
+//        })
     }
 
     public func getDebugMetadata(completion: (DBPBackgroundAgentMetadata?) -> Void) {

diff --git a/...kerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionQueueManagerTests.swift b/...kerProtection/Tests/DataBrokerProtectionTests/DataBrokerProtectionQueueManagerTests.swift
@@ -222,24 +222,4 @@ final class DataBrokerProtectionQueueManagerTests: XCTestCase {
         await fulfillment(of: [expectation], timeout: 3)
         XCTAssert(errorCollection.operationErrors?.count == 5)
     }
-
-    // Test execute debug
-    func testWhenCallDebugOptOutCommand_thenOptOutOperationsAreCreated() throws {
-        // Given
-        sut = DefaultDataBrokerProtectionQueueManager(operationQueue: mockQueue,
-                                                      operationsCreator: mockOperationsCreator,
-                                                      mismatchCalculator: mockMismatchCalculator,
-                                                      brokerUpdater: mockUpdater)
-        let expectedConcurrentOperations = DataBrokerProtectionProcessorConfiguration().concurrentOperationsFor(.optOut)
-        XCTAssert(mockOperationsCreator.createdType == .scan)
-
-        // When
-        sut.execute(.startOptOutOperations(showWebView: false,
-                                           operationDependencies: mockDependencies,
-                                           completion: nil))
-
-        // Then
-        XCTAssert(mockOperationsCreator.createdType == .optOut)
-        XCTAssertEqual(mockQueue.maxConcurrentOperationCount, expectedConcurrentOperations)
-    }
 }