fix: force attributes compaction before being extracted #393

stellio-hub · May 7, 2021 · 22730f9 · 22730f9
1 parent e573206
commit 22730f9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/shared/src/main/kotlin/com/egm/stellio/shared/util/JsonLdUtils.kt b/shared/src/main/kotlin/com/egm/stellio/shared/util/JsonLdUtils.kt
@@ -525,8 +525,10 @@ fun extractAttributeInstanceFromCompactedEntity(
     attributeName: String,
     datasetId: URI?
 ): CompactedJsonLdAttribute {
-    return if (compactedJsonLdEntity[attributeName] is List<*>) {
-        val attributePayload = compactedJsonLdEntity[attributeName] as List<CompactedJsonLdAttribute>
+    // Since some attributes cannot be well compacted, to be improved later
+    val compactedAttributeName = attributeName.extractShortTypeFromExpanded()
+    return if (compactedJsonLdEntity[compactedAttributeName] is List<*>) {
+        val attributePayload = compactedJsonLdEntity[compactedAttributeName] as List<CompactedJsonLdAttribute>
         attributePayload.first { it["datasetId"] as String? == datasetId?.toString() }
-    } else compactedJsonLdEntity[attributeName]!! as CompactedJsonLdAttribute
+    } else compactedJsonLdEntity[compactedAttributeName]!! as CompactedJsonLdAttribute
 }