Merge pull request #393 from ie3-institute/sp/#392-fix-extevdataservi…

…ce-departures

Fix awaited evcs departure responses

CHANGELOG.md

@@ -69,6 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed config of vn_146_lv_small [#290](https://github.com/ie3-institute/simona/issues/290)
 - Adapted to changes of EvcsInput in PSDM [#377](https://github.com/ie3-institute/simona/pull/377)
 - Fix breaking SIMONA caused by changes in simonaAPI [#384] (https://github.com/ie3-institute/simona/issues/384)
+- Fixed awaiting departed EVs in ExtEvDataService [#392](https://github.com/ie3-institute/simona/issues/392)
 
 ### Removed
 - Remove workaround for tscfg tmp directory [#178](https://github.com/ie3-institute/simona/issues/178)

src/main/scala/edu/ie3/simona/service/ev/ExtEvDataService.scala

@@ -227,26 +227,27 @@ class ExtEvDataService(override val scheduler: ActorRef)
       serviceStateData: ExtEvStateData
   ): (ExtEvStateData, Option[Seq[ScheduleTriggerMessage]]) = {
 
-    requestedDepartingEvs.asScala.foreach { case (evcs, departingEvs) =>
-      serviceStateData.uuidToActorRef.get(evcs) match {
-        case Some(evcsActor) =>
-          evcsActor ! DepartingEvsRequest(tick, departingEvs.asScala.toSeq)
-        case None =>
-          log.warning(
-            "A corresponding actor ref for UUID {} could not be found",
-            evcs
-          )
-      }
-    }
-
     val departingEvResponses: Map[UUID, Option[Seq[EvModel]]] =
-      serviceStateData.uuidToActorRef.map { case (evcs, _) =>
-        evcs -> None
-      }
+      requestedDepartingEvs.asScala.flatMap { case (evcs, departingEvs) =>
+        serviceStateData.uuidToActorRef.get(evcs) match {
+          case Some(evcsActor) =>
+            evcsActor ! DepartingEvsRequest(tick, departingEvs.asScala.toSeq)
+
+            Some(evcs -> None)
+
+          case None =>
+            log.warning(
+              "A corresponding actor ref for UUID {} could not be found",
+              evcs
+            )
+
+            None
+        }
+      }.toMap
 
     // if there are no departing evs during this tick,
     // we're sending response right away
-    if (requestedDepartingEvs.isEmpty)
+    if (departingEvResponses.isEmpty)
       serviceStateData.extEvData.queueExtResponseMsg(new ProvideDepartingEvs())
 
     (