Merge pull request #39 from clutter/cancel-scan

Add Ability to Cancel a Scan

Example/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - Sections (0.8.0)
-  - SplitScreenScanner (8.0.0):
+  - SplitScreenScanner (8.1.0):
     - Sections
   - SwiftLint (0.34.0)
 
@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   Sections: efc268a207d0e7afba82d2a0efd6cdf61872b5d4
-  SplitScreenScanner: 2a229d138ead2d387ba9ddfe4844eed260949c69
+  SplitScreenScanner: acf69a6e230161d23dab9d50f1d2fd57797a6db2
   SwiftLint: 79d48a17c6565dc286c37efb8322c7b450f95c67
 
 PODFILE CHECKSUM: 662fda703b72b77c2ece8658c02a5b890176b006

Example/Tests/ScanHistoryViewModelTests.swift

@@ -88,7 +88,7 @@ class ScanHistoryViewModelTests: XCTestCase {
     func testSubsequentScan() {
         let firstScan = ScanHistory(barcode: "0000000001", scanResult: .success(description: nil))
         let secondScan = ScanHistory(barcode: "0000000002", scanResult: .error(description: "We no longer store abstract concepts of thought"))
-        let scans = [firstScan, secondScan]
+        let scans = [secondScan, firstScan]
 
         setUpVM(scans: scans, isScanningSessionExpirable: true)
 
@@ -125,6 +125,40 @@ class ScanHistoryViewModelTests: XCTestCase {
         XCTAssertFalse(reloadedSectionHeader)
     }
 
+    func testDropMostRecentScan() {
+        let firstScan = ScanHistory(barcode: "0000000001", scanResult: .success(description: nil))
+        setUpVM(scans: [firstScan], isScanningSessionExpirable: true)
+
+        var rowReloadedIndexPath: IndexPath?
+        viewModel.reloadRowObserver = { indexPath in
+            rowReloadedIndexPath = indexPath
+        }
+
+        viewModel.cancelScannedBarcode(firstScan.barcode)
+        XCTAssertEqual(rowReloadedIndexPath, IndexPath(row: 0, section: 0))
+
+        let canceledScan = ScanHistory(barcode: firstScan.barcode, scanResult: .warning(description: "Scan Canceled"))
+        XCTAssertEqual(viewModel.sections[0].rows[0], .historyRow(barcode: canceledScan.barcode, scanResult: canceledScan.scanResult))
+    }
+
+    func testDropOlderScan() {
+        let firstScan = ScanHistory(barcode: "0000000001", scanResult: .success(description: nil))
+        let secondScan = ScanHistory(barcode: "0000000002", scanResult: .error(description: "We no longer store abstract concepts of thought"))
+        let scans = [secondScan, firstScan]
+        setUpVM(scans: scans, isScanningSessionExpirable: true)
+
+        var rowDeletedIndexPath: IndexPath?
+        viewModel.reloadRowObserver = { indexPath in
+            rowDeletedIndexPath = indexPath
+        }
+
+        viewModel.cancelScannedBarcode(firstScan.barcode)
+        XCTAssertEqual(rowDeletedIndexPath, IndexPath(row: 1, section: 0))
+
+        let canceledScan = ScanHistory(barcode: firstScan.barcode, scanResult: .warning(description: "Scan Canceled"))
+        XCTAssertEqual(viewModel.sections[0].rows[1], .historyRow(barcode: canceledScan.barcode, scanResult: canceledScan.scanResult))
+    }
+
     func testCreateExpireSessionTimer() {
         setUpVM(scans: [], isScanningSessionExpirable: true)
 

SplitScreenScanner.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SplitScreenScanner'
-  s.version          = '8.0.0'
+  s.version          = '8.1.0'
   s.summary          = 'Swift library for scanning barcodes with half the screen devoted to scan history'
 
 # This description is used to generate tags and improve search results.

SplitScreenScanner/Classes/ScanHistoryViewModel.swift

@@ -98,6 +98,10 @@ extension ScanHistoryViewModel {
         }
     }
 
+    func cancelScannedBarcode(_ barcode: String) {
+        cancelScan(with: barcode)
+    }
+
     func createExpireSessionTimer() {
         guard isScanningSessionExpirable else { return }
 
@@ -146,4 +150,23 @@ private extension ScanHistoryViewModel {
             insertRowObserver?(firstRowIndexPath)
         }
     }
+
+    func cancelScan(with barcode: String) {
+        let firstIndex = scans.firstIndex { scan in
+            if case .success = scan.scanResult, scan.barcode == barcode {
+                return true
+            }
+            return false
+        }
+
+        guard let index = firstIndex else { return }
+
+        let scan = scans[index]
+        let newScan = ScanHistory(barcode: scan.barcode, scanResult: .warning(description: "Scan Canceled"))
+        scans[index] = newScan
+
+        let indexPath = IndexPath(row: index, section: 0)
+        sections[indexPath.section].rows[indexPath.row] = .historyRow(barcode: newScan.barcode, scanResult: newScan.scanResult)
+        reloadRowObserver?(indexPath)
+    }
 }

SplitScreenScanner/Classes/SplitScannerCoordinator.swift

@@ -110,6 +110,10 @@ extension SplitScannerCoordinator {
         barcodeScannerViewModel?.unblockScanner()
     }
 
+    public func cancelScannedBarcode(_ barcode: String) {
+        scanHistoryViewModel?.cancelScannedBarcode(barcode)
+    }
+
     public func resetLastScannedBarcode() {
         barcodeScannerViewModel?.resetLastScannedBarcode()
     }