From 03779582ad729d273e20856dd7f35a339aa8a302 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 15 Dec 2021 15:43:36 +0100 Subject: [PATCH] integrated with WhereClause --- .../geoportaldataentry/client/ui/GeonaMainTabPanel.java | 7 ++++++- .../server/GeoportalDataEntryServiceImpl.java | 2 -- .../portlets/user/geoportaldataentry/client/TestClass.java | 6 ++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java index 462bfbd..7b3b4fc 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java @@ -7,7 +7,9 @@ import java.util.Map; import org.gcube.application.geoportalcommon.shared.ItemField; import org.gcube.application.geoportalcommon.shared.SearchingFilter; +import org.gcube.application.geoportalcommon.shared.SearchingFilter.LOGICAL_OP; import org.gcube.application.geoportalcommon.shared.SearchingFilter.ORDER; +import org.gcube.application.geoportalcommon.shared.WhereClause; import org.gcube.application.geoportalcommon.shared.config.ACTION_ON_ITEM; import org.gcube.application.geoportalcommon.shared.products.ConcessioneDV; import org.gcube.portlets.user.geoportaldataentry.client.ConstantsGeoPortalDataEntryApp.RECORD_TYPE; @@ -438,7 +440,10 @@ public class GeonaMainTabPanel extends Composite { } } searchInto.put(searchForField, searchText); - searchingFilter.setSearchInto(searchInto); + WhereClause where = new WhereClause(); + where.setSearchInto(searchInto); + where.setOperator(LOGICAL_OP.OR); + searchingFilter.setConditions(Arrays.asList(where)); } return searchingFilter; } 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 1400d6f..9725262 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 @@ -426,8 +426,6 @@ public class GeoportalDataEntryServiceImpl extends RemoteServiceServlet implemen SessionUtil.getCurrentContext(getThreadLocalRequest(), true); MongoServiceCommon serviceCommon = new MongoServiceCommon(); -// MongoServiceUtil serviceUtil = new MongoServiceUtil(); -// MongoConcessioni clientMongo = serviceUtil.getInstanceMongoConcessioni(); // TODO MUST BE REPLACED BY COUNT List listOfConcessioni = SessionUtil.getListOfConcessioni(getThreadLocalRequest(), diff --git a/src/test/java/org/gcube/portlets/user/geoportaldataentry/client/TestClass.java b/src/test/java/org/gcube/portlets/user/geoportaldataentry/client/TestClass.java index 417b437..4119769 100644 --- a/src/test/java/org/gcube/portlets/user/geoportaldataentry/client/TestClass.java +++ b/src/test/java/org/gcube/portlets/user/geoportaldataentry/client/TestClass.java @@ -16,10 +16,8 @@ import org.gcube.application.geoportal.common.model.rest.QueryRequest.OrderedReq import org.gcube.application.geoportal.common.model.rest.QueryRequest.OrderedRequest.Direction; import org.gcube.application.geoportal.common.model.rest.QueryRequest.PagedRequest; import org.gcube.application.geoportal.common.rest.MongoConcessioni; -import org.gcube.application.geoportalcommon.config.GNADataConfigProfileReader; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.api.ScopeProvider; -import org.junit.Before; import com.mongodb.BasicDBList; import com.mongodb.BasicDBObject; @@ -31,7 +29,7 @@ public class TestClass { private static String CONTEXT = "/gcube/devsec/devVRE"; private static String USERNAME = "francesco.mangiacrapa"; - @Before + //@Before public void init() { ScopeProvider.instance.set(CONTEXT); SecurityTokenProvider.instance.set(TOKEN); @@ -55,7 +53,7 @@ public class TestClass { } } - // @Test + //@Test public void queryConcessioniTest() throws Exception { try { MongoConcessioni clientMongo = mongoConcessioni().build();