Skip to content

Commit

Permalink
chore: Update api to v.30.9.0 (#619)
Browse files Browse the repository at this point in the history
* update api and fix date-related tests

* fix get all projects test
  • Loading branch information
mpro7 authored Mar 8, 2024
1 parent 470e072 commit b662847
Show file tree
Hide file tree
Showing 131 changed files with 142 additions and 142 deletions.
2 changes: 1 addition & 1 deletion src/api/admin/projects/projects-endpoint.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe("ProjectsEndpoint", () => {
(response: ApiResponseData<ProjectsResponse>) => {

expect(response.body.projects.length).toEqual(6);
expect(response.body.projects[0].id).toEqual("http://rdfh.ch/projects/00FF");
expect(response.body.projects[0].id).toEqual("http://rdfh.ch/projects/yTerZGyxjZVqFMNNKXCDPF");

done();
});
Expand Down
4 changes: 2 additions & 2 deletions src/api/v2/ontology/ontologies-endpoint.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1220,7 +1220,7 @@ describe("OntologiesEndpoint", () => {
deleteCardinalitiesFromClassRequest.id = "http://0.0.0.0:3333/ontology/0001/freetest/v2";

// update this timestamp after every release of dsp-api
deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-02-23T08:06:18.689269025Z";
deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-03-08T07:25:29.913132496Z";

const cardinalityToRemove = new UpdateResourceClassCardinality();

Expand Down Expand Up @@ -1265,7 +1265,7 @@ describe("OntologiesEndpoint", () => {
deleteCardinalitiesFromClassRequest.id = "http://0.0.0.0:3333/ontology/0001/freetest/v2";

// update this timestamp after every release of dsp-api
deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-02-23T08:06:18.689269025Z";
deleteCardinalitiesFromClassRequest.lastModificationDate = "2024-03-08T07:25:29.913132496Z";

const cardinalityToRemove = new UpdateResourceClassCardinality();

Expand Down
8 changes: 4 additions & 4 deletions src/api/v2/resource/resources-endpoint.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ describe("ResourcesEndpoint", () => {
expect(res.hasPermissions).toEqual("CR knora-admin:Creator|M knora-admin:ProjectMember|V knora-admin:ProjectMember");

// update this timestamp after every release of dsp-api
expect(res.lastModificationDate).toEqual("2024-02-24T08:03:02.033699098Z");
expect(res.lastModificationDate).toEqual("2024-03-09T07:22:16.441180925Z");
done();
}
);
Expand Down Expand Up @@ -550,7 +550,7 @@ describe("ResourcesEndpoint", () => {
updateResourceMetadata.lastModificationDate = "2021-09-30T16:41:46.980756Z";

// update this timestamp after every release of dsp-api
updateResourceMetadata.newModificationDate = "2024-02-24T08:03:02.548541972Z";
updateResourceMetadata.newModificationDate = "2024-03-09T07:22:16.970569986Z";

knoraApiConnection.v2.res.updateResourceMetadata(updateResourceMetadata).subscribe(
(res: UpdateResourceMetadataResponse) => {
Expand All @@ -560,7 +560,7 @@ describe("ResourcesEndpoint", () => {
expect(res.hasPermissions).toEqual("CR knora-admin:ProjectMember|V knora-admin:ProjectMember");

// update this timestamp after every release of dsp-api
expect(res.lastModificationDate).toEqual("2024-02-24T08:03:02.548541972Z");
expect(res.lastModificationDate).toEqual("2024-03-09T07:22:16.970569986Z");
done();
}
);
Expand All @@ -578,7 +578,7 @@ describe("ResourcesEndpoint", () => {
expectedPayload["http://api.knora.org/ontology/knora-api/v2#lastModificationDate"]["@value"] = "2021-09-30T16:41:46.980756Z";

// update this timestamp after every release of dsp-api
expectedPayload["http://api.knora.org/ontology/knora-api/v2#newModificationDate"]["@value"] = "2024-02-24T08:03:02.548541972Z";
expectedPayload["http://api.knora.org/ontology/knora-api/v2#newModificationDate"]["@value"] = "2024-03-09T07:22:16.970569986Z";

expect(request.data()).toEqual(expectedPayload);

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/ntL-yR7iQxOYuQlqcxxhEA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/BrTIuz9vTHS_YanCaye-hA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
2 changes: 1 addition & 1 deletion test/data/api/admin/groups/create-group-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"group":{"descriptions":[{"value":"NewGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/ntL-yR7iQxOYuQlqcxxhEA","name":"NewGroup","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
{"group":{"descriptions":[{"value":"NewGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/BrTIuz9vTHS_YanCaye-hA","name":"NewGroup","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
2 changes: 1 addition & 1 deletion test/data/api/admin/groups/delete-group-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/ntL-yR7iQxOYuQlqcxxhEA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":false}}
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/BrTIuz9vTHS_YanCaye-hA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":false}}
2 changes: 1 addition & 1 deletion test/data/api/admin/groups/update-group-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/ntL-yR7iQxOYuQlqcxxhEA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
{"group":{"descriptions":[{"value":"UpdatedGroupDescription","language":"en"}],"id":"http://rdfh.ch/groups/00FF/BrTIuz9vTHS_YanCaye-hA","name":"UpdatedGroupName","project":{"description":[{"value":"A demo project of a collection of images","language":"en"}],"id":"http://rdfh.ch/projects/00FF","keywords":["collection","images"],"logo":null,"longname":"Image Collection Demo","ontologies":["http://0.0.0.0:3333/ontology/00FF/images/v2"],"selfjoin":false,"shortcode":"00FF","shortname":"images","status":true},"selfjoin":false,"status":true}}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parentNodeIri": "http://rdfh.ch/lists/0001/Ck4EL2S8Qg6Fpx1l1VW70Q",
"parentNodeIri": "http://rdfh.ch/lists/0001/awfY_AiGQD-2OLP6i33nxg",
"projectIri": "http://rdfh.ch/projects/0001",
"name": "third",
"labels": [{ "value": "New Third Child List Node Value", "language": "en"}],
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"nodeinfo":{"comments":[{"value":"New Third Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA","id":"http://rdfh.ch/lists/0001/pBcElxkjSQqO_K0Y-Vdolg","labels":[{"value":"New Third Child List Node Value","language":"en"}],"name":"third","position":0}}
{"nodeinfo":{"comments":[{"value":"New Third Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA","id":"http://rdfh.ch/lists/0001/zGrdS1IdTxmIQKBIpMPp7A","labels":[{"value":"New Third Child List Node Value","language":"en"}],"name":"third","position":0}}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parentNodeIri": "http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA",
"parentNodeIri": "http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA",
"projectIri": "http://rdfh.ch/projects/0001",
"name": "second",
"labels": [{ "value": "New Second Child List Node Value", "language": "en"}],
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"nodeinfo":{"comments":[{"value":"New Second Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA","id":"http://rdfh.ch/lists/0001/rPWdV-E8RiKNGFYsVEubhA","labels":[{"value":"New Second Child List Node Value","language":"en"}],"name":"second","position":1}}
{"nodeinfo":{"comments":[{"value":"New Second Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA","id":"http://rdfh.ch/lists/0001/DPXhBI_lRu2zC9RHz_Pjbw","labels":[{"value":"New Second Child List Node Value","language":"en"}],"name":"second","position":1}}
2 changes: 1 addition & 1 deletion test/data/api/admin/lists/create-child-node-request.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parentNodeIri": "http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA",
"parentNodeIri": "http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA",
"projectIri": "http://rdfh.ch/projects/0001",
"name": "first",
"labels": [{ "value": "New First Child List Node Value", "language": "en"}],
Expand Down
2 changes: 1 addition & 1 deletion test/data/api/admin/lists/create-child-node-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"nodeinfo":{"comments":[{"value":"New First Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA","id":"http://rdfh.ch/lists/0001/5Pe5rUkTTOORUIBHawDPpA","labels":[{"value":"New First Child List Node Value","language":"en"}],"name":"first","position":0}}
{"nodeinfo":{"comments":[{"value":"New First Child List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA","id":"http://rdfh.ch/lists/0001/vVRWEQXDSrqpDLzmBiJQvg","labels":[{"value":"New First Child List Node Value","language":"en"}],"name":"first","position":0}}
2 changes: 1 addition & 1 deletion test/data/api/admin/lists/create-list-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"list":{"children":[],"listinfo":{"comments":[{"value":"XXXXX","language":"en"}],"id":"http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA","isRootNode":true,"labels":[{"value":"Neue Liste","language":"de"}],"projectIri":"http://rdfh.ch/projects/0001"}}}
{"list":{"children":[],"listinfo":{"comments":[{"value":"XXXXX","language":"en"}],"id":"http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA","isRootNode":true,"labels":[{"value":"Neue Liste","language":"de"}],"projectIri":"http://rdfh.ch/projects/0001"}}}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parentNodeIri": "http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA",
"parentNodeIri": "http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA",
"projectIri": "http://rdfh.ch/projects/0001",
"name": "child with position",
"position": 1,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"nodeinfo":{"comments":[{"value":"Inserted List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/ndfLcK52RomP49lEsCY7SA","id":"http://rdfh.ch/lists/0001/Ck4EL2S8Qg6Fpx1l1VW70Q","labels":[{"value":"Inserted List Node Label","language":"en"}],"name":"child with position","position":1}}
{"nodeinfo":{"comments":[{"value":"Inserted List Node Comment","language":"en"}],"hasRootNode":"http://rdfh.ch/lists/0001/HjZWjJ_5QVqRyHzH5-wuSA","id":"http://rdfh.ch/lists/0001/awfY_AiGQD-2OLP6i33nxg","labels":[{"value":"Inserted List Node Label","language":"en"}],"name":"child with position","position":1}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"administrative_permission":{"forGroup":"http://rdfh.ch/groups/0001/thing-searcher","forProject":"http://rdfh.ch/projects/0001","hasPermissions":[{"additionalInformation":null,"name":"ProjectAdminGroupAllPermission","permissionCode":null}],"iri":"http://rdfh.ch/permissions/0001/f4CcK_q6RZm-htIA1VsAsQ"}}
{"administrative_permission":{"forGroup":"http://rdfh.ch/groups/0001/thing-searcher","forProject":"http://rdfh.ch/projects/0001","hasPermissions":[{"additionalInformation":null,"name":"ProjectAdminGroupAllPermission","permissionCode":null}],"iri":"http://rdfh.ch/permissions/0001/vdl55uj-T8e6AckmaLNy7g"}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"default_object_access_permission":{"forGroup":"http://rdfh.ch/groups/0001/thing-searcher","forProject":"http://rdfh.ch/projects/0001","forProperty":null,"forResourceClass":null,"hasPermissions":[{"additionalInformation":"http://www.knora.org/ontology/knora-admin#ProjectMember","name":"D","permissionCode":7}],"iri":"http://rdfh.ch/permissions/0001/tWp5GWgsQy2Uscobh9HZSg"}}
{"default_object_access_permission":{"forGroup":"http://rdfh.ch/groups/0001/thing-searcher","forProject":"http://rdfh.ch/projects/0001","forProperty":null,"forResourceClass":null,"hasPermissions":[{"additionalInformation":"http://www.knora.org/ontology/knora-admin#ProjectMember","name":"D","permissionCode":7}],"iri":"http://rdfh.ch/permissions/0001/Hww3KE7VTPWqWkwwxsbaeg"}}
2 changes: 1 addition & 1 deletion test/data/api/admin/projects/create-project-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"project":{"description":[{"value":"project description","language":"en"}],"id":"http://rdfh.ch/projects/jOFrRrw7TkO5XSZ_bbFiMg","keywords":["keywords"],"logo":"/fu/bar/baz.jpg","longname":"project longname","ontologies":[],"selfjoin":false,"shortcode":"1111","shortname":"newproject","status":true}}
{"project":{"description":[{"value":"project description","language":"en"}],"id":"http://rdfh.ch/projects/KTrKsXpwRWqaHZ3DcdFODA","keywords":["keywords"],"logo":"/fu/bar/baz.jpg","longname":"project longname","ontologies":[],"selfjoin":false,"shortcode":"1111","shortname":"newproject","status":true}}
2 changes: 1 addition & 1 deletion test/data/api/admin/projects/delete-project-response.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"project":{"description":[{"value":"Test Project","language":"en"},{"value":"Test Project","language":"se"}],"id":"http://rdfh.ch/projects/jOFrRrw7TkO5XSZ_bbFiMg","keywords":["keywords","updated"],"logo":"/fu/bar/baz-updated.jpg","longname":"updated project longname","ontologies":[],"selfjoin":true,"shortcode":"1111","shortname":"updatedproject","status":false}}
{"project":{"description":[{"value":"Test Project","language":"en"},{"value":"Test Project","language":"se"}],"id":"http://rdfh.ch/projects/KTrKsXpwRWqaHZ3DcdFODA","keywords":["keywords","updated"],"logo":"/fu/bar/baz-updated.jpg","longname":"updated project longname","ontologies":[],"selfjoin":true,"shortcode":"1111","shortname":"updatedproject","status":false}}
Loading

0 comments on commit b662847

Please sign in to comment.