Merge pull request #2357 from telefonicaid/fix/event_multiple_delete_…

…lastdatadelete Fix/event multiple delete lastdatadelete
telefonicaid · Mar 8, 2024 · ad238b7 · ad238b7
2 parents 93f11cb + 4003e46
commit ad238b7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -1 +1,2 @@
+- [cygnus-ngsi][ColumnAggregator] Fix lastdata when remove multiple entities by alterationType with entityDelete
 - [cygnus-ngsi][ColumnAggregator][LastData] Fix error when remove old values in lastData which does not exist (i.e. creating and updating entities)
diff --git a/...ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java b/...ngsi/src/main/java/com/telefonica/iot/cygnus/aggregation/NGSIGenericColumnAggregator.java
@@ -266,11 +266,20 @@ public void aggregate(NGSIEvent event) {
                 setLastDataTimestamp(currentTS);
                 for (String key : aggregation.keySet()) {
                     ArrayList<JsonElement> valueLastData = new ArrayList<>();
-                    if (lastData.containsKey(key)) {
-                        valueLastData = lastData.get(key);
-                    } else if (!lastData.containsKey(key)){
-                        valueLastData = new ArrayList<JsonElement>(Collections.nCopies(numPreviousValues, null));
+                    if (lastDataEntityDelete) {
+                        if (lastDataDelete.containsKey(key)) {
+                            valueLastData = lastDataDelete.get(key);
+                        } else if (!lastDataDelete.containsKey(key)){
+                            valueLastData = new ArrayList<JsonElement>(Collections.nCopies(numPreviousValues, null));
+                        }
+                    } else {
+                        if (lastData.containsKey(key)) {
+                            valueLastData = lastData.get(key);
+                        } else if (!lastData.containsKey(key)) {
+                            valueLastData = new ArrayList<JsonElement>(Collections.nCopies(numPreviousValues, null));
+                        }
                     }
+
                     valueLastData.add(aggregation.get(key).get(aggregation.get(key).size() - 1));
                     if (lastDataEntityDelete) {
                         lastDataDelete.put(key, valueLastData);