ie3-institute · sebastian-peter · Jul 17, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# Reviewers for Dependabot PRs
+build.gradle  @sebastian-peter  @danielfeismann @staudtMarius
+
+# Reviewers for CI/CD related PRs
+.github/workflows/  @sebastian-peter  @PhilippSchmelter
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,12 +7,6 @@ updates:
     time: "04:00"
   open-pull-requests-limit: 10
   target-branch: dev
-  reviewers:
-  - t-ober
-  - staudtMarius
-  - sebastian-peter
-  - danielfeismann
-  - jo-bao
 
 - package-ecosystem: pip
   directory: "/docs/readthedocs"

@@ -79,7 +79,7 @@ jobs:
           ./gradlew sonar \
           -Dsonar.projectKey=${{ vars.SONAR_PROJECT_KEY }} \
           -Dsonar.host.url=${{ vars.SONAR_HOST_URL }} \
-          -Dsonar.login=${{ secrets.SONAR_TOKEN }} \
+          -Dsonar.token="${{ secrets.SONAR_TOKEN }}" \
           -Dsonar.qualitygate.wait=true
 
       #Deployment

@@ -16,6 +16,19 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - name: Check Snapshot
+        if: contains(steps.metadata.outputs.new-version, 'snap')
+        run: |
+          echo "::error::Snapshot versions are not allowed – workflow stopped."
+          exit 1 
+
+      - name: Approve the PR
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+
       - name: Enable auto-merge for Dependabot PRs
         if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
         run: gh pr merge --auto --merge "$PR_URL"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased/Snapshot]
 
+### Added
+
+### Fixed
+
+### Changed
+
+## [8.0.0] - 2025-07-17
+
+### Added
+- Extend Validation to EnergyManagement Systems. [#1356](https://github.com/ie3-institute/PowerSystemDataModel/issues/1356)
+
+### Fixed
+- Fixed handling of `CongestionResult.InputModelType` in `EntityProcessor` [#1325](https://github.com/ie3-institute/PowerSystemDataModel/issues/1325)
+- Fixed em fields in input models [#1331](https://github.com/ie3-institute/PowerSystemDataModel/issues/1331)
+- Fixed valid fields for `EmInput` [#1360](https://github.com/ie3-institute/PowerSystemDataModel/issues/1360)
+
+### Changed
+- Updated dependabot workflow and added CODEOWNERS [#1328](https://github.com/ie3-institute/PowerSystemDataModel/issues/1328)
+- Extend azimuth angle range to [-180°, 180°] for PV inputs [#1330](https://github.com/ie3-institute/PowerSystemDataModel/issues/1330)
+- Improved error messages when reading and validating an invalid grid [#1354](https://github.com/ie3-institute/PowerSystemDataModel/issues/1354)
+- Changed `SubgridContainer` to represent galvanically seperated grids [#1226](https://github.com/ie3-institute/PowerSystemDataModel/issues/1226)
+
 ## [7.0.0] - 2025-05-08
 
 ### Added
@@ -357,7 +379,8 @@ coordinates or multiple exactly equal coordinates possible
 -   CsvDataSource now stops trying to get an operator for empty operator uuid field in entities
 -   CsvDataSource now parsing multiple geoJson strings correctly
 
-[Unreleased/Snapshot]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...HEAD
+[Unreleased/Snapshot]: 
+[8.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/7.0.0...8.0.0
 [7.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/6.0.0...7.0.0
 [6.0.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.1.0...6.0.0
 [5.1.0]: https://github.com/ie3-institute/powersystemdatamodel/compare/5.0.1...5.1.0

@@ -4,12 +4,12 @@ plugins {
   id 'maven-publish'
   id 'signing'
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '7.0.3' //code format
-  id 'com.github.spotbugs' version '6.1.11' // code check, working on byte code
+  id 'com.diffplug.spotless' version '7.1.0' //code format
+  id 'com.github.spotbugs' version '6.2.2' // code check, working on byte code
   id 'de.undercouch.download' version '5.6.0'
   id 'kr.motd.sphinx' version '2.10.1' // documentation generation
   id 'jacoco' // java code coverage plugin
-  id "org.sonarqube" version "6.1.0.5360" // sonarqube
+  id "org.sonarqube" version "6.2.0.5505" // sonarqube
   id 'net.thauvin.erik.gradle.semver' version '1.0.4' // semantic versioning
   id "com.github.johnrengelman.shadow" version "8.1.1" // fat jar
 }
@@ -18,10 +18,10 @@ ext {
   //version (changing these should be considered thoroughly!)
   javaVersion = JavaVersion.VERSION_17
   groovyVersion = "4.0"
-  groovyBinaryVersion = "4.0.26"
+  groovyBinaryVersion = "4.0.27"
 
   junitVersion = '1.12.0'
-  testcontainersVersion = '1.21.0'
+  testcontainersVersion = '1.21.3'
 
   scriptsLocation = 'gradle' + File.separator + 'scripts' + File.separator //location of script plugins
 }
@@ -81,7 +81,7 @@ dependencies {
   testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
   testImplementation "org.spockframework:spock-core:2.3-groovy-$groovyVersion"
   testImplementation 'org.objenesis:objenesis:3.4' // Mock creation with constructor parameters
-  testImplementation 'net.bytebuddy:byte-buddy:1.17.5' // Mocks of classes
+  testImplementation 'net.bytebuddy:byte-buddy:1.17.6' // Mocks of classes
 
   // testcontainers (docker framework for testing)
   testImplementation "org.testcontainers:testcontainers:$testcontainersVersion"
@@ -91,15 +91,15 @@ dependencies {
   testImplementation "org.testcontainers:couchbase:$testcontainersVersion"
 
   // logging
-  implementation platform('org.apache.logging.log4j:log4j-bom:2.24.3')
+  implementation platform('org.apache.logging.log4j:log4j-bom:2.25.1')
   implementation 'org.apache.logging.log4j:log4j-api' // log4j
   implementation 'org.apache.logging.log4j:log4j-core' // log4j
   implementation 'org.apache.logging.log4j:log4j-slf4j-impl' // log4j -> slf4j
 
   // Databases
   implementation 'org.influxdb:influxdb-java:2.25'
-  implementation 'com.couchbase.client:java-client:3.8.0'
-  runtimeOnly 'org.postgresql:postgresql:42.7.5' // postgresql jdbc driver required during runtime
+  implementation 'com.couchbase.client:java-client:3.8.3'
+  runtimeOnly 'org.postgresql:postgresql:42.7.7' // postgresql jdbc driver required during runtime
 
   implementation 'commons-io:commons-io:2.19.0' // I/O functionalities
   implementation 'commons-codec:commons-codec:1.18.0' // needed by commons-compress

diff --git a/docs/readthedocs/_static/figures/transformerWithSwitchGear.png b/docs/readthedocs/_static/figures/transformerWithSwitchGear.png
diff --git a/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex b/docs/readthedocs/_static/figures/transformerWithSwitchGear.tex
@@ -159,9 +159,9 @@
 	    \begin{tikzpicture}
 	    % === Anschlüsse ===
 	        \node[circle, draw = tuGreen, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_a) at (0,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
-	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_b) at (15mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_c) at (30mm,0){};
+	        \node[circle, draw = tuOrange, fill = tuGreen, inner sep = 0, minimum height = 1.5mm] (port_d) at (45mm,0){};
 	        \node[circle, draw = tuOrange, fill = tuOrange, inner sep = 0, minimum height = 1.5mm] (port_e) at (62.5mm,0){};
 
 	        \draw (port_a.west) -- ++(-3mm, -1mm) -- ++(0mm, -2mm) edge[densely dotted] ++(0mm, -1.8mm);
@@ -176,9 +176,9 @@
 	        \draw (port_d.east) -- (winding_a.west) (winding_b.east) -- (port_e.west);
 
 	        \node[tuGreen, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_a.south) {A \\ \SI{110}{\kV} \\ 1};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 2};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 2};
-	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 2};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_b.south) {B \\ \SI{110}{\kV} \\ 1};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_c.south) {C \\ \SI{110}{\kV} \\ 1};
+	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_d.south) {D \\ \SI{110}{\kV} \\ 1};
 	        \node[tuOrange, anchor = north, inner sep = 2mm, text width = 10mm, align = center] at (port_e.south) {E \\ \SI{10}{\kV} \\ 2};
 	    \end{tikzpicture}
 \end{document}
diff --git a/docs/readthedocs/models/input/em.md b/docs/readthedocs/models/input/em.md
@@ -37,7 +37,7 @@ Participants are connected to an EM each via their `em` field.
      -
      - String representation (e.g. name) of a control strategy
 
-   * - parentEm
+   * - controllingEm
      -
      - Reference to a superior Energy Management Unit that is controlling this EM.
        Field can be empty or missing, if this EM itself is not controlled.

diff --git a/docs/readthedocs/models/input/grid/gridcontainer.md b/docs/readthedocs/models/input/grid/gridcontainer.md
@@ -24,14 +24,11 @@ and their higher voltage coupling point.
 
 Let's shed a more detailed light on the boundaries of a sub grid as of our definition.
 This especially is important, if the switchgear of the transformer is modeled in detail.
-We defined, that all nodes in upstream direction of the transformer, that are connected by switches *only* (therefore
-are within the switchgear) are counted towards the inferior sub grid structure (here "2"), although they belong to a
-different voltage level.
-This decision is taken, because we assume, that the interest to operate on the given switchgear will most likely be
-placed in the inferior grid structure.
-
-The "real" coupling node A is not comprised in the sub grids node collection, but obviously has reference through the
-switch between nodes A and B.
+We defined, that all nodes in upstream direction of the transformer, including those, which are within the switchgear are
+counted towards the superior sub grid structure (here "1"), because they belong to a different voltage level.
+If a switchgear should be operated by the inferior grid, one can set the operator, that is used in the inferior grid, for
+the switchgear. This can be necessary, if we assume, that the interest to operate on the given switchgear will most likely
+be placed in the inferior grid structure.
 
 A synoptic overview of both classes' attributes is given here:
 

diff --git a/docs/readthedocs/models/input/participant/bm.md b/docs/readthedocs/models/input/participant/bm.md
@@ -107,7 +107,7 @@ Model of a biomass power plant.
      - € / MWh
      - Fixed feed in tariff
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/chp.md b/docs/readthedocs/models/input/participant/chp.md
@@ -114,7 +114,7 @@ Combined heat and power plant.
      - Whether to adapt output based on (volatile)
        market price or not
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/ev.md b/docs/readthedocs/models/input/participant/ev.md
@@ -97,7 +97,7 @@ Model of an electric vehicle, that is occasionally connected to the grid via an
      -
      - 
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/evcs.md b/docs/readthedocs/models/input/participant/evcs.md
@@ -63,7 +63,7 @@ station and has some limitations outlined below.
      - Boolean
      - Vehicle to grid (V2G) support, true if the charging station supports feed in.
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/fixedfeedin.md b/docs/readthedocs/models/input/participant/fixedfeedin.md
@@ -49,7 +49,7 @@ model can be derived.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/hp.md b/docs/readthedocs/models/input/participant/hp.md
@@ -93,7 +93,7 @@ Model of a heat pump.
      -
      -
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/load.md b/docs/readthedocs/models/input/participant/load.md
@@ -56,7 +56,7 @@ Model of (mainly) domestic loads.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/pv.md b/docs/readthedocs/models/input/participant/pv.md
@@ -44,8 +44,7 @@ Detailed model of a photovoltaic power plant.
 
    * - azimuth
      - °
-     - Inclination in a compass direction
-       South = 0°, West = 90°, East = -90°
+     - South = 0°, West = 90°, East = -90°, North = +/- 180°  
 
    * - etaConv
      - %
@@ -76,7 +75,7 @@ Detailed model of a photovoltaic power plant.
      -
      - Rated power factor
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/storage.md b/docs/readthedocs/models/input/participant/storage.md
@@ -107,7 +107,7 @@ Model of an ideal electrical battery energy storage.
      - Foreseen operation strategy of the storage.
        Eligible input: *"market"*, *"grid"*, *"self"*
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/docs/readthedocs/models/input/participant/wec.md b/docs/readthedocs/models/input/participant/wec.md
@@ -106,7 +106,7 @@ Model of a wind energy converter.
      - Whether to adapt output based on (volatile)
        market price or not
 
-   * - em
+   * - controllingEm
      -
      - UUID reference to an [Energy Management Unit](#em_model) that is controlling
        this system participant. Field can be empty or missing, if this participant

diff --git a/src/main/java/edu/ie3/datamodel/exceptions/DuplicateEntitiesException.java b/src/main/java/edu/ie3/datamodel/exceptions/DuplicateEntitiesException.java
@@ -19,7 +19,7 @@ public DuplicateEntitiesException(
     this(
         "The following exception(s) occurred while checking the uniqueness of '"
             + entityName
-            + "' entities: "
-            + ExceptionUtils.getMessages(exceptions));
+            + "' entities: \n"
+            + ExceptionUtils.combineExceptions(exceptions));
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/exceptions/FailedValidationException.java b/src/main/java/edu/ie3/datamodel/exceptions/FailedValidationException.java
@@ -23,7 +23,6 @@ public FailedValidationException(String message) {
 
   /** @param exceptions List of exceptions, which must not be empty */
   public FailedValidationException(List<? extends Exception> exceptions) {
-    super(
-        "Validation failed due to: \n" + ExceptionUtils.getMessages(exceptions), exceptions.get(0));
+    super("Validation failed due to:\n " + ExceptionUtils.combineExceptions(exceptions));
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/exceptions/InvalidEntityException.java b/src/main/java/edu/ie3/datamodel/exceptions/InvalidEntityException.java
@@ -13,13 +13,12 @@ public class InvalidEntityException extends ValidationException {
   private static final long serialVersionUID = 809496087520306374L;
 
   public InvalidEntityException(String faultDescription, UniqueEntity invalidEntity) {
-    super("Entity is invalid because of: \n" + faultDescription + " [" + invalidEntity + "]");
+    super("Entity is invalid because of: " + faultDescription + " [" + invalidEntity + "]");
   }
 
   public InvalidEntityException(
       String faultDescription, Throwable cause, UniqueEntity invalidEntity) {
-    super(
-        "Entity is invalid because of: \n" + faultDescription + " [" + invalidEntity + "]", cause);
+    super("Entity is invalid because of: " + faultDescription + " [" + invalidEntity + "]", cause);
   }
 
   public InvalidEntityException(String message, Throwable cause) {

diff --git a/src/main/java/edu/ie3/datamodel/exceptions/SourceException.java b/src/main/java/edu/ie3/datamodel/exceptions/SourceException.java
@@ -32,6 +32,6 @@ public SourceException(final String message) {
   }
 
   public SourceException(String message, List<? extends Exception> exceptions) {
-    super(message + " " + ExceptionUtils.getMessages(exceptions), exceptions.get(0));
+    super(message + "\n " + ExceptionUtils.combineExceptions(exceptions));
   }
 }
diff --git a/src/main/java/edu/ie3/datamodel/io/factory/Factory.java b/src/main/java/edu/ie3/datamodel/io/factory/Factory.java
@@ -73,7 +73,7 @@ public Try<R, FactoryException> get(D data) {
    *     {@link Failure}
    */
   public Try<R, FactoryException> get(Try<D, ?> data) {
-    return data.transformF(FactoryException::new).flatMap(this::get);
+    return data.transformF(e -> new FactoryException(e.getMessage(), e)).flatMap(this::get);
   }
 
   /**

diff --git a/src/main/java/edu/ie3/datamodel/io/factory/input/AssetInputEntityFactory.java b/src/main/java/edu/ie3/datamodel/io/factory/input/AssetInputEntityFactory.java
@@ -24,8 +24,9 @@
 public abstract class AssetInputEntityFactory<T extends AssetInput, D extends AssetInputEntityData>
     extends UniqueEntityFactory<T, D> {
 
-  private static final String OPERATES_FROM = "operatesFrom";
-  private static final String OPERATES_UNTIL = "operatesUntil";
+  protected static final String OPERATOR = "operator";
+  protected static final String OPERATES_FROM = "operatesFrom";
+  protected static final String OPERATES_UNTIL = "operatesUntil";
 
   @SafeVarargs
   protected AssetInputEntityFactory(Class<? extends T>... allowedClasses) {
@@ -48,14 +49,33 @@ protected List<Set<String>> getFields(Class<?> entityClass) {
     Set<String> constructorParamsUntil = expandSet(constructorParamsMin, OPERATES_UNTIL);
     Set<String> constructorParamsBoth = expandSet(constructorParamsFrom, OPERATES_UNTIL);
 
+    // with operator field
+    Set<String> constructorParamsOperator = expandSet(constructorParamsMin, OPERATOR);
+    Set<String> constructorParamsOperatorFrom = expandSet(constructorParamsFrom, OPERATOR);
+    Set<String> constructorParamsOperatorUntil = expandSet(constructorParamsUntil, OPERATOR);
+    Set<String> constructorParamsOperatorBoth = expandSet(constructorParamsBoth, OPERATOR);
+
     final String[] additionalFields = getAdditionalFields();
 
     constructorParamsMin = expandSet(constructorParamsMin, additionalFields);
     constructorParamsFrom = expandSet(constructorParamsFrom, additionalFields);
     constructorParamsUntil = expandSet(constructorParamsUntil, additionalFields);
     constructorParamsBoth = expandSet(constructorParamsBoth, additionalFields);
+
+    constructorParamsOperator = expandSet(constructorParamsOperator, additionalFields);
+    constructorParamsOperatorFrom = expandSet(constructorParamsOperatorFrom, additionalFields);
+    constructorParamsOperatorUntil = expandSet(constructorParamsOperatorUntil, additionalFields);
+    constructorParamsOperatorBoth = expandSet(constructorParamsOperatorBoth, additionalFields);
+
     return Arrays.asList(
-        constructorParamsMin, constructorParamsFrom, constructorParamsUntil, constructorParamsBoth);
+        constructorParamsMin,
+        constructorParamsFrom,
+        constructorParamsUntil,
+        constructorParamsBoth,
+        constructorParamsOperator,
+        constructorParamsOperatorFrom,
+        constructorParamsOperatorUntil,
+        constructorParamsOperatorBoth);
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up @@
          -
          -
-       * - em
+       * - controllingEm
          -
          - UUID reference to an [Energy Management Unit](#em_model) that is controlling
            this system participant. Field can be empty or missing, if this participant
@@ Expand Down @@