From 074dfe19708887ddcf18403169b9dbb997a2d86d Mon Sep 17 00:00:00 2001
From: ranim-n <ranim.naimi@egm.io>
Date: Tue, 17 Dec 2024 09:30:25 +0100
Subject: [PATCH] fix: attributes and sub-attributes naming in aggregation

---
 .../egm/io/nifi/processors/ckan/utils/CKANAggregator.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/utils/CKANAggregator.java b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/utils/CKANAggregator.java
index df98365..f59d563 100644
--- a/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/utils/CKANAggregator.java
+++ b/nifi-ngsild-ckan-processors/src/main/java/egm/io/nifi/processors/ckan/utils/CKANAggregator.java
@@ -322,7 +322,7 @@ public static LinkedHashMap<String, ArrayList<JsonElement>> cropLinkedHashMap(Li
 
     public void aggregateInitialAttributes(String attributePrefix, ArrayList<AttributesLD> attributes, LinkedHashMap<String, ArrayList<JsonElement>> aggregation ) {
         for (AttributesLD attribute : attributes) {
-            String attrName = (attributePrefix.isEmpty() ? attribute.getAttrName() : attributePrefix + "_") + attribute.getAttrName();
+            String attrName = (attributePrefix.isEmpty() ? attributePrefix : attributePrefix + "_") + attribute.getAttrName();
             aggregation.put(attrName, new ArrayList<>());
             aggregation.put(attrName + NGSIConstants.AUTOGENERATED_ATTR_TYPE, new ArrayList<>());
             if (attribute.isHasSubAttrs()) {
@@ -333,7 +333,7 @@ public void aggregateInitialAttributes(String attributePrefix, ArrayList<Attribu
 
     public void aggregateAttributeValues(String attributePrefix, ArrayList<AttributesLD> attributes, LinkedHashMap<String, ArrayList<JsonElement>> aggregation) {
         for (AttributesLD attribute : attributes) {
-            String attrName = (attributePrefix.isEmpty() ? attribute.getAttrName() : attributePrefix + "_") + attribute.getAttrName();
+            String attrName = (attributePrefix.isEmpty() ? attributePrefix : attributePrefix + "_") + attribute.getAttrName();
             String attrType = attribute.getAttrType();
             JsonElement attrValue = new JsonPrimitive(attribute.getAttrValue());
             if (aggregation.containsKey(attrName)) {