From 0f767af794df928a704e30c564de21a7b9774b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 29 Aug 2024 17:07:53 +0200 Subject: [PATCH 1/2] fix: Create link *Value property if it is not present on current class --- .../knora/webapi/responders/v2/OntologyResponderV2.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index a48c0320e9..9c6ca54496 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -15,7 +15,6 @@ import zio.prelude.Validation import java.time.Instant import scala.collection.immutable - import dsp.constants.SalsahGui import dsp.errors.* import org.knora.webapi.* @@ -1178,13 +1177,18 @@ final case class OntologyResponderV2( } allBaseClassIris = internalClassIri +: allBaseClassIrisWithoutInternal + existingLinkPropsToKeep: Set[SmartIri] = + existingReadClassInfo.entityInfoContent.directCardinalities.keySet + .flatMap(p => cacheData.ontologies(p.getOntologyFromEntity).properties.get(p)) + .filter(_.isLinkProp) + .map(_.entityInfoContent.propertyIri) cardinalityCheckResult <- OntologyHelpers .checkCardinalitiesBeforeAddingAndIfNecessaryAddLinkValueProperties( internalClassDef = newInternalClassDef, allBaseClassIris = allBaseClassIris.toSet, cacheData = cacheData, - existingLinkPropsToKeep = existingReadClassInfo.linkProperties, + existingLinkPropsToKeep = existingLinkPropsToKeep, ) .toZIO (newInternalClassDefWithLinkValueProps, cardinalitiesForClassWithInheritance) = cardinalityCheckResult From 1e546287950a1bc5907e676073cc2ea0abfc2eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Thu, 29 Aug 2024 17:23:50 +0200 Subject: [PATCH 2/2] fmt --- .../org/knora/webapi/responders/v2/OntologyResponderV2.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala index 9c6ca54496..90359da8a3 100644 --- a/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala +++ b/webapi/src/main/scala/org/knora/webapi/responders/v2/OntologyResponderV2.scala @@ -15,6 +15,7 @@ import zio.prelude.Validation import java.time.Instant import scala.collection.immutable + import dsp.constants.SalsahGui import dsp.errors.* import org.knora.webapi.*