Small adaptions.

Author: staudtMarius

src/main/java/edu/ie3/simona/api/data/container/ExtInputContainer.java

@@ -113,7 +113,9 @@ public void addRequest(FlexOptionRequest request) {
    * @param multiFlexOptions that will be added to this container
    */
   public void addFlexOptions(MultiFlexOptions multiFlexOptions) {
-    addFlexOptions(multiFlexOptions.receiver(), multiFlexOptions.flexOptions());
+    flexOptions
+        .computeIfAbsent(multiFlexOptions.receiver(), k -> new ArrayList<>())
+        .addAll(multiFlexOptions.disaggregated().values());
   }
 
   /**

src/main/java/edu/ie3/simona/api/data/model/em/GeneralFlexOptions.java renamed to src/main/java/edu/ie3/simona/api/data/model/em/EnergyBoundariesFlexOptions.java

@@ -16,7 +16,7 @@
 import tech.units.indriya.ComparableQuantity;
 
 /**
- * General flex options that can represent various flex option types.
+ * Energy boundaries flex options that can represent various flex option types.
  *
  * @param model That is providing this flex options.
  * @param flexType The type of the flex options.
@@ -27,7 +27,7 @@
  * @param tickToEnergyLimits A map: tick to energy limits.
  * @param disaggregated A map: uuid to disaggregated flex options.
  */
-public record GeneralFlexOptions(
+public record EnergyBoundariesFlexOptions(
     UUID receiver,
     UUID model,
     String flexType,
@@ -39,7 +39,7 @@ public record GeneralFlexOptions(
     Map<UUID, FlexOptions> disaggregated)
     implements FlexOptions {
 
-  public GeneralFlexOptions(
+  public EnergyBoundariesFlexOptions(
       UUID receiver,
       UUID model,
       String flexType,

src/main/java/edu/ie3/simona/api/data/model/em/MultiFlexOptions.java

@@ -6,18 +6,22 @@
 
 package edu.ie3.simona.api.data.model.em;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
- * Container class for grouping multiple flex options to a single receiver.
+ * Container class for grouping disaggregated flex options to a single receiver.
  *
  * @param receiver that should receive the flex options
- * @param flexOptions that should be received
+ * @param disaggregated flex options
  */
-public record MultiFlexOptions(UUID receiver, List<FlexOptions> flexOptions) implements EmData {
+public record MultiFlexOptions(UUID receiver, Map<UUID, FlexOptions> disaggregated)
+    implements FlexOptions {
   public MultiFlexOptions(UUID receiver) {
-    this(receiver, new ArrayList<>());
+    this(receiver, new HashMap<>());
+  }
+
+  @Override
+  public void addDisaggregated(UUID model, FlexOptions flexOptions) {
+    disaggregated.put(model, flexOptions);
   }
 }

src/test/groovy/edu/ie3/simona/api/data/container/ExtInputContainerTest.groovy

@@ -93,7 +93,7 @@ class ExtInputContainerTest extends Specification {
         def container = new ExtInputContainer(0L)
 
         when:
-        container.addFlexOptions(new MultiFlexOptions(receiver, [flexOptions]))
+        container.addFlexOptions(new MultiFlexOptions(receiver, [(sender): flexOptions]))
 
         then:
         container.flexOptions == [(receiver): [flexOptions]]

src/test/groovy/edu/ie3/simona/api/data/model/em/FlexOptionsTest.groovy

@@ -46,7 +46,7 @@ class FlexOptionsTest extends Specification {
         UUID receiver = UUID.randomUUID()
 
         when:
-        def flexOptions = new GeneralFlexOptions(
+        def flexOptions = new EnergyBoundariesFlexOptions(
                 receiver,
                 senderUuid,
                 "general flex type",