[Trunk | Monitor Service]: 1.. pom.xml: Updated version of admin-tools-library to 1.0.5 (used to be 1.0.4) | 2. StakeholderController.java: In method "buildFullStakeholder()", when creating Stakeholder, create Portal if not exists (pid = alias) and in method "deleteStakeholder()", when deleting a Stakeholder, delete Portal as well.
This commit is contained in:
parent
99161920d5
commit
a03001c90e
2
pom.xml
2
pom.xml
|
@ -84,7 +84,7 @@
|
||||||
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
<dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-admin-tools-library</artifactId>
|
<artifactId>uoa-admin-tools-library</artifactId>
|
||||||
<version>1.0.4</version>
|
<version>1.0.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
package eu.dnetlib.uoamonitorservice.controllers;
|
package eu.dnetlib.uoamonitorservice.controllers;
|
||||||
|
|
||||||
|
import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
|
||||||
|
import eu.dnetlib.uoaadmintoolslibrary.entities.PortalType;
|
||||||
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
|
import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
|
||||||
|
import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
|
||||||
import eu.dnetlib.uoamonitorservice.dao.*;
|
import eu.dnetlib.uoamonitorservice.dao.*;
|
||||||
import eu.dnetlib.uoamonitorservice.entities.*;
|
import eu.dnetlib.uoamonitorservice.entities.*;
|
||||||
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
|
import eu.dnetlib.uoamonitorservice.handlers.EntityNotFoundException;
|
||||||
|
@ -13,10 +16,7 @@ import org.springframework.security.access.AuthorizationServiceException;
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Date;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@CrossOrigin(origins = "*")
|
@CrossOrigin(origins = "*")
|
||||||
|
@ -47,6 +47,9 @@ public class StakeholderController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private TopicController topicController;
|
private TopicController topicController;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private PortalService portalService;
|
||||||
|
|
||||||
@PreAuthorize("isAuthenticated()")
|
@PreAuthorize("isAuthenticated()")
|
||||||
@RequestMapping(value = "/stakeholder/alias", method = RequestMethod.GET)
|
@RequestMapping(value = "/stakeholder/alias", method = RequestMethod.GET)
|
||||||
public List<String> getAllReservedStakeholderAlias() {
|
public List<String> getAllReservedStakeholderAlias() {
|
||||||
|
@ -96,6 +99,16 @@ public class StakeholderController {
|
||||||
|
|
||||||
Stakeholder<String> stakeholderSaved = stakeholderDAO.save(stakeholder);
|
Stakeholder<String> stakeholderSaved = stakeholderDAO.save(stakeholder);
|
||||||
stakeholderFull.setId(stakeholderSaved.getId());
|
stakeholderFull.setId(stakeholderSaved.getId());
|
||||||
|
|
||||||
|
Portal portal = portalService.getPortal(stakeholderFull.getAlias());
|
||||||
|
if(portal == null) {
|
||||||
|
portal = new Portal();
|
||||||
|
portal.setPid(stakeholderFull.getAlias());
|
||||||
|
portal.setName(stakeholderFull.getName());
|
||||||
|
portal.setType(stakeholderFull.getType());
|
||||||
|
portalService.insertPortal(portal);
|
||||||
|
}
|
||||||
|
|
||||||
return stakeholderFull;
|
return stakeholderFull;
|
||||||
//return null;
|
//return null;
|
||||||
}
|
}
|
||||||
|
@ -548,8 +561,10 @@ public class StakeholderController {
|
||||||
log.debug("Id: "+stakeholderId);
|
log.debug("Id: "+stakeholderId);
|
||||||
|
|
||||||
Stakeholder<String> stakeholder = stakeholderDAO.findById(stakeholderId);
|
Stakeholder<String> stakeholder = stakeholderDAO.findById(stakeholderId);
|
||||||
|
String pid = null;
|
||||||
|
|
||||||
if(stakeholder != null) {
|
if(stakeholder != null) {
|
||||||
|
pid = stakeholder.getAlias();
|
||||||
// List<String> roles = authorizationService.getRoles();
|
// List<String> roles = authorizationService.getRoles();
|
||||||
List<String> roles = rolesUtils.getRoles();
|
List<String> roles = rolesUtils.getRoles();
|
||||||
|
|
||||||
|
@ -623,6 +638,11 @@ public class StakeholderController {
|
||||||
stakeholder.setTopics(null);
|
stakeholder.setTopics(null);
|
||||||
stakeholderDAO.delete(stakeholderId);
|
stakeholderDAO.delete(stakeholderId);
|
||||||
log.debug("Stakeholder deleted!");
|
log.debug("Stakeholder deleted!");
|
||||||
|
|
||||||
|
Portal portal = portalService.getPortal(pid);
|
||||||
|
if(portal != null) {
|
||||||
|
portalService.deletePortal(portal.getId());
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// EXCEPTION - Stakeholder not found
|
// EXCEPTION - Stakeholder not found
|
||||||
throw new EntityNotFoundException("Delete stakeholder: Stakeholder with id: "+stakeholderId+" not found");
|
throw new EntityNotFoundException("Delete stakeholder: Stakeholder with id: "+stakeholderId+" not found");
|
||||||
|
|
Loading…
Reference in New Issue