diff --git a/geoportal-service/pom.xml b/geoportal-service/pom.xml index 079004c..2d5052f 100644 --- a/geoportal-service/pom.xml +++ b/geoportal-service/pom.xml @@ -125,34 +125,6 @@ - - - - - - - - net.postgis - postgis-jdbc - 2.5.0 - - - - - org.gcube.spatial.data - gis-interface - [2.4.6,3.0.0) - - - - - - org.gcube.data.transfer - data-transfer-library - [1.2.1,2.0.0] - - - diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java new file mode 100644 index 0000000..29d8f8b --- /dev/null +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/ManagementUseCases.java @@ -0,0 +1,30 @@ +package org.gcube.application.geoportal.service.engine.mongo; + +import com.mongodb.client.model.Projections; +import org.bson.BsonType; +import org.bson.Document; +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.junit.Test; + +import static com.mongodb.client.model.Filters.exists; +import static com.mongodb.client.model.Filters.type; + +public class ManagementUseCases extends MongoTests { + + + @Test + public void deleteByQuery() throws ConfigurationException { + MongoTester tester = new MongoTester("profiledConcessioni"); + + System.out.println("Using builders.."); + tester.getCollection(). + find(type("_profileID", BsonType.NULL)) +// find(exists("profileID",false)) + .forEach(printBlock); + +// deleteMany(type("_profileID", BsonType.NULL)); + + } + + +} diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java new file mode 100644 index 0000000..7d7be3a --- /dev/null +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTester.java @@ -0,0 +1,28 @@ +package org.gcube.application.geoportal.service.engine.mongo; + +import org.gcube.application.geoportal.common.model.rest.ConfigurationException; +import org.gcube.application.geoportal.service.model.internal.db.Mongo; + +public class MongoTester extends MongoManager { + + public static final MongoTester getLegacy() throws ConfigurationException { + return new MongoTester("legacyConcessioni",ID);} + + + private String theID=null; + + + + public MongoTester(String profile) throws ConfigurationException { + this(profile,ID); + } + public MongoTester(String profile,String id) throws ConfigurationException { + init(profile); + theID=id; + } + + @Override + protected String mongoIDFieldName() { + return theID; + } +} diff --git a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java index 77a14c9..7d7f61d 100644 --- a/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java +++ b/geoportal-service/src/test/java/org/gcube/application/geoportal/service/engine/mongo/MongoTests.java @@ -2,14 +2,11 @@ package org.gcube.application.geoportal.service.engine.mongo; import com.fasterxml.jackson.core.JsonProcessingException; import com.mongodb.Block; -import com.mongodb.client.MongoCollection; -import com.mongodb.client.MongoDatabase; import com.mongodb.client.model.Projections; import org.bson.Document; import org.gcube.application.cms.tests.TokenSetter; import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; -import org.gcube.application.geoportal.service.engine.mongo.MongoManager; import org.gcube.application.geoportal.service.engine.providers.MongoClientProvider; import org.gcube.application.geoportal.service.model.internal.db.Mongo; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; @@ -22,18 +19,6 @@ import static org.junit.Assume.assumeTrue; public class MongoTests { - public static class MongoTester extends MongoManager { - - public MongoTester() throws ConfigurationException { - init("legacyConcessioni"); - } - - @Override - protected String mongoIDFieldName() { - return ID; - } - } - @BeforeClass public static final void init() { @@ -73,7 +58,7 @@ public class MongoTests { @Test public void queries() throws ConfigurationException { assumeTrue(GCubeTest.isTestInfrastructureEnabled()); - MongoTester tester=new MongoTester(); + MongoTester tester=MongoTester.getLegacy(); System.out.println("Using builders.."); tester.getCollection().find(Document.parse("{\"report.status\" : \"WARNING\"}")). projection(Projections.include("nome")).forEach(printBlock); 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 eb5a23a..60c52d9 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 @@ -68,7 +68,8 @@ public class ProfiledConcessioniTests extends AbstractProfiledDocumentsTests{ // invoke step SUBMIT-FOR-REVIEW StepExecutionRequest submitReq=new StepExecutionRequest(); submitReq.setStepID("SUBMIT-FOR-REVIEW"); - doc=step(doc.getId(),submitReq); +// doc=step(doc.getId(),submitReq); + doc=step("630f912755e2947b0278c1be",submitReq); System.out.println(doc); assertTrue(doc.getLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK));