Merge pull request 'master' (#2) from master into beta

Reviewed-on: #2

pom.xml

@@ -38,7 +38,7 @@
         <dependency> <!-- this dependency includes dependency to uoa-authorization-library -->
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-admin-tools-library</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
         </dependency>
         <!--swagger-->
         <dependency>

src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java

@@ -7,6 +7,7 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.utils.RolesUtils;
+import eu.dnetlib.uoaadmintoolslibrary.services.PageService;
 import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -43,6 +44,9 @@ public class CommunityController {
     @Autowired
     private PortalService portalService;
 
+    @Autowired
+    private PageService pageService;
+
     @RequestMapping(value = {""}, method = RequestMethod.GET)
     public List<Portal> getAllCommunities() {
         return portalService.getAllPortalsByType("community");
@@ -73,6 +77,7 @@ public class CommunityController {
             layoutService.updatePid(old_pid, new_pid);
             notificationsService.updatePid(old_pid, new_pid);
             menuService.updatePid(old_pid, new_pid);
+            pageService.updatePid(old_pid, new_pid, portal.getType());
         }
 
         return portalResponse;

src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java

@@ -6,6 +6,7 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
 import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
+import eu.dnetlib.uoaadmintoolslibrary.services.PageService;
 import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -27,6 +28,9 @@ public class ConnectController {
     @Autowired
     private PortalService portalService;
 
+    @Autowired
+    private PageService pageService;
+
     @PreAuthorize("hasAnyAuthority(@AuthorizationService.PORTAL_ADMIN)")
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public PortalResponse updateConnect(@RequestBody Portal portal) {
@@ -35,12 +39,14 @@ public class ConnectController {
             throw new MismatchingContentException("Update Connect: Portal with id: " + portal.getId() + " has type: " + portal.getType() + " instead of connect");
         }
 
+        String old_pid = portalService.getPortalById(portal.getId()).getPid();
+        String new_pid = portal.getPid();
+
         PortalResponse portalResponse = portalService.updatePortal(portal);
 
-        String old_pid = portalResponse.getPid();
-        String new_pid = portal.getPid();
         if (!old_pid.equals(new_pid)) {
             layoutService.updatePid(old_pid, new_pid);
+            pageService.updatePid(old_pid, new_pid, portal.getType());
         }
 
         return portalResponse;

src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java

@@ -4,6 +4,7 @@ import eu.dnetlib.uoaadmintoolslibrary.entities.Portal;
 import eu.dnetlib.uoaadmintoolslibrary.entities.fullEntities.PortalResponse;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.ContentNotFoundException;
 import eu.dnetlib.uoaadmintoolslibrary.handlers.MismatchingContentException;
+import eu.dnetlib.uoaadmintoolslibrary.services.PageService;
 import eu.dnetlib.uoaadmintoolslibrary.services.PortalService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -23,13 +24,23 @@ public class ExploreController {
     @Autowired
     private PortalService portalService;
 
+    @Autowired
+    private PageService pageService;
+
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     public PortalResponse updateExplore(@RequestBody Portal portal) {
         if(!portal.getType().equals("explore")) {
             // EXCEPTION - MismatchingContent
             throw new MismatchingContentException("Update Explore: Portal with id: "+portal.getId()+" has type: "+portal.getType()+" instead of explore");
         }
+        String old_pid = portalService.getPortalById(portal.getId()).getPid();
+        String new_pid = portal.getPid();
+
         PortalResponse portalResponse = portalService.updatePortal(portal);
+
+        if (!old_pid.equals(new_pid)) {
+            pageService.updatePid(old_pid, new_pid, portal.getType());
+        }
         return portalResponse;
     }