Merge pull request #44 from easy-global-market/Add-datasetId-to-flatt…

…ened-export Add dataset id to flattened export
easy-global-market · Oct 18, 2024 · 9112077 · 9112077
2 parents 07c4f37 + cf929a4
commit 9112077
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/...ld-postgresql-processors/src/main/java/egm/io/nifi/processors/ngsild/utils/NGSIUtils.java b/...ld-postgresql-processors/src/main/java/egm/io/nifi/processors/ngsild/utils/NGSIUtils.java
@@ -150,6 +150,13 @@ private Attribute parseNgsiLdAttribute(String key, JSONObject value, boolean fla
                 "parametername", "Property", "", "", "", "", key.toLowerCase(), false, null
             );
             subAttributes.add(parameterName);
+            if (Objects.equals(datasetId, "")){
+                datasetId = "default";
+            }
+            Attribute parameterDatasetId = new Attribute(
+                "datasetid", "Property", "", "", "", "", datasetId.toLowerCase(), false, null
+            );
+            subAttributes.add(parameterDatasetId);
             return new Attribute(GENERIC_MEASURE, attrType, "", observedAt, createdAt, modifiedAt, attrValue, true, subAttributes);
         } else {
             return new Attribute(key.toLowerCase(), attrType, datasetId, observedAt, createdAt, modifiedAt, attrValue, !subAttributes.isEmpty(), subAttributes);

diff --git a/...tgresql-processors/src/test/java/egm/io/nifi/processors/ngsild/TestPostgreSQLBackend.java b/...tgresql-processors/src/test/java/egm/io/nifi/processors/ngsild/TestPostgreSQLBackend.java
@@ -37,12 +37,13 @@ public void testListOfFieldsWithFlattenedObservations() throws IOException {
 
         Map<String, NGSIConstants.POSTGRESQL_COLUMN_TYPES> typedFields =
             postgreSQLBackend.listOfFields(entity, "urn:ngsi-ld:Dataset:", false, Collections.emptySet());
-        assertEquals(26, typedFields.size());
+        assertEquals(27, typedFields.size());
         Set<String> keys = typedFields.keySet();
         assertTrue(keys.contains(GENERIC_MEASURE));
         assertTrue(keys.contains(GENERIC_MEASURE + "_observedat"));
         assertTrue(keys.contains(GENERIC_MEASURE + "_unitcode"));
         assertTrue(keys.contains(GENERIC_MEASURE + "_parametername"));
+        assertTrue(keys.contains(GENERIC_MEASURE + "_datasetid"));
     }
 
     @ParameterizedTest

diff --git a/...ostgresql-processors/src/test/java/egm/io/nifi/processors/ngsild/utils/TestNGSIUtils.java b/...ostgresql-processors/src/test/java/egm/io/nifi/processors/ngsild/utils/TestNGSIUtils.java
@@ -68,10 +68,10 @@ public void testEntityWithFlattenObservations() throws IOException {
         // the entity under test has four observations
         assertEquals(4, measureAttributes.size());
         Attribute measureAttribute = measureAttributes.get(0);
-        // each observation should have two sub-attributes: parametername and unitcode
-        assertEquals(2, measureAttribute.subAttrs.size());
+        // each observation should have three sub-attributes: parametername, unitcode and datasetId
+        assertEquals(3, measureAttribute.subAttrs.size());
         assertTrue(measureAttribute.subAttrs.stream().allMatch(attribute ->
-            attribute.getAttrName().equals("parametername") || attribute.getAttrName().equals("unitcode")
+            attribute.getAttrName().equals("parametername") || attribute.getAttrName().equals("unitcode") || attribute.getAttrName().equals("datasetid")
         ));
     }
 }