Merge pull request #370 from ie3-institute/sp/#368-read-evcs-in-CsvSystemParticipantSource

Adding evcs to CsvSystemParticipantSource.getSystemParticipants

Author: johanneshiry

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+### Fixed
+- `CsvSystemParticipantSource#getSystemParticipants()` now correctly returns electric vehicle charging station input models [PR#370](https://github.com/ie3-institute/PowerSystemDataModel/pull/370)
+
 ## [2.0.0] - 2021-05-21
 
 ### Added

src/main/java/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSource.java

@@ -153,6 +153,11 @@ public Optional<SystemParticipants> getSystemParticipants() {
             .filter(isPresentCollectIfNot(EvInput.class, nonBuildEntities))
             .map(Optional::get)
             .collect(Collectors.toSet());
+    Set<EvcsInput> evcs =
+        nodeAssetEntityStream(EvcsInput.class, evcsInputFactory, nodes, operators)
+            .filter(isPresentCollectIfNot(EvcsInput.class, nonBuildEntities))
+            .map(Optional::get)
+            .collect(Collectors.toSet());
     Set<ChpInput> chpInputs =
         chpInputStream(nodes, operators, chpTypes, thermalBuses, thermalStorages)
             .filter(isPresentCollectIfNot(ChpInput.class, nonBuildEntities))
@@ -175,7 +180,7 @@ public Optional<SystemParticipants> getSystemParticipants() {
         new SystemParticipants(
             bmInputs,
             chpInputs,
-            Collections.emptySet(),
+            evcs,
             evs,
             fixedFeedInInputs,
             hpInputs,

src/test/groovy/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSourceTest.groovy

@@ -25,7 +25,6 @@ import edu.ie3.datamodel.models.input.system.WecInput
 import edu.ie3.datamodel.models.input.thermal.ThermalBusInput
 import edu.ie3.datamodel.models.input.thermal.ThermalStorageInput
 import edu.ie3.test.common.SystemParticipantTestData as sptd
-import org.apache.commons.lang3.NotImplementedException
 import spock.lang.Specification
 
 class CsvSystemParticipantSourceTest extends Specification implements CsvTestDataMeta {
@@ -45,7 +44,7 @@ class CsvSystemParticipantSourceTest extends Specification implements CsvTestDat
 		then:
 		systemParticipantsOpt.present
 		systemParticipantsOpt.ifPresent({ systemParticipants ->
-			assert (systemParticipants.allEntitiesAsList().size() == 9)
+			assert (systemParticipants.allEntitiesAsList().size() == 10)
 			assert (systemParticipants.getPvPlants().first().uuid == sptd.pvInput.uuid)
 			assert (systemParticipants.getBmPlants().first().uuid == sptd.bmInput.uuid)
 			assert (systemParticipants.getChpPlants().first().uuid == sptd.chpInput.uuid)
@@ -55,7 +54,7 @@ class CsvSystemParticipantSourceTest extends Specification implements CsvTestDat
 			assert (systemParticipants.getLoads().first().uuid == sptd.loadInput.uuid)
 			assert (systemParticipants.getWecPlants().first().uuid == sptd.wecInput.uuid)
 			assert (systemParticipants.getStorages().first().uuid == sptd.storageInput.uuid)
-			assert (systemParticipants.getEvCS() == [] as Set)
+			assert (systemParticipants.getEvCS().first().uuid == sptd.evcsInput.uuid)
 		})
 	}