fix(core): retrieving of the value type of an attribute in partial at…

…tribute updates
stellio-hub · Jul 19, 2023 · 70a4bdb · 70a4bdb
1 parent 012a43d
commit 70a4bdb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...-service/src/main/kotlin/com/egm/stellio/search/service/TemporalEntityAttributeService.kt b/...-service/src/main/kotlin/com/egm/stellio/search/service/TemporalEntityAttributeService.kt
@@ -648,7 +648,7 @@ class TemporalEntityAttributeService(
                 val tea = getForEntityAndAttribute(entityId, attributeName, datasetId).bind()
                 val (jsonTargetObject, updatedAttributeInstance) = mergeAttributePayload(tea, attributeValues)
                 val value = getValueFromPartialAttributePayload(tea, updatedAttributeInstance)
-                val attributeValueType = guessAttributeValueType(tea.attributeType, attributeValues.getValue())
+                val attributeValueType = guessAttributeValueType(tea.attributeType, attributeValues)
                 updateOnUpdate(tea.id, attributeValueType, modifiedAt, jsonTargetObject.toString()).bind()
 
                 // then update attribute instance

diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/util/AttributeInstanceUtils.kt b/search-service/src/main/kotlin/com/egm/stellio/search/util/AttributeInstanceUtils.kt
@@ -8,6 +8,7 @@ import com.egm.stellio.search.model.AttributeMetadata
 import com.egm.stellio.search.model.TemporalEntityAttribute
 import com.egm.stellio.search.model.TemporalEntityAttribute.AttributeValueType
 import com.egm.stellio.shared.model.*
+import com.egm.stellio.shared.util.ExpandedAttributeInstance
 import com.egm.stellio.shared.util.JsonLdUtils.logger
 import com.egm.stellio.shared.util.JsonUtils.serializeObject
 import java.net.URI
@@ -79,10 +80,11 @@ fun NgsiLdAttributeInstance.toTemporalAttributeMetadata(): Either<APIException,
 
 fun guessAttributeValueType(
     attributeType: TemporalEntityAttribute.AttributeType,
-    value: Any
+    expandedAttributeInstance: ExpandedAttributeInstance
 ): AttributeValueType =
     when (attributeType) {
-        TemporalEntityAttribute.AttributeType.Property -> guessPropertyValueType(value).first
+        TemporalEntityAttribute.AttributeType.Property ->
+            guessPropertyValueType(expandedAttributeInstance.getPropertyValue()).first
         TemporalEntityAttribute.AttributeType.Relationship -> AttributeValueType.URI
         TemporalEntityAttribute.AttributeType.GeoProperty -> AttributeValueType.GEOMETRY
     }

diff --git a/shared/src/main/kotlin/com/egm/stellio/shared/model/NgsiLdEntity.kt b/shared/src/main/kotlin/com/egm/stellio/shared/model/NgsiLdEntity.kt
@@ -11,7 +11,6 @@ import arrow.fx.coroutines.parMap
 import com.egm.stellio.shared.util.*
 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.JSONLD_VALUE
 import com.egm.stellio.shared.util.JsonLdUtils.JSONLD_VALUE_KW
 import com.egm.stellio.shared.util.JsonLdUtils.NGSILD_CREATED_AT_PROPERTY
 import com.egm.stellio.shared.util.JsonLdUtils.NGSILD_DATASET_ID_PROPERTY
@@ -389,8 +388,8 @@ suspend fun JsonLdEntity.toNgsiLdEntity(): Either<APIException, NgsiLdEntity> =
 fun ExpandedAttributeInstance.getDatasetId(): URI? =
     (this[NGSILD_DATASET_ID_PROPERTY]?.get(0) as? Map<String, String>)?.get(JSONLD_ID)?.toUri()
 
-fun ExpandedAttributeInstance.getValue(): Any =
-    (this[NGSILD_PROPERTY_VALUE]!![0] as Map<String, Any>)[JSONLD_VALUE]!!
+fun ExpandedAttributeInstance.getPropertyValue(): Any =
+    (this[NGSILD_PROPERTY_VALUE]!![0] as Map<String, Any>)[JSONLD_VALUE_KW]!!
 
 fun List<NgsiLdAttribute>.flatOnInstances(): List<Pair<NgsiLdAttribute, NgsiLdAttributeInstance>> =
     this.flatMap { ngsiLdAttribute ->