From f7f654df2f70967a32c278e6de5fb0ee5dd28f21 Mon Sep 17 00:00:00 2001 From: Nordine Bittich <3816305+nbittich@users.noreply.github.com> Date: Tue, 28 Feb 2023 17:19:08 +0100 Subject: [PATCH] Feat/remove beheerder (#243) --- ...105324-move-jobs-to-specific-graph.sparql} | 0 ...0230228132500-delete-elastic-index.sparql} | 0 ...30228132600-move-all-worship-types.sparql} | 0 ...1-move-all-worsip-governing-bodies.sparql} | 0 ...move-all-worsip-governing-bodies-2.sparql} | 0 ...move-all-worsip-governing-bodies-3.sparql} | 0 .../20230228132604-move-bestrokken.sparql} | 0 ...2605-move-all-worsip-change-events.sparql} | 0 .../20230228132606-duplicate-person.sparql} | 0 .../20230228132607-move-shared-types.sparql} | 0 .../20230228132608-move-public-types.sparql} | 0 ...132609-move-to-administrative-unit.sparql} | 0 .../20230228132610-add-mock-user-1.sparql} | 0 .../20230228132611-add-mock-user-2.sparql} | 0 .../20230228132612-add-mock-user-3.sparql} | 0 .../20230228132613-add-mock-user-4.sparql} | 0 .../20230228132614-move-privacy-data.sparql} | 0 .../20230228142612-add-mock-user-5.sparql} | 0 .../20230228142712-add-mock-user-6.sparql} | 0 .../20230228152117-remove-beheerder.sparql | 58 +++++++++++++++++++ config/search/config.json | 28 --------- config/search/dev/config.json | 4 +- 22 files changed, 60 insertions(+), 30 deletions(-) rename config/migrations/2023/{20230401132400-hard-split/20230402105324-move-jobs-to-specific-graph.sparql => 20230228112800-hard-split/20230228105324-move-jobs-to-specific-graph.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132500-delete-elastic-index.sparql => 20230228112800-hard-split/20230228132500-delete-elastic-index.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132600-move-all-worship-types.sparql => 20230228112800-hard-split/20230228132600-move-all-worship-types.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132601-move-all-worsip-governing-bodies.sparql => 20230228112800-hard-split/20230228132601-move-all-worsip-governing-bodies.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132602-move-all-worsip-governing-bodies-2.sparql => 20230228112800-hard-split/20230228132602-move-all-worsip-governing-bodies-2.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132603-move-all-worsip-governing-bodies-3.sparql => 20230228112800-hard-split/20230228132603-move-all-worsip-governing-bodies-3.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132604-move-bestrokken.sparql => 20230228112800-hard-split/20230228132604-move-bestrokken.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132605-move-all-worsip-change-events.sparql => 20230228112800-hard-split/20230228132605-move-all-worsip-change-events.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132606-duplicate-person.sparql => 20230228112800-hard-split/20230228132606-duplicate-person.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132607-move-shared-types.sparql => 20230228112800-hard-split/20230228132607-move-shared-types.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132608-move-public-types.sparql => 20230228112800-hard-split/20230228132608-move-public-types.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132609-move-to-administrative-unit.sparql => 20230228112800-hard-split/20230228132609-move-to-administrative-unit.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132610-add-mock-user-1.sparql => 20230228112800-hard-split/20230228132610-add-mock-user-1.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132611-add-mock-user-2.sparql => 20230228112800-hard-split/20230228132611-add-mock-user-2.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132612-add-mock-user-3.sparql => 20230228112800-hard-split/20230228132612-add-mock-user-3.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132613-add-mock-user-4.sparql => 20230228112800-hard-split/20230228132613-add-mock-user-4.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230401132614-move-privacy-data.sparql => 20230228112800-hard-split/20230228132614-move-privacy-data.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230403132612-add-mock-user-5.sparql => 20230228112800-hard-split/20230228142612-add-mock-user-5.sparql} (100%) rename config/migrations/2023/{20230401132400-hard-split/20230403132613-add-mock-user-6.sparql => 20230228112800-hard-split/20230228142712-add-mock-user-6.sparql} (100%) create mode 100644 config/migrations/2023/20230228152117-remove-beheerder.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230402105324-move-jobs-to-specific-graph.sparql b/config/migrations/2023/20230228112800-hard-split/20230228105324-move-jobs-to-specific-graph.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230402105324-move-jobs-to-specific-graph.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228105324-move-jobs-to-specific-graph.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132500-delete-elastic-index.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132500-delete-elastic-index.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132500-delete-elastic-index.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132500-delete-elastic-index.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132600-move-all-worship-types.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132600-move-all-worship-types.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132600-move-all-worship-types.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132600-move-all-worship-types.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132601-move-all-worsip-governing-bodies.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132601-move-all-worsip-governing-bodies.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132601-move-all-worsip-governing-bodies.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132601-move-all-worsip-governing-bodies.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132602-move-all-worsip-governing-bodies-2.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132602-move-all-worsip-governing-bodies-2.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132602-move-all-worsip-governing-bodies-2.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132602-move-all-worsip-governing-bodies-2.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132603-move-all-worsip-governing-bodies-3.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132603-move-all-worsip-governing-bodies-3.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132603-move-all-worsip-governing-bodies-3.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132603-move-all-worsip-governing-bodies-3.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132604-move-bestrokken.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132604-move-bestrokken.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132604-move-bestrokken.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132604-move-bestrokken.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132605-move-all-worsip-change-events.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132605-move-all-worsip-change-events.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132605-move-all-worsip-change-events.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132605-move-all-worsip-change-events.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132606-duplicate-person.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132606-duplicate-person.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132606-duplicate-person.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132606-duplicate-person.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132607-move-shared-types.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132607-move-shared-types.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132607-move-shared-types.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132607-move-shared-types.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132608-move-public-types.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132608-move-public-types.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132608-move-public-types.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132608-move-public-types.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132609-move-to-administrative-unit.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132609-move-to-administrative-unit.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132609-move-to-administrative-unit.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132609-move-to-administrative-unit.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132610-add-mock-user-1.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132610-add-mock-user-1.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132610-add-mock-user-1.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132610-add-mock-user-1.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132611-add-mock-user-2.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132611-add-mock-user-2.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132611-add-mock-user-2.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132611-add-mock-user-2.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132612-add-mock-user-3.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132612-add-mock-user-3.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132612-add-mock-user-3.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132612-add-mock-user-3.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132613-add-mock-user-4.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132613-add-mock-user-4.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132613-add-mock-user-4.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132613-add-mock-user-4.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230401132614-move-privacy-data.sparql b/config/migrations/2023/20230228112800-hard-split/20230228132614-move-privacy-data.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230401132614-move-privacy-data.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228132614-move-privacy-data.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230403132612-add-mock-user-5.sparql b/config/migrations/2023/20230228112800-hard-split/20230228142612-add-mock-user-5.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230403132612-add-mock-user-5.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228142612-add-mock-user-5.sparql diff --git a/config/migrations/2023/20230401132400-hard-split/20230403132613-add-mock-user-6.sparql b/config/migrations/2023/20230228112800-hard-split/20230228142712-add-mock-user-6.sparql similarity index 100% rename from config/migrations/2023/20230401132400-hard-split/20230403132613-add-mock-user-6.sparql rename to config/migrations/2023/20230228112800-hard-split/20230228142712-add-mock-user-6.sparql diff --git a/config/migrations/2023/20230228152117-remove-beheerder.sparql b/config/migrations/2023/20230228152117-remove-beheerder.sparql new file mode 100644 index 0000000..40f987c --- /dev/null +++ b/config/migrations/2023/20230228152117-remove-beheerder.sparql @@ -0,0 +1,58 @@ +PREFIX ext: +DELETE where { + graph { + ?p ?o. + ?aP ?aO. + ?wp ?wo. + ?wpap ?wpao. + } +} +; +DELETE where { + graph { + ?p ?o. + ?aP ?aO. + ?wp ?wo. + ?wpap ?wpao. + } +} +; + +DELETE WHERE { + graph { + ext:sessionRole "ABBOrganisatiePortaalErediensten-beheerder", + "ABBOrganisatiePortaalGebruiker-beheerder" . + + } +} + +; + +; + +DELETE WHERE { + graph { + ext:sessionRole "ABBOrganisatiePortaalErediensten-beheerder", + "ABBOrganisatiePortaalGebruiker-beheerder" . + + + } +} + + +INSERT DATA { +GRAPH { + ext:sessionRole "ABBOrganisatiePortaalErediensten-editeerder", + "ABBOrganisatiePortaalGebruiker-editeerder" . + +} +} +; + +INSERT DATA { +GRAPH { + ext:sessionRole "ABBOrganisatiePortaalErediensten-editeerder", + "ABBOrganisatiePortaalGebruiker-editeerder" . + +} +} diff --git a/config/search/config.json b/config/search/config.json index e62d951..4b95f52 100644 --- a/config/search/config.json +++ b/config/search/config.json @@ -31,34 +31,6 @@ "name": "public" } ], - [ - { - "variables": [], - "name": "acmidm-beheerder" - }, - { - "variables": [], - "name": "clean" - }, - { - "variables": [], - "name": "public" - } - ], - [ - { - "variables": [], - "name": "acmidm-worship-beheerder" - }, - { - "variables": [], - "name": "clean" - }, - { - "variables": [], - "name": "public" - } - ], [ { "variables": [], diff --git a/config/search/dev/config.json b/config/search/dev/config.json index 6dd6b9e..22b117e 100644 --- a/config/search/dev/config.json +++ b/config/search/dev/config.json @@ -6,7 +6,7 @@ [ { "variables": [], - "name": "acmidm-worship-beheerder" + "name": "acmidm-worship-editeerder" }, { "variables": [], @@ -20,7 +20,7 @@ [ { "variables": [], - "name": "acmidm-beheerder" + "name": "acmidm-editeerder" }, { "variables": [],