Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix transformer susceptance in readTheDocs to negative values [#1078](https://github.com/ie3-institute/PowerSystemDataModel/issues/1078)
- Added mising fields to field validation [#1422](https://github.com/ie3-institute/PowerSystemDataModel/issues/1422)
- Fixed the issues with rtd for Cylindrical thermal storage [#1273](https://github.com/ie3-institute/PowerSystemDataModel/issues/1273)
- Correctly persist EmInput entities in CsvFileSink [#1337](https://github.com/ie3-institute/PowerSystemDataModel/issues/1337)

### Changed
- Updated CI-Pipeline to run task `Deploy` and `Staging` only for `Main` [#1403](https://github.com/ie3-institute/PowerSystemDataModel/issues/1403)
Expand Down
18 changes: 17 additions & 1 deletion src/main/java/edu/ie3/datamodel/io/sink/CsvFileSink.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import edu.ie3.datamodel.io.csv.BufferedCsvWriter;
import edu.ie3.datamodel.io.csv.CsvFileDefinition;
import edu.ie3.datamodel.io.extractor.Extractor;
import edu.ie3.datamodel.io.extractor.HasEm;
import edu.ie3.datamodel.io.extractor.NestedEntity;
import edu.ie3.datamodel.io.naming.FileNamingStrategy;
import edu.ie3.datamodel.io.processor.ProcessorProvider;
Expand Down Expand Up @@ -225,14 +226,29 @@ public void persistJointGrid(JointGridContainer jointGridContainer) {
.flatMap(Optional::stream)
.collect(Collectors.toSet());

// extract all EmInput entities
Set<EmInput> emInputs =
systemParticipants.allEntitiesAsList().stream()
.filter(Objects::nonNull)
.map(HasEm.class::cast)
.map(HasEm::getControllingEm)
.flatMap(Optional::stream)
.flatMap(
em ->
Stream.iterate(
em, Objects::nonNull, current -> current.getControllingEm().orElse(null)))
.collect(Collectors.toSet());

// persist all entities
Stream.of(
rawGridElements.allEntitiesAsList(),
systemParticipants.allEntitiesAsList(),
graphicElements.allEntitiesAsList(),
types,
operators)
operators,
emInputs)
.flatMap(Collection::stream)
.collect(Collectors.toSet())
.forEach(this::persistIgnoreNested);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ class CsvFileSinkTest extends Specification implements TimeSeriesTestData {
testBaseFolderPath.resolve("storage_type_input.csv").toFile().exists()
testBaseFolderPath.resolve("transformer_2_w_input.csv").toFile().exists()
testBaseFolderPath.resolve("transformer_2_w_type_input.csv").toFile().exists()
testBaseFolderPath.resolve("em_input.csv").toFile().exists()

cleanup:
csvFileSink.shutdown()
Expand Down