From f13a36c1c65979e5b495b093f404c68f94a41072 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 12 Sep 2022 16:53:39 +0200 Subject: [PATCH] Improved code --- .../gcat/persistence/grsf/GRSFUtilities.java | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java b/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java index 0bfa188..4f648aa 100644 --- a/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java +++ b/src/test/java/org/gcube/gcat/persistence/grsf/GRSFUtilities.java @@ -154,7 +154,7 @@ public class GRSFUtilities extends ContextTest { } - @Test + // @Test public void createNewGRSFGroups() throws ObjectNotFound, Exception { String sysAdminAPI = CKANUtility.getSysAdminAPI(); String[] groupNames = new String[] { @@ -238,18 +238,25 @@ public class GRSFUtilities extends ContextTest { // @Test public void manageOrganizations() throws JsonProcessingException { + String context = SecretManagerProvider.instance.get().getContext(); + ScopeBean scopeBean = new ScopeBean(context); + String sysAdminAPI = CKANUtility.getSysAdminAPI(); - String[] organizations = new String[] { - "GRSF_Pre", "FIRMS", "FishSource", "RAM" - }; + Map organizations = new HashMap<>(); + organizations.put(scopeBean.name(), scopeBean.name()); + organizations.put("FIRMS", "FIRMS"); + organizations.put("FishSource", "FishSource"); + organizations.put("RAM", "RAM"); + organizations.put("SDG", "FAO SDG 14.4.1 Questionnaire"); ObjectMapper objectMapper = new ObjectMapper(); - for(String org : organizations) { + for(String org : organizations.keySet()) { CKANOrganization ckanOrganization = new CKANOrganization(); ckanOrganization.setApiKey(sysAdminAPI); ckanOrganization.setName(org.toLowerCase()); ObjectNode node = objectMapper.createObjectNode(); - node.put("display_name", org); - node.put("title", org); + String fancyName = organizations.get(org); + node.put("display_name", fancyName); + node.put("title", fancyName); node.put("name", org.toLowerCase()); String json = objectMapper.writeValueAsString(node); try { @@ -404,4 +411,14 @@ public class GRSFUtilities extends ContextTest { purgeGRSFRecords(100, 0); } + @Test + public void purgeSpecificGRSFRecord() throws Exception { + CKANPackage ckanPackage = new CKANPackage(); + MultivaluedMap mvm = new MultivaluedHashMap(); + UriInfo uriInfo = CKANPackageTest.getUriInfo(mvm); + ckanPackage.setUriInfo(uriInfo); + ckanPackage.setName("70ae6895-7d3d-4f4a-86f9-bcb17d41bff6"); + ckanPackage.purgeNoCheckNoDeleteFiles(); + } + }