From dde8e1c564c4c6693d42f297882b1a812fd63d90 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Wed, 5 Jul 2023 11:41:26 +0200
Subject: [PATCH] fixed a bug

---
 .../openaire/community/CommunityApiController.java     |  8 ++++----
 .../dnetlib/openaire/community/CommunityService.java   | 10 +++++-----
 .../openaire/community/model/DbSupportOrgPK.java       |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java
index 8a227ebf..450d5562 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java
@@ -346,9 +346,9 @@ public class CommunityApiController {
 	})
 	public void removeCommunityOrganization(
 		@PathVariable final String id,
-		@RequestParam final String organizationId) throws CommunityException {
+		@RequestParam final String organizationName) throws CommunityException {
 
-		communityService.removeCommunityOrganizations(id, organizationId);
+		communityService.removeCommunityOrganizations(id, organizationName);
 	}
 
 	@RequestMapping(value = "/community/{id}/organizationList", produces = {
@@ -364,9 +364,9 @@ public class CommunityApiController {
 	})
 	public void removeCommunityOrganizationList(
 		@PathVariable final String id,
-		@RequestBody final String[] orgsIdList) throws CommunityException {
+		@RequestBody final String[] orgNames) throws CommunityException {
 
-		communityService.removeCommunityOrganizations(id, orgsIdList);
+		communityService.removeCommunityOrganizations(id, orgNames);
 	}
 
 	// **********************
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java
index d7bd5889..b6d437c3 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java
@@ -23,11 +23,11 @@ import eu.dnetlib.openaire.community.model.DbCommunity;
 import eu.dnetlib.openaire.community.model.DbDatasource;
 import eu.dnetlib.openaire.community.model.DbDatasourcePK;
 import eu.dnetlib.openaire.community.model.DbOrganization;
-import eu.dnetlib.openaire.community.model.DbOrganizationPK;
 import eu.dnetlib.openaire.community.model.DbProject;
 import eu.dnetlib.openaire.community.model.DbProjectPK;
 import eu.dnetlib.openaire.community.model.DbSubCommunity;
 import eu.dnetlib.openaire.community.model.DbSupportOrg;
+import eu.dnetlib.openaire.community.model.DbSupportOrgPK;
 import eu.dnetlib.openaire.community.repository.DbCommunityRepository;
 import eu.dnetlib.openaire.community.repository.DbDatasourceRepository;
 import eu.dnetlib.openaire.community.repository.DbOrganizationRepository;
@@ -206,12 +206,12 @@ public class CommunityService {
 	}
 
 	@Transactional
-	public void removeCommunityOrganizations(final String id, final String... ids) throws CommunityException {
+	public void removeCommunityOrganizations(final String id, final String... orgNames) throws CommunityException {
 		try {
-			final List<DbOrganizationPK> list = Arrays.stream(ids)
-				.map(orgId -> new DbOrganizationPK(id, orgId))
+			final List<DbSupportOrgPK> list = Arrays.stream(orgNames)
+				.map(name -> new DbSupportOrgPK(id, name))
 				.collect(Collectors.toList());
-			dbOrganizationRepository.deleteAllById(list);
+			dbSupportOrgRepository.deleteAllById(list);
 		} catch (final Throwable e) {
 			log.error(e);
 			throw new CommunityException(e);
diff --git a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java
index 57e312dd..616e2659 100644
--- a/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java
+++ b/apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/model/DbSupportOrgPK.java
@@ -11,6 +11,13 @@ public class DbSupportOrgPK implements Serializable {
 
 	private String orgName;
 
+	public DbSupportOrgPK() {}
+
+	public DbSupportOrgPK(final String community, final String orgName) {
+		this.community = community;
+		this.orgName = orgName;
+	}
+
 	public String getCommunity() {
 		return community;
 	}