Merge pull request #6 from dev-diaries41/refactor/processor

update: Ensure progress is always tracked regardless of error

Author: dev-diaries41

core/src/main/java/com/fpf/smartscansdk/core/processors/BatchProcessor.kt

@@ -24,11 +24,14 @@ abstract class BatchProcessor<Input, Output>(
     open suspend fun run(items: List<Input>): Metrics = withContext(Dispatchers.IO) {
         val processedCount = AtomicInteger(0)
         val startTime = System.currentTimeMillis()
+        var totalSuccess = 0
 
         try {
             if (items.isEmpty()) {
                 Log.w(TAG, "No items to process.")
-                return@withContext Metrics.Success()
+                val metrics = Metrics.Success()
+                listener?.onComplete(application, metrics)
+                return@withContext metrics
             }
 
             val memoryUtils = MemoryUtils(application, options.memory)
@@ -44,24 +47,26 @@ abstract class BatchProcessor<Input, Output>(
                         semaphore.withPermit {
                             try {
                                 val output = onProcess(application, item)
-                                val current = processedCount.incrementAndGet()
-                                val progress = current.toFloat() / items.size
-                                listener?.onProgress(application, progress)
                                 output
                             } catch (e: Exception) {
                                 listener?.onError(application, e, item)
                                 null
+                            }finally {
+                                val current = processedCount.incrementAndGet()
+                                val progress = current.toFloat() / items.size
+                                listener?.onProgress(application, progress)
                             }
                         }
                     }
                 }
 
                 val outputBatch = deferredResults.mapNotNull { it.await() }
+                totalSuccess += outputBatch.size
                 onBatchComplete(application, outputBatch)
             }
 
             val endTime = System.currentTimeMillis()
-            val metrics = Metrics.Success(processedCount.get(), timeElapsed = endTime - startTime)
+            val metrics = Metrics.Success(totalSuccess, timeElapsed = endTime - startTime)
 
             listener?.onComplete(application, metrics)
             metrics
@@ -71,7 +76,7 @@ abstract class BatchProcessor<Input, Output>(
         }
         catch (e: Exception) {
             val metrics = Metrics.Failure(
-                processedBeforeFailure = processedCount.get(),
+                processedBeforeFailure = totalSuccess,
                 timeElapsed = System.currentTimeMillis() - startTime,
                 error = e
             )

core/src/test/kotlin/com/fpf/smartscansdk/core/processors/BatchProcessorTest.kt

@@ -74,7 +74,7 @@ class BatchProcessorTest {
         assertEquals(0, metrics.totalProcessed)
 
         coVerify(exactly = 0) { mockListener.onProgress(any(), any()) }
-        coVerify ( exactly = 0){mockListener.onComplete(mockApp, any()) }  // shouldnt call because early return
+        coVerify ( exactly = 1){mockListener.onComplete(mockApp, any()) }
     }
 
     @Test