From de99335a568b9fb5ffc916510217824aa132efed Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 14 Jul 2022 17:18:20 +0200
Subject: [PATCH] Fixed listing with multiple organization

---
 CHANGELOG.md                                       |  4 +++-
 pom.xml                                            |  2 +-
 .../gcube/gcat/persistence/ckan/CKANPackage.java   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8c3eef..ce2225e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for gCube Catalogue (gCat) Service
 
-## [v2.3.0]
+## [v2.3.0-SNAPSHOT]
 
 - Switched moderation messages to notification [#23317]
+- Item listing returns items in the default organization and not in all supported organization
+
 
 ## [v2.2.0]
 
diff --git a/pom.xml b/pom.xml
index ca9d990..d14dac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<groupId>org.gcube.data-catalogue</groupId>
 	<artifactId>gcat</artifactId>
 	<packaging>war</packaging>
-	<version>2.3.0</version>
+	<version>2.3.0-SNAPSHOT</version>
 	<name>gCube Catalogue (gCat) Service</name>
 	<description>
 		This service allows any client to publish on the gCube Catalogue.
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
index b221991..9c822a5 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
@@ -536,6 +536,18 @@ public class CKANPackage extends CKAN implements Moderated {
 	
 	protected String getFilterForOrganizations() {
 		StringWriter stringWriter = new StringWriter();
+		
+		stringWriter.append(String.format(GCatConstants.ORGANIZATION_FILTER_TEMPLATE, configuration.getDefaultOrganization()));
+		
+		
+		/* 
+		 * TODO
+		 * 
+		 * This generated something like: 
+		 * organization:orgfortesting OR organization:prevre OR organization:data_inrae
+		 * and it seems not working
+		 * I need to investigate better this part.
+		 *
 		int i=1;
 		for(String organizationName : configuration.getSupportedOrganizations()) {
 			stringWriter.append(String.format(GCatConstants.ORGANIZATION_FILTER_TEMPLATE, organizationName));
@@ -546,6 +558,8 @@ public class CKANPackage extends CKAN implements Moderated {
 			}
 			i++;
 		}
+		*/
+		
 		return stringWriter.toString();
 	}