fix(api-v2): Cache base class IRIs correctly when creating/updating c…

…lass (#1311) Fixes #1310.
dasch-swiss · Apr 30, 2019 · db8b938 · db8b938
1 parent 20736f7
commit db8b938
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 50 deletions.
diff --git a/...pi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala b/...pi/messages/v2/responder/ontologymessages/KnoraBaseToApiV2SimpleTransformationRules.scala
@@ -627,7 +627,8 @@ object KnoraBaseToApiV2SimpleTransformationRules extends OntologyTransformationR
                     iri: IRI => iri.toSmartIri
                 },
                 ontologySchema = ApiV2Simple
-            )
+            ),
+            allBaseClasses = subClassOf.map(_.toSmartIri).toSet + datatypeIri.toSmartIri
         )
     }
 }
diff --git a/...in/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala b/...in/scala/org/knora/webapi/messages/v2/responder/ontologymessages/OntologyMessagesV2.scala
@@ -2077,7 +2077,7 @@ sealed trait ReadEntityInfoV2 {
   * @param fileValueProperties     a [[Set]] of IRIs of properties in `allCardinalities` that point to `FileValue` objects.
   */
 case class ReadClassInfoV2(entityInfoContent: ClassInfoContentV2,
-                           allBaseClasses: Set[SmartIri] = Set.empty[SmartIri],
+                           allBaseClasses: Set[SmartIri],
                            isResourceClass: Boolean = false,
                            isStandoffClass: Boolean = false,
                            isValueClass: Boolean = false,

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
@@ -1906,6 +1906,7 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon
 
                 readClassInfo = ReadClassInfoV2(
                     entityInfoContent = unescapedClassDefWithLinkValueProps,
+                    allBaseClasses = allBaseClassIris,
                     isResourceClass = true,
                     canBeInstantiated = true,
                     inheritedCardinalities = inheritedCardinalities,
@@ -2269,6 +2270,7 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon
 
                 readClassInfo = ReadClassInfoV2(
                     entityInfoContent = newInternalClassDefWithLinkValueProps,
+                    allBaseClasses = allBaseClassIris,
                     isResourceClass = true,
                     canBeInstantiated = true,
                     inheritedCardinalities = inheritedCardinalities,
@@ -2433,6 +2435,7 @@ class OntologyResponderV2(responderData: ResponderData) extends Responder(respon
 
                 readClassInfo = ReadClassInfoV2(
                     entityInfoContent = newInternalClassDefWithLinkValueProps,
+                    allBaseClasses = allBaseClassIris,
                     isResourceClass = true,
                     canBeInstantiated = true,
                     inheritedCardinalities = inheritedCardinalities,