From 675ea269cc8ebbba04271956fc8b9b32f8b67d68 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 3 May 2023 13:13:08 +0300 Subject: [PATCH 1/4] Admin Tools | log4j2: pom.xml: Updated version of uoa-admin-tools-library to 1.0.7 (previous 1.0.6) | CommunityController.java & ConnectController.java & ExploreController.java: In methods of update portal, if pid was changed, call also pageService.updatePid() --- pom.xml | 2 +- .../controllers/CommunityController.java | 5 +++++ .../uoaadmintools/controllers/ConnectController.java | 10 ++++++++-- .../uoaadmintools/controllers/ExploreController.java | 11 +++++++++++ 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 141da51..c1030a4 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ eu.dnetlib uoa-admin-tools-library - 1.0.6 + 1.0.7 diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java index 84e9f13..115d580 100644 --- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java +++ b/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 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; diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java index 3da4d68..0edb39a 100644 --- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ConnectController.java +++ b/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; diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java index a9b06c0..87edf69 100644 --- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/ExploreController.java +++ b/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; } From 0116120843b716cb86c7564541e6ee73f7cb4d7d Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 19 May 2023 16:50:33 +0300 Subject: [PATCH 2/4] Pom: Add spring-boot-version in maven-plugin --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 141da51..3cb93e5 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring-boot-version} eu.dnetlib.uoaadmintools.UoaAdminToolsApplication true From 87d4ffa8b3b7e903dbf6716c03f5c31a13532faf Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 30 Jun 2023 13:53:26 +0300 Subject: [PATCH 3/4] Fix RoleUtils --- pom.xml | 2 +- .../dnetlib/uoaadmintools/controllers/CommunityController.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8f1edd1..d0d19d8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ eu.dnetlib uoa-admin-tools-library - 1.0.7 + 1.0.8 diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java index 115d580..52696b0 100644 --- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java +++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/CommunityController.java @@ -102,8 +102,6 @@ public class CommunityController { @PreAuthorize("hasAnyAuthority(@AuthorizationService.PORTAL_ADMIN)") @RequestMapping(value = "/delete", method = RequestMethod.POST) public Boolean deleteCommunities(@RequestBody List portals) throws Exception { - List roles = rolesUtils.getRoles(); - for (String id: portals) { Portal portal = portalService.getPortalById(id); if(portal == null) { From 61096bf7eae2aaf1a3cd9a4485b6ea018bfe3905 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 3 Apr 2024 14:55:30 +0300 Subject: [PATCH 4/4] Update admin tools library --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d0d19d8..4fd6fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ eu.dnetlib uoa-admin-tools-library - 1.0.8 + 1.0.11