MaDgIK
/
uoa-admin-tools-library
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Trunk - Admin tools library Service]: Commit r58031 was not completed. 

DivIdService.java, PageService.java: In all controllers/services use methods only from services (except for entity's DAO).
This commit is contained in:
Konstantina Galouni 2020-01-30 12:22:02 +00:00
parent 9f65227b39
commit 1872dbc4ab
2 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java
View File

@ -1,6 +1,5 @@
package eu.dnetlib.uoaadmintoolslibrary.services;
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivHelpContentController;
import eu.dnetlib.uoaadmintoolslibrary.dao.DivIdDAO;
import eu.dnetlib.uoaadmintoolslibrary.entities.DivId;
import eu.dnetlib.uoaadmintoolslibrary.entities.Page;
@ -28,7 +27,7 @@ public class DivIdService {
private PortalService portalService;
@Autowired
private DivHelpContentController divHelpContentController;
private DivHelpContentService divHelpContentService;
public List<DivId> getDivIds(String page, String name, String pid) {
Portal portal = portalService.getPortal(pid);
@ -113,6 +112,10 @@ public class DivIdService {
divIdDAO.deleteAll();
}
public DivId insertOrUpdateDivId(DivId divId) {
return divIdDAO.save(divId);
}
public DivIdResponse insertDivId(DivIdResponse divIdResponse) {
DivId divId = this.getDivIdByDivIdResponse(divIdResponse);
@ -150,18 +153,18 @@ public class DivIdService {
// List<Portal> communities = communityController.getAllPortals();
// for( Portal community : communities ) {
// if(!community.getPid().equals("openaire") && !community.getPid().equals("connect")) {
// divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// }
// }
// }
// if(openaireEnabled && !divIdOld.getOpenaire()) {
// Portal community = communityController.getPortal("openaire");
// divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// }
//
// if(connectEnabled && !divIdOld.getConnect()) {
// Portal community = communityController.getPortal("connect");
// divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
// }
//
// if(!divId.getCommunities()) {
@ -169,9 +172,9 @@ public class DivIdService {
// for( Portal community : communities ) {
// if(!community.getPid().equals("openaire") && !community.getPid().equals("connect")) {
// // delete div contents related to this divId
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(community.getPid(), null, divId.getName(), null);
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(community.getPid(), null, divId.getName(), null);
// for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
// divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
// divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
// }
// }
// }
@ -181,9 +184,9 @@ public class DivIdService {
// Portal community = communityController.getPortal("openaire");
//
// // delete div contents related to this divId
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents("openaire", null, divId.getName(), null);
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents("openaire", null, divId.getName(), null);
// for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
// divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
// divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
// }
// }
//
@ -191,9 +194,9 @@ public class DivIdService {
// Portal community = communityController.getPortal("connect");
//
// // delete div contents related to this divId
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents("connect", null, divId.getName(), null);
// List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents("connect", null, divId.getName(), null);
// for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
// divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
// divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
// }
// }
@ -208,9 +211,9 @@ public class DivIdService {
DivId divId = divIdDAO.findById(id);
// delete div contents related to this divId
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(null, null, divId.getName(), null);
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, null, divId.getName(), null);
for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
}
divIdDAO.delete(id);

48
src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java
View File

@ -1,10 +1,5 @@
package eu.dnetlib.uoaadmintoolslibrary.services;
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivHelpContentController;
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivIdController;
import eu.dnetlib.uoaadmintoolslibrary.controllers.EntityController;
import eu.dnetlib.uoaadmintoolslibrary.controllers.PageHelpContentController;
import eu.dnetlib.uoaadmintoolslibrary.dao.DivIdDAO;
import eu.dnetlib.uoaadmintoolslibrary.dao.PageDAO;
import eu.dnetlib.uoaadmintoolslibrary.entities.DivId;
import eu.dnetlib.uoaadmintoolslibrary.entities.Entity;
@ -31,19 +26,16 @@ public class PageService {
private PortalService portalService;
@Autowired
private DivIdDAO divIdDAO;
private PageHelpContentService pageHelpContentService;
@Autowired
private PageHelpContentController pageHelpContentController;
private DivHelpContentService divHelpContentService;
@Autowired
private DivHelpContentController divHelpContentController;
private DivIdService divIdService;
@Autowired
private DivIdController divIdController;
@Autowired
private EntityController entityController;
private EntityService entityService;
public List<PortalPage> getPagesFull(String pid, String page_route) {
@ -55,7 +47,7 @@ public class PageService {
PortalPage portalPage = new PortalPage(page);
List<Entity> entities = new ArrayList<>();
for(String entityId : page.getEntities()) {
entities.add(entityController.getEntity(entityId));
entities.add(entityService.getEntity(entityId));
}
portalPage.setEntities(entities);
@ -163,33 +155,33 @@ public class PageService {
if(!portalPage.getTop()) {
// delete page contents with position "top" related to this page from all portals
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "top", null, null);
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "top", null, null);
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
}
}
if(!portalPage.getBottom()) {
// delete page contents with position "bottom" related to this page from all portals
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "bottom", null, null);
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "bottom", null, null);
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
}
}
if(!portalPage.getLeft()) {
// delete page contents with position "left" related to this page from all portals
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "left", null, null);
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "left", null, null);
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
}
}
if(!portalPage.getRight()) {
// delete page contents with position "right" related to this page from all portals
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "right", null, null);
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "right", null, null);
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
}
}
}
@ -199,29 +191,29 @@ public class PageService {
pageDAO.delete(id);
// delete divIds related only to this page from all portals, otherwise remove this page from divIds
List<DivId> divIds = divIdController.getDivIds(id, null, null);
List<DivId> divIds = divIdService.getDivIds(id, null, null);
for(DivId divId : divIds) {
if(divId.getPages().size() == 1) {
divIdController.deleteDivId(divId.getId());
divIdService.deleteDivId(divId.getId());
// delete div contents related to this page from all portals
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(null, id, divId.getId(), null);
List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, id, divId.getId(), null);
for (DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
}
} else {
List<String> divIdPages = divId.getPages();
divIdPages.remove(id);
divId.setPages(divIdPages);
divIdDAO.save(divId);
divIdService.insertOrUpdateDivId(divId);
}
}
// delete page contents related to this page from all portals
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, id, null, null, null);
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, id, null, null, null);
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
}
// delete page from portals