D-Net
/
dnet-applications
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new_model_for_communities #15

Merged
michele.artini merged 81 commits from new_model_for_communities into master 2023-10-24 08:12:26 +02:00
Conversation 0 Commits 81 Files Changed 70 +14 -8
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 096b229c5a - Show all commits

6
apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityApiController.java
View File

@ -664,7 +664,8 @@ public class CommunityApiController {
})
public Set<String> addPropagationOrganizationForCommunity(@PathVariable final String id,
@RequestParam final String organizationId) throws CommunityException {
return communityService.addPropagationOrganizationForCommunity(id, organizationId);
return communityService.addPropagationOrganizationForCommunity(id, organizationId.split(","));
}
@RequestMapping(value = "/community/{id}/propagationOrganizations", produces = {
@ -680,7 +681,8 @@ public class CommunityApiController {
})
public Set<String> removePropagationOrganizationForCommunity(@PathVariable final String id,
@RequestParam final String organizationId) throws CommunityException {
return communityService.removePropagationOrganizationForCommunity(id, organizationId);
return communityService.removePropagationOrganizationForCommunity(id, organizationId.split(","));
}
}

16
apps/dnet-exporter-api/src/main/java/eu/dnetlib/openaire/community/CommunityService.java
View File

@ -512,10 +512,12 @@ public class CommunityService {
}
@Transactional
public Set<String> addPropagationOrganizationForCommunity(final String communityId, final String organizationId) throws CommunityException {
public Set<String> addPropagationOrganizationForCommunity(final String communityId, final String... organizationIds) throws CommunityException {
try {
final DbOrganization o = new DbOrganization(communityId, organizationId);
dbOrganizationRepository.save(o);
for (final String orgId : organizationIds) {
final DbOrganization o = new DbOrganization(communityId.trim(), orgId.trim());
dbOrganizationRepository.save(o);
}
return getPropagationOrganizationsForCommunity(communityId);
} catch (final Throwable e) {
log.error(e);
@ -524,10 +526,12 @@ public class CommunityService {
}
@Transactional
public Set<String> removePropagationOrganizationForCommunity(final String communityId, final String organizationId) throws CommunityException {
public Set<String> removePropagationOrganizationForCommunity(final String communityId, final String... organizationIds) throws CommunityException {
try {
final DbOrganization o = new DbOrganization(communityId, organizationId);
dbOrganizationRepository.delete(o);
for (final String orgId : organizationIds) {
final DbOrganization o = new DbOrganization(communityId.trim(), orgId.trim());
dbOrganizationRepository.delete(o);
}
return getPropagationOrganizationsForCommunity(communityId);
} catch (final Throwable e) {
log.error(e);