fix(analyzer): await directly future results instead of await on Futu…

…re of no results, updating concurrently (i.e with race conditions) the results
tassiluca · Mar 6, 2024 · fbe14f0 · fbe14f0
1 parent 63a5047
commit fbe14f0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/analyzer-direct/src/main/scala/io/github/tassiLuca/analyzer/lib/Analyzers.scala b/analyzer-direct/src/main/scala/io/github/tassiLuca/analyzer/lib/Analyzers.scala
@@ -36,13 +36,11 @@ private class IncrementalAnalyzer(repositoryService: RepositoryService) extends
       updateResults: RepositoryReport => Unit,
   )(using Async, AsyncOperations): Either[String, Seq[RepositoryReport]] = either:
     val reposInfo = repositoryService.incrementalRepositoriesOf(organizationName)
-    var allReports = Seq[RepositoryReport]()
-    var futures = Seq[Future[Unit]]()
+    var futures = Seq[Future[RepositoryReport]]()
     reposInfo.foreach { repository =>
       futures = futures :+ Future:
         val report = repository.?.performAnalysis.run.awaitResult.?
         updateResults(report)
-        allReports = allReports :+ report
+        report
     }
     futures.awaitAllOrCancel
-    allReports
diff --git a/docs/content/docs/03-channels.md b/docs/content/docs/03-channels.md
@@ -443,18 +443,16 @@ Then, the implementation of the `analyze` method becomes:
 ```scala
 override def analyze(organizationName: String)(
     updateResults: RepositoryReport => Unit,
-)(using Async): Either[String, Seq[RepositoryReport]] = either:
+)(using Async, AsyncOperations): Either[String, Seq[RepositoryReport]] = either:
   val reposInfo = repositoryService.incrementalRepositoriesOf(organizationName) // 1
-  var allReports = Seq[RepositoryReport]()
-  var futures = Seq[Future[Unit]]()
+  var futures = Seq[Future[RepositoryReport]]()
   reposInfo.foreach { repository => // 2
     futures = futures :+ Future: // 3
-      val report = repository.?.performAnalysis.awaitResult.?
+      val report = repository.?.performAnalysis.run.awaitResult.?
       updateResults(report)
-      allReports = allReports :+ report
+      report
   }
-  futures.awaitAllOrCancel // 4
-  allReports
+  futures.awaitAllOrCancel
 ```
 
 1. we get the channel of repositories from the repository service;