Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(ontology): DSP-API creates wrong partOfValue property (DEV-216) #1978

Merged
merged 6 commits into from Jan 14, 2022
Merged

fix(ontology): DSP-API creates wrong partOfValue property (DEV-216) #1978

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1082982
Create test for partOf property
Jan 12, 2022
bb650b5
add partOfValue to the creation of value properties
Jan 12, 2022
0ba31af
Merge branch 'main' into wip/dev-216-create-part-of-value-when-creati…
Jan 13, 2022
da427dc
remove unused code
Jan 14, 2022
66b5247
add documentation about partOf and seqnum
Jan 14, 2022
5091a66
rename test description
Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala
View file
Open in desktop
Expand Up @@ -215,6 +215,8 @@ object OntologyConstants {
val LinkObj: IRI = KnoraBasePrefixExpansion + "LinkObj"
val HasLinkTo: IRI = KnoraBasePrefixExpansion + "hasLinkTo"
val HasLinkToValue: IRI = KnoraBasePrefixExpansion + "hasLinkToValue"
val IsPartOf: IRI = KnoraBasePrefixExpansion + "isPartOf"
val IsPartOfValue: IRI = KnoraBasePrefixExpansion + "isPartOfValue"
val Region: IRI = KnoraBasePrefixExpansion + "Region"
val IsRegionOf: IRI = KnoraBasePrefixExpansion + "isRegionOf"

Expand Down
10 changes: 9 additions & 1 deletion webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpers.scala
View file
Open in desktop
Expand Up @@ -1950,10 +1950,18 @@ object OntologyHelpers {
objects = Seq(SmartIriLiteralV2(OntologyConstants.KnoraBase.LinkValue.toSmartIri))
))

val subPropertyOf: SmartIri = internalPropertyDef.subPropertyOf match {
case subProps if subProps.contains(OntologyConstants.KnoraBase.IsPartOf.toSmartIri) =>
OntologyConstants.KnoraBase.IsPartOfValue.toSmartIri
case subProps if subProps.contains(OntologyConstants.KnoraBase.HasLinkTo.toSmartIri) =>
OntologyConstants.KnoraBase.HasLinkToValue.toSmartIri
case _ => OntologyConstants.KnoraBase.HasLinkToValue.toSmartIri
}

internalPropertyDef.copy(
propertyIri = linkValuePropIri,
predicates = newPredicates,
subPropertyOf = Set(OntologyConstants.KnoraBase.HasLinkToValue.toSmartIri)
subPropertyOf = Set(subPropertyOf)
)
}

Expand Down
215 changes: 215 additions & 0 deletions webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala
View file
Open in desktop
Expand Up @@ -2366,6 +2366,221 @@ class OntologyResponderV2Spec extends CoreSpec() with ImplicitSender {
}
}

"create a classes anything:wholeThing and anything:partThing with a isPartOf relation" in {

// Create class partThing

val partThingClassIri = AnythingOntologyIri.makeEntityIri("partThing")

val partThingClassInfoContent = ClassInfoContentV2(
classIri = partThingClassIri,
predicates = Map(
OntologyConstants.Rdf.Type.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdf.Type.toSmartIri,
objects = Seq(SmartIriLiteralV2(OntologyConstants.Owl.Class.toSmartIri))
),
OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Label.toSmartIri,
objects = Seq(StringLiteralV2("Thing as a whole", Some("en")))
),
OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri,
objects = Seq(StringLiteralV2("A thing that has multiple parts", Some("en")))
)
),
subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri),
ontologySchema = ApiV2Complex
)

responderManager ! CreateClassRequestV2(
classInfoContent = partThingClassInfoContent,
lastModificationDate = anythingLastModDate,
apiRequestID = UUID.randomUUID,
featureFactoryConfig = defaultFeatureFactoryConfig,
requestingUser = anythingAdminUser
)

expectMsgPF(timeout) { case msg: ReadOntologyV2 =>
val externalOntology = msg.toOntologySchema(ApiV2Complex)
val metadata = externalOntology.ontologyMetadata
val newAnythingLastModDate = metadata.lastModificationDate.getOrElse(
throw AssertionException(s"${metadata.ontologyIri} has no last modification date")
)
anythingLastModDate = newAnythingLastModDate
}

// Create class wholeThing

val wholeThingClassIri = AnythingOntologyIri.makeEntityIri("wholeThing")

val wholeThingClassInfoContent = ClassInfoContentV2(
classIri = wholeThingClassIri,
predicates = Map(
OntologyConstants.Rdf.Type.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdf.Type.toSmartIri,
objects = Seq(SmartIriLiteralV2(OntologyConstants.Owl.Class.toSmartIri))
),
OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Label.toSmartIri,
objects = Seq(StringLiteralV2("Thing as a whole", Some("en")))
),
OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri,
objects = Seq(StringLiteralV2("A thing that has multiple parts", Some("en")))
)
),
subClassOf = Set(OntologyConstants.KnoraApiV2Complex.Resource.toSmartIri),
ontologySchema = ApiV2Complex
)

responderManager ! CreateClassRequestV2(
classInfoContent = wholeThingClassInfoContent,
lastModificationDate = anythingLastModDate,
apiRequestID = UUID.randomUUID,
featureFactoryConfig = defaultFeatureFactoryConfig,
requestingUser = anythingAdminUser
)

expectMsgPF(timeout) { case msg: ReadOntologyV2 =>
val externalOntology = msg.toOntologySchema(ApiV2Complex)
val metadata = externalOntology.ontologyMetadata
val newAnythingLastModDate = metadata.lastModificationDate.getOrElse(
throw AssertionException(s"${metadata.ontologyIri} has no last modification date")
)
anythingLastModDate = newAnythingLastModDate
}

// Create property partOf with subject partThing and object wholeThing

val partOfPropertyIri = AnythingOntologyIri.makeEntityIri("partOf")

val partOfPropertyInfoContent = PropertyInfoContentV2(
propertyIri = partOfPropertyIri,
predicates = Map(
OntologyConstants.Rdf.Type.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdf.Type.toSmartIri,
objects = Seq(SmartIriLiteralV2(OntologyConstants.Owl.ObjectProperty.toSmartIri))
),
OntologyConstants.KnoraApiV2Complex.SubjectType.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.KnoraApiV2Complex.SubjectType.toSmartIri,
objects = Seq(SmartIriLiteralV2(AnythingOntologyIri.makeEntityIri("partThing")))
),
OntologyConstants.KnoraApiV2Complex.ObjectType.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.KnoraApiV2Complex.ObjectType.toSmartIri,
objects = Seq(SmartIriLiteralV2(AnythingOntologyIri.makeEntityIri("wholeThing")))
),
OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Label.toSmartIri,
objects = Seq(
StringLiteralV2("is part of", Some("en")),
StringLiteralV2("ist Teil von", Some("de"))
)
),
OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri,
objects = Seq(
StringLiteralV2("Represents a part of a whole relation", Some("en")),
StringLiteralV2("Repräsentiert eine Teil-Ganzes-Beziehung", Some("de"))
)
),
OntologyConstants.SalsahGuiApiV2WithValueObjects.GuiElementProp.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.SalsahGuiApiV2WithValueObjects.GuiElementProp.toSmartIri,
objects = Seq(SmartIriLiteralV2("http://api.knora.org/ontology/salsah-gui/v2#Searchbox".toSmartIri))
)
),
subPropertyOf = Set(OntologyConstants.KnoraBase.IsPartOf.toSmartIri),
ontologySchema = ApiV2Complex
)

responderManager ! CreatePropertyRequestV2(
propertyInfoContent = partOfPropertyInfoContent,
lastModificationDate = anythingLastModDate,
apiRequestID = UUID.randomUUID,
featureFactoryConfig = defaultFeatureFactoryConfig,
requestingUser = anythingAdminUser
)

expectMsgPF(timeout) { case msg: ReadOntologyV2 =>
val externalOntology = msg.toOntologySchema(ApiV2Complex)
assert(externalOntology.properties.size == 1)
val property = externalOntology.properties(partOfPropertyIri)
//property.entityInfoContent should ===(partOfPropertyInfoContent)
// check that partOf is a subproperty of knora-api:isPartOf
property.entityInfoContent.subPropertyOf.contains(
OntologyConstants.KnoraApiV2Complex.IsPartOf.toSmartIri
) should ===(true)
val metadata = externalOntology.ontologyMetadata
val newAnythingLastModDate = metadata.lastModificationDate.getOrElse(
throw AssertionException(s"${metadata.ontologyIri} has no last modification date")
)
assert(newAnythingLastModDate.isAfter(anythingLastModDate))
anythingLastModDate = newAnythingLastModDate
}

// Check that the corresponding partOfValue was created
val partOfValuePropertyIri = AnythingOntologyIri.makeEntityIri("partOfValue")

val partOfValuePropertyInfoContent = partOfPropertyInfoContent.copy(
propertyIri = partOfValuePropertyIri,
predicates = Map(
OntologyConstants.Rdf.Type.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdf.Type.toSmartIri,
objects = Seq(SmartIriLiteralV2(OntologyConstants.Owl.ObjectProperty.toSmartIri))
),
OntologyConstants.KnoraApiV2Complex.SubjectType.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.KnoraApiV2Complex.SubjectType.toSmartIri,
objects = Seq(SmartIriLiteralV2(AnythingOntologyIri.makeEntityIri("partThing")))
),
OntologyConstants.KnoraApiV2Complex.ObjectType.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.KnoraApiV2Complex.ObjectType.toSmartIri,
objects = Seq(SmartIriLiteralV2(OntologyConstants.KnoraApiV2Complex.LinkValue.toSmartIri))
),
OntologyConstants.Rdfs.Label.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Label.toSmartIri,
objects = Seq(
StringLiteralV2("is part of", Some("en")),
StringLiteralV2("ist Teil von", Some("de"))
)
),
OntologyConstants.Rdfs.Comment.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.Rdfs.Comment.toSmartIri,
objects = Seq(
StringLiteralV2("Represents a part of a whole relation", Some("en")),
StringLiteralV2("Repräsentiert eine Teil-Ganzes-Beziehung", Some("de"))
)
),
OntologyConstants.SalsahGuiApiV2WithValueObjects.GuiElementProp.toSmartIri -> PredicateInfoV2(
predicateIri = OntologyConstants.SalsahGuiApiV2WithValueObjects.GuiElementProp.toSmartIri,
objects = Seq(SmartIriLiteralV2("http://api.knora.org/ontology/salsah-gui/v2#Searchbox".toSmartIri))
)
),
subPropertyOf = Set(OntologyConstants.KnoraBase.IsPartOfValue.toSmartIri)
)

val partOfValuePropGetRequest = PropertiesGetRequestV2(
propertyIris = Set(partOfValuePropertyIri),
allLanguages = true,
requestingUser = anythingAdminUser
)

responderManager ! partOfValuePropGetRequest

expectMsgPF(timeout) { case msg: ReadOntologyV2 =>
irinaschubert marked this conversation as resolved.
Show resolved Hide resolved
val externalOntology = msg.toOntologySchema(ApiV2Complex)
assert(externalOntology.properties.size == 1)
val property = externalOntology.properties(partOfValuePropertyIri)
//property.entityInfoContent should ===(partOfValuePropertyInfoContent)
property.entityInfoContent.subPropertyOf.contains(
OntologyConstants.KnoraApiV2Complex.IsPartOfValue.toSmartIri
) should ===(true)
val metadata = externalOntology.ontologyMetadata
val newAnythingLastModDate = metadata.lastModificationDate.getOrElse(
throw AssertionException(s"${metadata.ontologyIri} has no last modification date")
)
anythingLastModDate = newAnythingLastModDate
}
}

"change the metadata of the 'anything' ontology" in {
val newLabel = "The modified anything ontology"

Expand Down