From 912925202db5f9ebc3bf04c4e9b3aa4770c38c78 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 13 Dec 2022 16:52:25 +0100 Subject: [PATCH] Testing --- .../application/cms/tests/TestDocuments.java | 6 +- .../common/utils/tests/GCubeTest.java | 2 +- .../service/BasicServiceTestUnit.java | 3 + .../ProfiledConcessioniTests.java | 16 + test-data/profiledDocuments/sdiIndexed.json | 637 ++++++++++++++++-- .../cms/usecases/ClearProjects.java | 2 +- .../cms/usecases/ws/DescribeWSFolder.java | 36 +- 7 files changed, 635 insertions(+), 67 deletions(-) diff --git a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java index 20aa8a9..009cb68 100644 --- a/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java +++ b/cms-test-commons/src/main/java/org/gcube/application/cms/tests/TestDocuments.java @@ -10,12 +10,12 @@ import java.nio.charset.Charset; import java.util.HashMap; public class TestDocuments { - public static File BASE_FOLDER =new File("../test-data/profiledDocuments"); + public static File BASE_FOLDER =new File("test-data/profiledDocuments"); public static final HashMap documentMap =new HashMap<>(); static{ - - for(File f:BASE_FOLDER.listFiles()){ + if(!BASE_FOLDER.exists()) System.err.println("Cannot load documents : folder not found, path "+BASE_FOLDER.getAbsolutePath()); + for(File f:BASE_FOLDER.listFiles(pathname -> {return pathname.getName().endsWith(".json");})){ try { if(!f.isDirectory()) { Project p = Serialization.read( diff --git a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java index e8ce6e7..fbf703d 100644 --- a/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java +++ b/geoportal-common/src/main/java/org/gcube/application/geoportal/common/utils/tests/GCubeTest.java @@ -15,7 +15,7 @@ public class GCubeTest { // InterfaceConstants.SERVICE_NAME="GeoPortal"; - testContext = "/pred4s/preprod/preVRE"; +// testContext = "/pred4s/preprod/preVRE"; // testContext = "/d4science.research-infrastructures.eu/D4OS/GNA"; testContext= "/gcube/devsec/devVRE"; diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java index e6d5217..89ea456 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/BasicServiceTestUnit.java @@ -72,4 +72,7 @@ public class BasicServiceTestUnit extends JerseyTest { return Serialization.read(resString, clazz); else return null; } + + + } diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java index 96fcd5d..c42b12c 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/profiledDocuments/ProfiledConcessioniTests.java @@ -2,8 +2,11 @@ package org.gcube.application.geoportal.service.profiledDocuments; import lombok.extern.slf4j.Slf4j; import org.bson.Document; +import org.gcube.application.cms.implementations.ImplementationProvider; +import org.gcube.application.cms.implementations.WorkspaceManager; import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.cms.tests.model.BasicTests; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.application.geoportal.common.model.document.Project; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; @@ -14,6 +17,7 @@ import org.gcube.application.geoportal.common.rest.InterfaceConstants; import org.gcube.application.geoportal.common.utils.StorageUtils; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.gcube.application.geoportal.service.utils.UserUtils; +import org.gcube.common.storagehub.model.exceptions.StorageHubException; import org.junit.Test; import javax.management.relation.Relation; @@ -89,9 +93,21 @@ public class ProfiledConcessioniTests extends AbstractProfiledDocumentsTests{ assertTrue(doc.getLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)); assertTrue(doc.getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE).size()==1); System.out.println("Project "+doc.getId()+" published with spatial reference "+doc.getIdentificationReferenceByType(SpatialReference.SPATIAL_REFERENCE_TYPE).get(0)); + + + // check deletion + delete(doc.getId(),true); + System.out.println("Deleted."); + + + + + } + + @Test public void testRelations() throws Exception { assumeTrue(GCubeTest.isTestInfrastructureEnabled()); diff --git a/test-data/profiledDocuments/sdiIndexed.json b/test-data/profiledDocuments/sdiIndexed.json index d329ec7..472fb39 100644 --- a/test-data/profiledDocuments/sdiIndexed.json +++ b/test-data/profiledDocuments/sdiIndexed.json @@ -1,142 +1,661 @@ { - "_id": "622625b4af5159176f7c550c", - "_version": "1.0.1", + "_id": "6385d4d5308f5c28c5ee0b03", + "_version": "1.0.12", "_info": { "_creationInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:06.959" + "_instant": "2022-11-29T10:45:57.124" }, "_lastEditInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:13.858" + "_instant": "2022-11-29T10:46:14.955" }, "_access": { "_policy": "OPEN", - "_license": "" + "_license": "CC0-1.0" } }, "_profileID": "profiledConcessioni", "_profileVersion": "1.0.0", "_lifecycleInformation": { - "_phase": "PUBLISHED", - "_lastInvokedStep": "APPROVE DRAFT", + "_phase": "Published", + "_lastInvokedStep": "APPROVE-SUBMITTED", "_lastOperationStatus": "OK", "_errorMessages": [], "_warningMessages": [], "_triggeredEvents": - [] + [], + "_notes": null }, "_relationships": null, - "_spatialReference": - { - "type": "Point", - "bbox": - [ - 8.621178639172953, - 40.62975046683799, - 40.630257904721645, - 8.62091913167495 - ], - "coordinates": - [ - -32.00907926554869, - -32.00883133516304 - ] - }, - "_temporalReference": null, + "_identificationReferences": + [ + { + "geoJSON": + { + "type": "Point", + "crs": + { + "type": "name", + "properties": + {} + }, + "bbox": + [ + 12.50360458353915, + 41.867669715453225, + 0.0, + 12.502705577032433, + 41.86836980685436, + 0.0 + ], + "coordinates": + [ + 12.503155080285792, + 41.86801976115379, + 0.0 + ] + }, + "_type": "SPATIAL REFERENCE" + } + ], "_theDocument": { - "posizionamentoScavo": + "nome": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39)", + "introduzione": "L'esecuzione del progetto di indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39 Roma) avvenuta dietro istanza di concessione inviata dal Dipartimento di Studi Umanistici dell'Università degli Studi di Ferrara al Parco Archeologico dell'Appia Antica il giorno 05/10/2021 si inserisce in un più ampio progetto di ricerca volto a definire il paesaggio antico della valle dell'Almone. ", + "descrizioneContenuto": "Relazione di fine scavo e relativo abstract; selezione di immagini rappresentative; posizionamento topografico dell'area indagata, pianta di fine scavo.", + "authors": + [ + "TOMOGEA srl C.da Fontanelle, 85052 - Marsico Nuovo (PZ)", + "Dott.ssa Rachele Dubbini (Università degli Studi di Ferrara), rachele.dubbini@unife.it", + "Dott.ssa Francesca Romana Fiano", + "Dott. Matteo Lombardi" + ], + "contributore": "Prof.ssa Rachele Dubbini", + "titolari": + [ + "Università degli Studi di Ferrara" + ], + "responsabile": "Dott.ssa Rachele Dubbini", + "editore": "Università degli Studi di Ferrara", + "fontiFinanziamento": + [ + "Associazione L'Italia Fenice" + ], + "soggetto": + [ + "Research Excavation" + ], + "risorseCorrelate": + [ + "" + ], + "dataInizioProgetto": "2021-12-13T00:00:00", + "dataFineProgetto": "2022-02-11T00:00:00", + "titolareLicenza": + [ + "Università degli Studi di Ferrara" + ], + "titolareCopyright": + [ + "Università degli Studi di Ferrara" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "relazioneScavo": { - "titolo": "mio titolo", + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) relazione di scavo", + "responsabili": + [ + "Dott.ssa Rachele Dubbini", + "Dott.ssa Francesca Romana Fiano" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, "fileset": { - "_uuid": "95421181-001c-4e97-bc39-b2e04a30c7b7", + "_uuid": "29090ddf-59a3-4510-9efe-e021adca6f79", "_creationInfo": { "_user": { - "_username": "FAKE" + "_username": "fabio.sinibaldi" }, "_context": { "_id": "/pred4s/preprod/preVRE", "_name": "/preVRE" }, - "_instant": "2022-03-07T16:33:11.167" + "_instant": "2022-11-29T10:45:59.074" + }, + "_access": + { + "_policy": "RESTRICTED", + "_license": "CC-BY-NC-SA-4.0" + }, + "_folderID": "6b72c73b-cb2c-4542-a941-8fadf4c60feb", + "_payloads": + [ + { + "_mimetype": "application/pdf", + "_storageID": "de34d980-22c6-4d97-a3b4-b861c83593fb", + "_link": "https://data-pre.d4science.org/shub/E_ZkxtL09xV2Z5WmYvVlFWVnBOZTBWOVUxY3QxVm9sRVBlMjZXdlMvQU5YVFVrbkIvQUxzSDAydnRkTytTakl6bw==", + "_name": "gna_relazione_appia_antica_sepolcro_geta_2021.pdf" + } + ] + } + }, + "abstractRelazione": + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) abstract relazione di scavo", + "abstractEng": "The non-invasive investigations carried out in the area had a double objective: a) the geophysical investigations were aimed at verifying the archaeological potential and revealing any anomalies in relation to buried structures; b) the drone flight was carried out to document the state of the area and provide for the investigations a georeferenced base through the elaboration of a photogrammetric plan to which to link the data resulting from the geophysical survey. Both these objectives are functional to the preliminary study that the University of Ferrara is carrying out in the proximity of the cd. Sepolcro di Geta for formulating an excavation project aimed at investigating the topography in which the monument was inserted. Moreover, the investigation provided reliable specification in order to plan the excavation activities in the area. Approaching the context at different scales, further themes to be addressed in the investigation are: a) the relationship of the monument and its funerary area within the Via Appia Antica; b) the evolution of the funerary landscape over time along the first mile of the ancient route. More specifically, we intend to investigate the relationship between the funerary landscape and the sacral one related to the sanctuary, in all probability to be attributed to the cult of Mars Gradivo, identified in the southern side of the area on the basis of the renewed interpretative proposals that followed the identification of a Templar structure (at the church of the Domine Quo Vadis?). ", + "abstractIta": "Le indagini non invasive nell’area sono state svolte con un duplice obiettivo: a) le indagini geofisiche erano tese a verificare il potenziale archeologico dei suoli e rivelare eventuali anomalie in relazione a strutture sepolte; b) il volo da drone è stato svolto per documentare lo stato di fatto dell’area e provvedere alle indagini una base georeferita tramite l’elaborazione di una planimetria fotogrammetrica a cui agganciare i dati risultati dall’indagine geofisica. Entrambi questi obiettivi sono funzionali allo studio preliminare che l’università degli Studi di Ferrara sta svolgendo in prossimità del cd. Sepolcro di Geta nella possibilità di formulare una progettualità di scavo volto a indagare il contesto topografico in cui il monumento era inserito. Approcciando al contesto di studio a diverse scale ulteriori aspetti che verranno affrontati nell’indagine sono: a) il rapporto del monumento e la sua area funeraria con la Via Appia Antica; b) l’evoluzione del paesaggio funerario nel tempo lungo il primo miglio del tracciato antico. Più nello specifico si intende indagare la relazione tra il paesaggio funerario e quello sacrale relativo ad un santuario, da attribuire al culto di Marte Gradivo, individuato in questo stesso luogo sulla base delle rinnovate proposte interpretative che hanno seguito all’individuazione di una struttura templare a pochi metri dall’area in concessione (presso la chiesa del Domine Quo Vadis?).", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + } + }, + "immaginiRappresentative": + [ + { + "titolo": null, + "didascalia": "Vista generale dell'area indagata. ", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" }, "_access": { "_policy": "OPEN", - "_license": "" + "_license": "CC0-1.0" }, - "_folderID": "2520ccdd-e0aa-4406-ba62-d900078372ce", + "fileset": + { + "_uuid": "cbdc2a85-f8c1-4882-93df-c677b70cceb7", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:01.961" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "bd48ca0b-ac72-4b32-b62d-b3e48743a528", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "a0cb8fb4-eeab-44d2-9a59-ec7e9f267c18", + "_link": "https://data-pre.d4science.org/shub/E_MUVGbUNlZU1ycFQrOUtiRXRiNGxrSE54RmZxOUU2L2JyWmw0bTJLVFV6UHkyeVJBM3A2VW91NUs1SUhoanlmMg==", + "_name": "foto_1_vista_generale_dell'area_indagata.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio vista da Ovest verso Est. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "8a236628-0d85-4ee6-b841-c1a3223c3361", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:04.35" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "c3252cce-09aa-48ad-a06f-089fe86e6512", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "b8d9f5f9-ed22-4fb9-bf1f-ecb2bec59779", + "_link": "https://data-pre.d4science.org/shub/E_U2toa3JkVFFmM01KSG5rV1RhRnNaSHJGZHV6WUhBdURqQWFjUndyU0VFTnQ2NUg5ZnZmWTdOZUFTUUVQTVQxNA==", + "_name": "foto_2_dettaglio_vista_ovest_est.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio vista da Ovest verso Est. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "7a88dc81-8250-4384-93ec-f6508425f876", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:06.86" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "a7f6a97a-1fb2-43a6-b3eb-6177733f8666", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "fbd417c3-43be-4176-9383-d225e3ced845", + "_link": "https://data-pre.d4science.org/shub/E_YTVmckFJSDZDTDErTFZqVXNKZ3NubWJHODlLWWRXbnhCdWdBK3hWdW9RWTFEeGxRNkhld3A3WmhLTXp4L1hkYg==", + "_name": "foto_3_dettaglio_vista_ovest_est_2.JPG" + } + ] + } + }, + { + "titolo": null, + "didascalia": "Dettaglio uliveto e piante fronte via Appia da Est verso Ovest. 05/02/2022", + "responsabili": + [ + "Dott. Matteo Lombardi" + ], + "soggetto": + [ + "Research Excavation" + ], + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "88a0393a-5c26-4c70-86d5-57dad1e0daaf", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:09.233" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "fbb5379e-2892-4bf8-b187-0f50dfd7e1a9", + "_payloads": + [ + { + "_mimetype": "image/jpeg", + "_storageID": "e8b553ba-162a-4e3e-9b7d-119acefb1f27", + "_link": "https://data-pre.d4science.org/shub/E_MnA0SUFFYVZNajZ6OXlmcWpJMno2Ti8wNGs1aXgxTytMRi9NK0NBSGhMVFJ0QURwN3JaS1FmVTVMNUpIR0doWQ==", + "_name": "foto_4_dettaglio_uliveto_vista_est_ovest.JPG" + } + ] + } + } + ], + "posizionamentoScavo": + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) posizionamento scavo", + "responsabile": "Dott.ssa Rachele Dubbini", + "authors": + [ + "Dott. Matteo Lombardi" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "topicCategory": "Society", + "subTopic": "Archeology", + "metodoRaccoltaDati": "Restituzione da elaborazione fotogrammetrica di immagini scattate da drone. La vettorializzazione è avvenuta sulla base dell'ortofoto contestualmente prodotta.", + "scalaAcquisizione": "1:1", + "valutazioneQualita": "Qualità del dato elevata, in quanto proveniente da ortofoto ottenuta tramite elaborazione fotogrammetrica di immagini da drone. L’area in esame è stata rilevata mediante l’utilizzo di un drone, DJI Mini 2, al fine di creare, tramite l’applicazione di tecniche aerofotogrammetriche, un’immagine metrica e georeferita del sito oggetto di indagine.", + "abstractSection": "Posizionamento topografico georeferenziato dell’area interessata dalle indagini", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + }, + "fileset": + { + "_uuid": "7a84518f-79d9-4642-aa10-926e8f301d7f", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:46:12.187" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC-BY-4.0" + }, + "_folderID": "841eb15d-74fa-46e1-a4e0-d0c202f92123", "_payloads": [ + { + "_mimetype": "text/plain", + "_storageID": "e3ead0d9-e034-4abb-8fce-321fb89249f9", + "_link": "https://data-pre.d4science.org/shub/E_QjI5OTA0SG1KYzBZNTlPVDNVY1NPamJabWpjZnBkMGNyLzNHeGJWVjd0U281RFA4eXZFZGEweU9HQ0RwWHZCMw==", + "_name": "area_indagine.cpg" + }, + { + "_mimetype": "application/x-dbf", + "_storageID": "ab00c236-416d-4ad0-a861-6e92d7b2a3c7", + "_link": "https://data-pre.d4science.org/shub/E_M0QvSkl0dVFjc2xGMGM3YnVhcmpWY3dENUU0Z1B2R090UU4wcktPdG4vVzk5MkJqSy85dUhVVEdLdXUzRFdJLw==", + "_name": "area_indagine.dbf" + }, + { + "_mimetype": "text/plain", + "_storageID": "1bb3d118-eece-4faa-845c-c23389450455", + "_link": "https://data-pre.d4science.org/shub/E_b0I1Nk9HOTB2dEI5UHoxRFRKQ09aWUhpOVlKeWNKYytqTERTL1hHSUlDcm9GRXBadVJIb2tSaVJxNytDbzRVVg==", + "_name": "area_indagine.prj" + }, { "_mimetype": "application/x-shapefile", - "_storageID": "785efad8-3dfc-4de6-bc51-635139722fe7", - "_link": "https://data-pre.d4science.org/shub/E_c3hDNG51b09lcHA3aDU1cVN5RWxzRy9OK2hXblJQTkxKMUxSdnQ4MGRNcnRFTDNQNGQyOG5BUjZjcHREL2k3ag==", - "_name": "pos.shp" + "_storageID": "68b915f0-1f89-4f59-99ac-3c68413946c3", + "_link": "https://data-pre.d4science.org/shub/E_VTk5M3dtMExMMisrTlZUTW9DSHJYODhrVEZxcm9IelBaYkVLR1h2bzREUWVwTGlrT29XWTJrUW14cUlxUS9BSA==", + "_name": "area_indagine.shp" + }, + { + "_mimetype": "application/x-shapefile", + "_storageID": "ea02b126-d726-4c83-82c0-6feabbfa60ad", + "_link": "https://data-pre.d4science.org/shub/E_dUdGd2RhckVvbDhRcnN6ZERYUHIzZEpKdWFHdmpGQjlQVkFqc3ZwS1M4SU5XZzFFQkFJVEdTcytUN3djMklxdA==", + "_name": "area_indagine.shx" } ], "_materializations": [ { "_type": "gcube-sdi-layer", - "_ogcLinks": - [ - { - "wms": "https://geoserver1-t.pre.d4science.org/geoserver/profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c/wms?service=WMS&version=1.1.0&request=GetMap&layers=profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c:pos&styles=&bbox=8.620919,40.629750,8.621179,40.630258&srs=EPSG:4326&format=application/openlayers&width=400&height=400" - } - ], - "_bbox": - { - "_maxX": 8.621178639172953, - "_minX": 40.630257904721645, - "_maxY": 8.62091913167495, - "_minY": 40.62975046683799 - }, "_platformInfo": [ { "_type": "Geoserver", - "workspace": "profiledconcessioni_pred4s_preprod_prevre_622625b4af5159176f7c550c", - "layerName": "pos", - "persistencePath": "profiledConcessioni/622625b4af5159176f7c550c/95421181-001c-4e97-bc39-b2e04a30c7b7/pos", + "workspace": "profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03", + "_host": "geoserver1-t.pre.d4science.org", + "layerName": "area_indagine", + "storeName": "area_indagine_store", + "persistencePath": "profiledConcessioni/6385d4d5308f5c28c5ee0b03/7a84518f-79d9-4642-aa10-926e8f301d7f/area_indagine", "files": [ - "pos.shp" - ], - "storeName": "pos_store" + "area_indagine.cpg", + "area_indagine.dbf", + "area_indagine.prj", + "area_indagine.shp", + "area_indagine.shx" + ] } - ] + ], + "_bbox": + { + "_maxX": 12.50360458353915, + "_minX": 12.502705577032433, + "_maxY": 41.86836980685436, + "_minY": 41.867669715453225, + "_maxZ": 0.0, + "_minZ": 0.0 + }, + "_ogcLinks": + { + "wms": "https://geoserver1-t.pre.d4science.org/geoserver/profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03/wms?service=WMS&version=1.1.0&request=GetMap&layers=profiledconcessioni_pred4s_preprod_prevre_6385d4d5308f5c28c5ee0b03:area_indagine&styles=&bbox=12.502706,41.867670,12.503605,41.868370&srs=EPSG:4326&format=application/openlayers&width=400&height=400" + } } ] } - } - } + }, + "pianteFineScavo": + [ + { + "titolo": "Indagini non invasive presso il sito del cd. Sepolcro di Geta (via Appia Antica 39) pianta fine scavo", + "responsabile": "Dott.ssa Rachele Dubbini", + "authors": + [ + "" + ], + "paroleChiaveICCD": + [ + "Età imperiale" + ], + "paroleChiaveLibere": + [ + "Via Appia antica", + "Valle dell'Almone", + "Confini di Roma", + "Sepolcro di Geta" + ], + "topicCategory": "Society", + "subTopic": "Archeology", + "metodoRaccoltaDati": "", + "scalaAcquisizione": "", + "valutazioneQualita": "", + "abstractSection": "Planimetria georeferenziata dell'area indagata al termine delle attività", + "_creationInfo": + { + "_user": + { + "_username": "fabio.sinibaldi" + }, + "_context": + { + "_id": "/pred4s/preprod/preVRE", + "_name": "/preVRE" + }, + "_instant": "2022-11-29T10:45:57.124" + }, + "_access": + { + "_policy": "OPEN", + "_license": "CC0-1.0" + } + } + ] + }, + "_lock": null } \ No newline at end of file diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java index 86d23b3..b010430 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ClearProjects.java @@ -29,7 +29,7 @@ public class ClearProjects { TokenSetter.set(GCubeTest.getContext()); - Projects client=projects("profiledConcessioni").build();; + Projects client=projects("basic").build();; ArrayList toSkipIds=new ArrayList<>(); diff --git a/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java b/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java index 3247a3d..90909e8 100644 --- a/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java +++ b/use-cases/src/test/java/org/gcube/application/cms/usecases/ws/DescribeWSFolder.java @@ -1,6 +1,8 @@ package org.gcube.application.cms.usecases.ws; +import org.gcube.application.cms.tests.TestDocuments; import org.gcube.application.cms.tests.TokenSetter; +import org.gcube.application.geoportal.common.model.JSONPathWrapper; import org.gcube.common.storagehub.client.dsl.FolderContainer; import org.gcube.common.storagehub.client.dsl.StorageHubClient; import org.gcube.common.storagehub.model.exceptions.StorageHubException; @@ -18,16 +20,41 @@ public class DescribeWSFolder { static StorageHubClient shc =null; public static void main(String[] args) throws StorageHubException { - // String context="/gcube/devsec/devVRE"; - String context="/pred4s/preprod/preVRE"; -// String folderID="0518e4ad-0ef9-4cba-8d4f-8e315146acdd"; + String context="/gcube/devsec/devVRE"; +// context="/pred4s/preprod/preVRE"; + String folderID="ded73475-f9b1-46c8-94f8-5b35c60667ce"; +// folderID = "dd8c8609-0dfe-4dc8-a2b4-15c629e01413"; + + Boolean recursive = true; TokenSetter.set(context); shc= new StorageHubClient(); shc.openVREFolder().get().getDescription(); + + // NB LOADING FROM DOC + + JSONPathWrapper wrapper = new JSONPathWrapper(TestDocuments.documentMap.get("sdiIndexed.json").getTheDocument().toJson()); + + // Deleted folders for + for(Object s : wrapper.getByPath("$.._folderID")){ + try{ + folderID = s.toString(); + System.out.print("Checking "+folderID+"\t"); + System.out.println("FOUND "+shc.open(folderID).asFolder().get().getName()); + }catch (StorageHubException e){ + System.out.println("Message from SG HUB : "+e.getMessage()); + } + } + System.exit(1); + + + + + + FolderContainer folder=shc.open(folderID).asFolder(); // FolderContainer folder = WorkspaceManager.getApplicationBaseFolder(shc); @@ -70,4 +97,7 @@ public class DescribeWSFolder { value *= Long.signum(bytes); return String.format("%.1f %ciB", value / 1024.0, ci.current()); } + + + }