Add handling of custom load profiles in LoadProfileSource.getResolution.

Author: staudtMarius

src/main/java/edu/ie3/datamodel/io/source/LoadProfileSource.java

@@ -89,19 +89,24 @@ protected Try<LoadProfileEntry<V>, FactoryException> createEntries(
   public abstract Optional<ComparableQuantity<Energy>> getLoadProfileEnergyScaling();
 
   /**
-   * Returns the resolution for the given {@link LoadProfile}.
+   * Returns an option for the resolution for the given {@link LoadProfile}.
+   *
+   * <p>Note: This method does not support {@link LoadProfile.CustomLoadProfile}. If a custom load
+   * profile is provided, no resolution is returned.
    *
    * @param loadProfile given load profile
    * @return the resolution in seconds.
    */
-  public static long getResolution(LoadProfile loadProfile) {
-
+  public static Optional<Long> getResolution(LoadProfile loadProfile) {
     if (loadProfile == LoadProfile.DefaultLoadProfiles.NO_LOAD_PROFILE) {
-      // since no load profile was assigned, we return the maximal possible value
-      return Long.MAX_VALUE;
+      // since no load profile was assigned, we return no resolution
+      return Optional.empty();
+    } else if (loadProfile instanceof LoadProfile.CustomLoadProfile c) {
+      log.info("Custom load profile {} found. Cannot provide resolution!", c.key());
+      return Optional.empty();
     } else {
       // currently all registered profiles and all sources use 15 minutes intervals
-      return 900L;
+      return Optional.of(900L);
     }
   }
 

src/main/java/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtils.java

@@ -375,9 +375,7 @@ private static List<Try<Void, InvalidEntityException>> checkLoad(LoadInput loadI
     exceptions.add(
         Try.ofVoid(
             loadInput.getLoadProfile() == null,
-            () ->
-                new InvalidEntityException(
-                    "No standard load profile defined for load", loadInput)));
+            () -> new InvalidEntityException("No load profile defined for load", loadInput)));
 
     exceptions.addAll(
         Try.ofVoid(

src/test/groovy/edu/ie3/datamodel/io/source/LoadProfileSourceTest.groovy

@@ -22,7 +22,7 @@ class LoadProfileSourceTest extends Specification {
     def resolutions = Arrays.stream(allProfiles).map { it -> LoadProfileSource.getResolution(it) }.toList()
 
     then:
-    resolutions.every { resolution -> resolution == 900 }
+    resolutions.every { resolution -> resolution == Optional.of(900L) }
   }
 
 

src/test/groovy/edu/ie3/datamodel/utils/validation/SystemParticipantValidationUtilsTest.groovy

@@ -324,7 +324,7 @@ class SystemParticipantValidationUtilsTest extends Specification {
 
     where:
     invalidLoad                                                                                                                                                    || expectedSize || expectedException
-    SystemParticipantTestData.loadInput.copy().loadprofile(null).build() 																						   || 1            || new InvalidEntityException("No standard load profile defined for load", invalidLoad)
+    SystemParticipantTestData.loadInput.copy().loadprofile(null).build() 																						   || 1            || new InvalidEntityException("No load profile defined for load", invalidLoad)
     SystemParticipantTestData.loadInput.copy().sRated(Quantities.getQuantity(-25d, ACTIVE_POWER_IN)).eConsAnnual(Quantities.getQuantity(-4000, ENERGY_IN)).build() || 1            || new InvalidEntityException("The following quantities have to be zero or positive: -25 kVA, -4000 kWh", invalidLoad)
     SystemParticipantTestData.loadInput.copy().cosPhiRated(2).build()                                                                                              || 1            || new InvalidEntityException("Rated power factor of LoadInput must be between 0 and 1", invalidLoad)
   }