diff --git a/CHANGELOG.md b/CHANGELOG.md index 703fa54..e48d2de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.3.0-SNAPSHOT] - 2021-01-27 + +#### Enhancements + +[#20435] Client integration with mongo + ## [v1.2.0] - 2020-12-18 diff --git a/pom.xml b/pom.xml index 2aa82a1..51a8111 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.gcube.portlets.user geoportal-data-entry-app war - 1.2.0 + 1.3.0-SNAPSHOT GeoPortal Data Entry App The GeoPortal Data Entry App is an application to build the web forms for data entries needed to GeoNa project @@ -122,8 +122,8 @@ org.gcube.application - geoportal-logic - [1.0.8, 2.0.0-SNAPSHOT) + geoportal-client + [1.0.0, 2.0.0-SNAPSHOT) compile diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java index 61bca5b..55e6846 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/ConvertToServiceModel.java @@ -8,11 +8,11 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.gcube.application.geoportal.model.AccessPolicy; -import org.gcube.application.geoportal.model.concessioni.Concessione; -import org.gcube.application.geoportal.model.concessioni.LayerConcessione; -import org.gcube.application.geoportal.model.concessioni.RelazioneScavo; -import org.gcube.application.geoportal.model.content.UploadedImage; +import org.gcube.application.geoportal.common.model.legacy.AccessPolicy; +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.model.legacy.LayerConcessione; +import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; +import org.gcube.application.geoportal.common.model.legacy.UploadedImage; import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp; import org.gcube.portlets.widgets.mpformbuilder.shared.GenericDatasetBean; import org.gcube.vomanagement.usermanagement.model.GCubeUser; diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java index 152bc50..69ef999 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/server/GeoportalDataEntryServiceImpl.java @@ -1,20 +1,29 @@ package org.gcube.portlets.user.geoportaldataentry.server; +import static org.gcube.application.geoportal.client.GeoportalAbstractPlugin.mongoConcessioni; + import java.io.FileInputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.gcube.application.geoportal.managers.ConcessioneManager; -import org.gcube.application.geoportal.managers.ManagerFactory; -import org.gcube.application.geoportal.model.InputStreamDescriptor; -import org.gcube.application.geoportal.model.Record; -import org.gcube.application.geoportal.model.concessioni.Concessione; -import org.gcube.application.geoportal.model.concessioni.LayerConcessione; -import org.gcube.application.geoportal.model.concessioni.RelazioneScavo; -import org.gcube.application.geoportal.model.content.UploadedImage; -import org.gcube.application.geoportal.model.report.PublicationReport; +import org.gcube.application.geoportal.common.model.legacy.Concessione; +import org.gcube.application.geoportal.common.model.legacy.Concessione.Paths; +import org.gcube.application.geoportal.common.model.legacy.InputStreamDescriptor; +import org.gcube.application.geoportal.common.model.legacy.RelazioneScavo; +import org.gcube.application.geoportal.common.rest.AddSectionToConcessioneRequest; +import org.gcube.application.geoportal.common.rest.MongoConcessioni; +import org.gcube.application.geoportal.common.rest.TempFile; +//import org.gcube.application.geoportal.managers.ConcessioneManager; +//import org.gcube.application.geoportal.managers.ManagerFactory; +//import org.gcube.application.geoportal.model.InputStreamDescriptor; +//import org.gcube.application.geoportal.model.Record; +//import org.gcube.application.geoportal.model.concessioni.Concessione; +//import org.gcube.application.geoportal.model.concessioni.LayerConcessione; +//import org.gcube.application.geoportal.model.concessioni.RelazioneScavo; +//import org.gcube.application.geoportal.model.content.UploadedImage; +//import org.gcube.application.geoportal.model.report.PublicationReport; import org.gcube.application.geoportalcommon.GeoportalCommon; import org.gcube.application.geoportalcommon.shared.GeoNaItemRef; import org.gcube.portlets.user.geoportaldataentry.client.ConcessioniFormCardTitle; @@ -76,7 +85,9 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen GCubeUser user = SessionUtil.getCurrentUser(this.getThreadLocalRequest()); - ConcessioneManager manager; + Concessione c; + + MongoConcessioni client = mongoConcessioni().build(); try { @@ -96,7 +107,10 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen // saving into back-end SessionUtil.getCurrentContext(this.getThreadLocalRequest(), true); - manager = ManagerFactory.registerNew(concessione); + //manager = ManagerFactory.registerNew(concessione); + + //Register New Concessione + c=client.createNew(concessione); // ABSTRACT_RELAZIONE_DI_SCAVO list = toMap.get(ConcessioniFormCardTitle.ABSTRACT_RELAZIONE_DI_SCAVO); @@ -122,12 +136,21 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen LOG.debug(ConcessioniFormCardTitle.RELAZIONE_DI_SCAVO + " building with client obj: " + rds); RelazioneScavo relazioneDiScavo = ConvertToServiceModel.toRelazioneScavo(abstractRelazioneDiScavo, rds); LOG.debug("Built " + ConcessioniFormCardTitle.RELAZIONE_DI_SCAVO + " as server obj: " + relazioneDiScavo); + //Setting Relazione + c.setRelazioneScavo(relazioneDiScavo); // Should be only one + // Upload file to Concessione Section by Path (e.g. Relazione) + List files = new ArrayList(rds.getFilesUploaded().size()); for (FileUploaded fileUploaded : rds.getFilesUploaded()) { FileInputStream fis = new FileInputStream(fileUploaded.getTempSystemPath()); InputStreamDescriptor isd = new InputStreamDescriptor(fis, fileUploaded.getFileName()); // saving into back-end - manager.setRelazioneScavo(relazioneDiScavo, isd); + + files.add(new TempFile(id, filename))??? + AddSectionToConcessioneRequest request= new AddSectionToConcessioneRequest(Paths.RELAZIONE, files); + + String mongoId = c.getMongo_id(); + client.setRelazioneScavo(relazioneDiScavo, isd); } // IMMAGINI_RAPPRESENTATIVE