fixed bug for multiple quantities

Author: gtarres

rosetta-source/src/main/rosetta/product-common-settlement-func.rosetta

@@ -25,11 +25,11 @@ func UpdateAmountForEachMatchingQuantity: <"Updates any price or quantity from t
                                         direction
                                     ),
                     quantity: priceQuantity -> quantity
-                            extract
-                                UpdateQuantityAmountForEachMatchingQuantity(
+                        extract
+                            UpdateQuantityAmountForEachMatchingQuantity(
                                         item,
                                         change, // FilterChangePriceQuantity(priceQuantity, change),
-                                                // PriceQuantity used as input to keep the quantity and effectiveDate linked
+                                        // PriceQuantity used as input to keep the quantity and effectiveDate linked
                                         direction
                                     ),
                     observable: priceQuantity -> observable,
@@ -85,24 +85,32 @@ func UpdateQuantityAmountForEachMatchingQuantity: <"Updates any quantity from th
             [metadata location]
 
     alias changeMatching:
-        change
-         filter UnitEquals(item -> quantity first -> unit, quantity -> unit)
+        SplitQuantityChange(change)
+            filter UnitEquals(item -> quantity only-element -> unit, quantity -> unit)
             then first
 
     alias changedAmount:
-        UpdateAmount(quantity -> value, changeMatching -> quantity only-element -> value, direction)
+        UpdateAmount(
+                quantity -> value,
+                changeMatching -> quantity only-element -> value,
+                direction
+            )
 
     alias changeEffectiveDate:
         AdjustableDateResolution(changeMatching -> effectiveDate -> adjustableDate)
-        //ResolveAdjustableDate(changeMatching -> effectiveDate)
-        // TODO uncomment usage once function is available
-
+    // ResolveAdjustableDate(changeMatching -> effectiveDate)
+    // TODO uncomment usage once function is available
     alias changedDatedValue:
-        UpdateDatedValues(quantity -> datedValue, changeMatching -> quantity only-element -> value, direction,  changeEffectiveDate)
+        UpdateDatedValues(
+                quantity -> datedValue,
+                changeMatching -> quantity only-element -> value,
+                direction,
+                changeEffectiveDate
+            )
 
     set updatedQuantity: quantity
     set updatedQuantity -> value: changedAmount default quantity -> value
-    set updatedQuantity -> datedValue : changedDatedValue  default quantity -> datedValue
+    set updatedQuantity -> datedValue: changedDatedValue default quantity -> datedValue
 
 func PriceUnitEquals: <"Compares two PriceSchedule to check if all attributes match, except for the amount.">
     inputs:
@@ -125,3 +133,22 @@ func PriceUnitEquals: <"Compares two PriceSchedule to check if all attributes ma
 
     set result:
         unitMatches and perUnitOfMatches and priceTypeMatches and priceExpressionMatches and arithmeticOperatorMatches
+
+func SplitQuantityChange: <"Splits a PriceQuantity list into separate elements, each containing a single quantity and its corresponding effective date, if multiple quantities exist.">
+    inputs:
+        changeList PriceQuantity (1..*) <"Original PriceQuantity list where each of them may contain multiple quantities.">
+    output:
+        splitChange PriceQuantity (1..*) <"New list of PriceQuantity where each of them contain a single quantity.">
+
+    set splitChange: <"Iterates through the original PriceQuantity list and the quantity list.">
+        changeList
+            extract change [
+                change -> quantity
+                    extract quantity [
+                        PriceQuantity {
+                            quantity: quantity,
+                            effectiveDate: change -> effectiveDate,
+                            ...
+                        }
+                    ]
+            ] then flatten