fix: fail fast for LdContextNotAvailableException errors in batch ope…

…rations
stellio-hub · Nov 30, 2023 · 1dadb88 · 1dadb88
1 parent c5d7e60
commit 1dadb88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/search-service/src/main/kotlin/com/egm/stellio/search/web/EntityOperationHandler.kt b/search-service/src/main/kotlin/com/egm/stellio/search/web/EntityOperationHandler.kt
@@ -56,7 +56,7 @@ class EntityOperationHandler(
         checkContext(httpHeaders, body).bind()
         val context = getContextFromLinkHeader(httpHeaders.getOrEmpty(HttpHeaders.LINK)).bind()
         val (parsedEntities, unparsableEntities) =
-            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType)
+            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType).bind()
         val (existingEntities, newEntities) = entityOperationService.splitEntitiesByExistence(parsedEntities)
         val (unauthorizedEntities, authorizedEntities) = newEntities.partition {
             authorizationService.userCanCreateEntities(sub).isLeft()
@@ -97,7 +97,7 @@ class EntityOperationHandler(
         val context = getContextFromLinkHeader(httpHeaders.getOrEmpty(HttpHeaders.LINK)).bind()
 
         val (parsedEntities, unparsableEntities) =
-            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType)
+            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType).bind()
         val (existingEntities, newEntities) = entityOperationService.splitEntitiesByExistence(parsedEntities)
 
         val (newUnauthorizedEntities, newAuthorizedEntities) = newEntities.partition {
@@ -163,7 +163,7 @@ class EntityOperationHandler(
         val disallowOverwrite = options.map { it == QUERY_PARAM_OPTIONS_NOOVERWRITE_VALUE }.orElse(false)
 
         val (parsedEntities, unparsableEntities) =
-            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType)
+            expandAndPrepareBatchOfEntities(body, context, httpHeaders.contentType).bind()
         val (existingEntities, newEntities) = entityOperationService.splitEntitiesByExistence(parsedEntities)
 
         val (existingEntitiesUnauthorized, existingEntitiesAuthorized) =
@@ -304,7 +304,7 @@ class EntityOperationHandler(
         payload: List<Map<String, Any>>,
         context: String?,
         contentType: MediaType?
-    ): BatchEntityPreparation =
+    ): Either<APIException, BatchEntityPreparation> =
         payload.map {
             val jsonLdExpansionResult =
                 if (contentType == JSON_LD_MEDIA_TYPE)
@@ -323,6 +323,10 @@ class EntityOperationHandler(
                 is Either.Left -> acc.copy(errors = acc.errors.plus(entry.value))
                 is Either.Right -> acc.copy(success = acc.success.plus(entry.value))
             }
+        }.let { batchEntityPreparation ->
+            // fail fast for LdContextNotAvailableException errors
+            batchEntityPreparation.errors.find { it.second is LdContextNotAvailableException }?.second?.left()
+                ?: batchEntityPreparation.right()
         }
 
     private suspend fun doBatchCreation(

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
@@ -145,7 +145,8 @@ object JsonLdUtils {
         }.fold({
             JsonLdEntity(it, contexts).right()
         }, {
-            it.toAPIException().left()
+            if (it is APIException) it.left()
+            else it.toAPIException().left()
         })
 
     suspend fun expandJsonLdEntityF(input: Map<String, Any>): Either<APIException, JsonLdEntity> =