fix(core): id can optionally be included in Entity Fragments

TODO: to be checked in other similar endpoints (Replace Entity, ...)
stellio-hub · Dec 14, 2024 · 807172e · 807172e
1 parent 1456303
commit 807172e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/entity/service/EntityService.kt b/search-service/src/main/kotlin/com/egm/stellio/search/entity/service/EntityService.kt
@@ -40,6 +40,7 @@ import com.egm.stellio.shared.model.addSysAttrs
 import com.egm.stellio.shared.model.toExpandedAttributes
 import com.egm.stellio.shared.model.toNgsiLdAttributes
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_EXPANDED_ENTITY_SPECIFIC_MEMBERS
+import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_ID
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_TYPE
 import com.egm.stellio.shared.util.JsonLdUtils.NGSILD_SCOPE_PROPERTY
 import com.egm.stellio.shared.util.JsonUtils.serializeObject
@@ -150,7 +151,10 @@ class EntityService(
         authorizationService.userCanUpdateEntity(entityId, sub.toOption()).bind()
 
         val (coreAttrs, otherAttrs) =
-            expandedAttributes.toList().partition { JSONLD_EXPANDED_ENTITY_SPECIFIC_MEMBERS.contains(it.first) }
+            expandedAttributes.toList()
+                // remove @id if it is present (optional as per 5.4)
+                .filter { it.first != JSONLD_ID }
+                .partition { JSONLD_EXPANDED_ENTITY_SPECIFIC_MEMBERS.contains(it.first) }
         val mergedAt = ngsiLdDateTime()
         logger.debug("Merging entity {}", entityId)