Adapt parsing of an ontology's lastModificationDate

.travis.yml

@@ -48,4 +48,4 @@ script:
   - yarn webdriver-update
   - yarn e2e
   - yarn build
-  - docker build .
+  - docker build .

src/models/v2/custom-converters/date-time-stamp-converter.ts

@@ -3,7 +3,7 @@ import { Constants } from "../Constants";
 import { CustomConverterUtils } from "../../../util/utils";
 
 @JsonConverter
-export class DateTimeStamp implements JsonCustomConvert<string> {
+export class DateTimeStampConverter implements JsonCustomConvert<string> {
     serialize(dateTimeStamp: string): any {
         return {
             "@type": Constants.dateTimeStamp,

src/models/v2/ontologies/ontology-metadata.ts

@@ -1,5 +1,6 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { Constants } from "../Constants";
+import { DateTimeStampConverter } from "../custom-converters/date-time-stamp-converter";
 import { IdConverter } from "../custom-converters/id-converter";
 
 @JsonObject("OntologyMetadata")
@@ -14,8 +15,8 @@ export class OntologyMetadata {
     @JsonProperty(Constants.Label, String)
     label: string = "";
 
-    @JsonProperty(Constants.LastModificationDate, String, true)
-    lastModificationDate?: string = undefined; // TODO: adapt this once this is serialized as an object, see https://github.com/dhlab-basel/Knora/issues/1439
+    @JsonProperty(Constants.LastModificationDate, DateTimeStampConverter, true)
+    lastModificationDate?: string = undefined;
 
     @JsonProperty(Constants.AttachedToProject, IdConverter)
     attachedToProject: string = "";

src/models/v2/ontologies/read-ontology.ts

@@ -1,5 +1,6 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { Constants } from "../Constants";
+import { DateTimeStampConverter } from "../custom-converters/date-time-stamp-converter";
 import { ClassDefinition } from "./class-definition";
 import { PropertyDefinition } from "./property-definition";
 
@@ -9,8 +10,8 @@ export class ReadOntology {
     @JsonProperty("@id", String)
     id: string = "";
 
-    @JsonProperty(Constants.LastModificationDate, String, true)
-    lastModificationDate?: string = undefined; // TODO: adapt this once this is serialized as an object, see https://github.com/dhlab-basel/Knora/issues/1439
+    @JsonProperty(Constants.LastModificationDate, DateTimeStampConverter, true)
+    lastModificationDate?: string = undefined;
 
     properties: { [index: string]: PropertyDefinition } = {};
     classes: { [index: string]: ClassDefinition } = {};

src/models/v2/resources/create/create-resource.ts

@@ -1,7 +1,7 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { CreateValue } from "../../../../models/v2/resources/values/create/create-value";
 import { Constants } from "../../Constants";
-import { DateTimeStamp } from "../../custom-converters/date-time-stamp-converter";
+import { DateTimeStampConverter } from "../../custom-converters/date-time-stamp-converter";
 import { IdConverter } from "../../custom-converters/id-converter";
 
 @JsonObject("CreateResource")
@@ -22,7 +22,7 @@ export class CreateResource {
     @JsonProperty(Constants.AttachedToUser, IdConverter, true)
     attachedToUser?: string = undefined;
 
-    @JsonProperty(Constants.CreationDate, DateTimeStamp, true)
+    @JsonProperty(Constants.CreationDate, DateTimeStampConverter, true)
     creationDate?: string = undefined;
 
     properties: { [index: string]: CreateValue[] } = {};

src/models/v2/resources/delete/delete-resource.ts

@@ -1,6 +1,6 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { Constants } from "../../Constants";
-import { DateTimeStamp } from "../../custom-converters/date-time-stamp-converter";
+import { DateTimeStampConverter } from "../../custom-converters/date-time-stamp-converter";
 
 @JsonObject("DeleteResource")
 export class DeleteResource {
@@ -11,7 +11,7 @@ export class DeleteResource {
     @JsonProperty("@type", String)
     type: string = "";
 
-    @JsonProperty(Constants.LastModificationDate, DateTimeStamp, true)
+    @JsonProperty(Constants.LastModificationDate, DateTimeStampConverter, true)
     lastModificationDateDate?: string = undefined;
 
     @JsonProperty(Constants.DeleteComment, String, true)

src/models/v2/resources/read/read-resource.ts

@@ -1,7 +1,7 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { IResourceClassAndPropertyDefinitions } from "../../../../cache/OntologyCache";
 import { Constants } from "../../Constants";
-import { DateTimeStamp } from "../../custom-converters/date-time-stamp-converter";
+import { DateTimeStampConverter } from "../../custom-converters/date-time-stamp-converter";
 import { IdConverter } from "../../custom-converters/id-converter";
 import { UriConverter } from "../../custom-converters/uri-converter";
 import { ReadWriteResource } from "../read-write-resource";
@@ -32,10 +32,10 @@ export class ReadResource extends ReadWriteResource {
     @JsonProperty(Constants.VersionArkUrl, UriConverter)
     versionArkUrl: string = "";
 
-    @JsonProperty(Constants.CreationDate, DateTimeStamp)
+    @JsonProperty(Constants.CreationDate, DateTimeStampConverter)
     creationDate: string = "";
 
-    @JsonProperty(Constants.LastModificationDate, DateTimeStamp, true)
+    @JsonProperty(Constants.LastModificationDate, DateTimeStampConverter, true)
     lastModificationDateDate?: string = undefined;
 
     resourceClassLabel?: string;

src/models/v2/resources/update/update-resource-metadata.ts

@@ -1,6 +1,6 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { Constants } from "../../Constants";
-import { DateTimeStamp } from "../../custom-converters/date-time-stamp-converter";
+import { DateTimeStampConverter } from "../../custom-converters/date-time-stamp-converter";
 
 @JsonObject("UpdateResourceMetadata")
 export class UpdateResourceMetadata {
@@ -11,7 +11,7 @@ export class UpdateResourceMetadata {
     @JsonProperty("@type", String)
     type: string = "";
 
-    @JsonProperty(Constants.LastModificationDate, DateTimeStamp, true)
+    @JsonProperty(Constants.LastModificationDate, DateTimeStampConverter, true)
     lastModificationDateDate?: string = undefined;
 
     @JsonProperty(Constants.Label, String, true)
@@ -20,7 +20,7 @@ export class UpdateResourceMetadata {
     @JsonProperty(Constants.HasPermissions, String, true)
     hasPermissions?: string = undefined;
 
-    @JsonProperty(Constants.NewModificationDate, DateTimeStamp, true)
+    @JsonProperty(Constants.NewModificationDate, DateTimeStampConverter, true)
     newModificationDateDate?: string = undefined;
 
 }

src/models/v2/resources/values/read/read-value.ts

@@ -1,6 +1,6 @@
 import { JsonObject, JsonProperty } from "json2typescript";
 import { Constants } from "../../../Constants";
-import { DateTimeStamp } from "../../../custom-converters/date-time-stamp-converter";
+import { DateTimeStampConverter } from "../../../custom-converters/date-time-stamp-converter";
 import { IdConverter } from "../../../custom-converters/id-converter";
 import { UriConverter } from "../../../custom-converters/uri-converter";
 
@@ -22,7 +22,7 @@ export class ReadValue {
     @JsonProperty(Constants.VersionArkUrl, UriConverter)
     versionArkUrl: string = "";
 
-    @JsonProperty(Constants.ValueCreationDate, DateTimeStamp)
+    @JsonProperty(Constants.ValueCreationDate, DateTimeStampConverter)
     valueCreationDate: string = "";
 
     @JsonProperty(Constants.HasPermissions, String)

test/data/api/v2/ontologies/all-ontology-metadata-expanded.json

@@ -1 +1 @@
-{"@graph":[{"@id":"http://0.0.0.0:3333/ontology/0001/anything/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":"2017-12-19T15:23:42.166Z","http://www.w3.org/2000/01/rdf-schema#label":"The anything ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/minimal/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":"2019-09-10T08:57:46.633162Z","http://www.w3.org/2000/01/rdf-schema#label":"A minimal ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/something/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://www.w3.org/2000/01/rdf-schema#label":"The something ontology"},{"@id":"http://0.0.0.0:3333/ontology/00FF/images/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/00FF"},"http://www.w3.org/2000/01/rdf-schema#label":"The images demo ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/beol/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The BEOL ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/biblio/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Biblio ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/leibniz/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Briefportal Leibniz ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/newton/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Newton-Project ontology"},{"@id":"http://0.0.0.0:3333/ontology/0803/incunabula/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0803"},"http://www.w3.org/2000/01/rdf-schema#label":"The incunabula ontology"},{"@id":"http://0.0.0.0:3333/ontology/0804/dokubib/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0804"},"http://www.w3.org/2000/01/rdf-schema#label":"The dokubib ontology"},{"@id":"http://0.0.0.0:3333/ontology/08AE/webern/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/08AE"},"http://www.w3.org/2000/01/rdf-schema#label":"The Anton Webern project ontology"},{"@id":"http://api.knora.org/ontology/knora-admin/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The Knora admin ontology"},{"@id":"http://api.knora.org/ontology/knora-api/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The knora-api ontology in the complex schema"},{"@id":"http://api.knora.org/ontology/salsah-gui/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The salsah-gui ontology"},{"@id":"http://api.knora.org/ontology/standoff/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The standoff ontology"}]}
+{"@graph":[{"@id":"http://0.0.0.0:3333/ontology/0001/anything/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":{"@type":"http://www.w3.org/2001/XMLSchema#dateTimeStamp","@value":"2017-12-19T15:23:42.166Z"},"http://www.w3.org/2000/01/rdf-schema#label":"The anything ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/minimal/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://api.knora.org/ontology/knora-api/v2#lastModificationDate":{"@type":"http://www.w3.org/2001/XMLSchema#dateTimeStamp","@value":"2019-09-10T08:57:46.633162Z"},"http://www.w3.org/2000/01/rdf-schema#label":"A minimal ontology"},{"@id":"http://0.0.0.0:3333/ontology/0001/something/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0001"},"http://www.w3.org/2000/01/rdf-schema#label":"The something ontology"},{"@id":"http://0.0.0.0:3333/ontology/00FF/images/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/00FF"},"http://www.w3.org/2000/01/rdf-schema#label":"The images demo ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/beol/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The BEOL ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/biblio/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Biblio ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/leibniz/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Briefportal Leibniz ontology"},{"@id":"http://0.0.0.0:3333/ontology/0801/newton/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF"},"http://www.w3.org/2000/01/rdf-schema#label":"The Newton-Project ontology"},{"@id":"http://0.0.0.0:3333/ontology/0803/incunabula/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0803"},"http://www.w3.org/2000/01/rdf-schema#label":"The incunabula ontology"},{"@id":"http://0.0.0.0:3333/ontology/0804/dokubib/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/0804"},"http://www.w3.org/2000/01/rdf-schema#label":"The dokubib ontology"},{"@id":"http://0.0.0.0:3333/ontology/08AE/webern/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://rdfh.ch/projects/08AE"},"http://www.w3.org/2000/01/rdf-schema#label":"The Anton Webern project ontology"},{"@id":"http://api.knora.org/ontology/knora-admin/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The Knora admin ontology"},{"@id":"http://api.knora.org/ontology/knora-api/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The knora-api ontology in the complex schema"},{"@id":"http://api.knora.org/ontology/salsah-gui/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The salsah-gui ontology"},{"@id":"http://api.knora.org/ontology/standoff/v2","@type":"http://www.w3.org/2002/07/owl#Ontology","http://api.knora.org/ontology/knora-api/v2#attachedToProject":{"@id":"http://www.knora.org/ontology/knora-admin#SystemProject"},"http://api.knora.org/ontology/knora-api/v2#isBuiltIn":true,"http://www.w3.org/2000/01/rdf-schema#label":"The standoff ontology"}]}

test/data/api/v2/ontologies/all-ontology-metadata.json

@@ -5,15 +5,21 @@
     "knora-api:attachedToProject" : {
       "@id" : "http://rdfh.ch/projects/0001"
     },
-    "knora-api:lastModificationDate" : "2017-12-19T15:23:42.166Z",
+    "knora-api:lastModificationDate" : {
+      "@type" : "xsd:dateTimeStamp",
+      "@value" : "2017-12-19T15:23:42.166Z"
+    },
     "rdfs:label" : "The anything ontology"
   }, {
     "@id" : "http://0.0.0.0:3333/ontology/0001/minimal/v2",
     "@type" : "owl:Ontology",
     "knora-api:attachedToProject" : {
       "@id" : "http://rdfh.ch/projects/0001"
     },
-    "knora-api:lastModificationDate" : "2019-09-10T08:57:46.633162Z",
+    "knora-api:lastModificationDate" : {
+      "@type" : "xsd:dateTimeStamp",
+      "@value" : "2019-09-10T08:57:46.633162Z"
+    },
     "rdfs:label" : "A minimal ontology"
   }, {
     "@id" : "http://0.0.0.0:3333/ontology/0001/something/v2",
@@ -113,6 +119,7 @@
   } ],
   "@context" : {
     "knora-api" : "http://api.knora.org/ontology/knora-api/v2#",
+    "xsd" : "http://www.w3.org/2001/XMLSchema#",
     "rdfs" : "http://www.w3.org/2000/01/rdf-schema#",
     "owl" : "http://www.w3.org/2002/07/owl#"
   }

test/data/api/v2/ontologies/anything-ontology.json

@@ -2236,7 +2236,10 @@
   "knora-api:attachedToProject" : {
     "@id" : "http://rdfh.ch/projects/0001"
   },
-  "knora-api:lastModificationDate" : "2017-12-19T15:23:42.166Z",
+  "knora-api:lastModificationDate" : {
+    "@type" : "xsd:dateTimeStamp",
+    "@value" : "2017-12-19T15:23:42.166Z"
+  },
   "rdfs:label" : "The anything ontology",
   "@context" : {
     "rdf" : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",