Revision 58395
Added by Konstantina Galouni about 4 years ago
| PageService.java | ||
|---|---|---|
| 41 | 41 |
public List<PortalPage> getPagesFull(String pid, String page_route) {
|
| 42 | 42 |
|
| 43 | 43 |
List<Page> pages = this.getAllPages(pid, page_route, null); |
| 44 |
if(pages == null) {
|
|
| 45 |
return null; |
|
| 46 |
} |
|
| 44 | 47 |
|
| 45 | 48 |
List<PortalPage> portalPages = new ArrayList<>(); |
| 46 | 49 |
for(Page page : pages) {
|
| ... | ... | |
| 58 | 61 |
} |
| 59 | 62 |
|
| 60 | 63 |
public List<Page> getAllPages(String pid, String page_route, String with_positions) {
|
| 61 |
List<Page> pages; |
|
| 64 |
List<Page> pages = null;
|
|
| 62 | 65 |
if (pid != null) {
|
| 63 | 66 |
Portal portal = portalService.getPortal(pid); |
| 67 |
if(portal == null) {
|
|
| 68 |
return null; |
|
| 69 |
} |
|
| 70 |
|
|
| 64 | 71 |
String portalType = portal.getType(); |
| 65 | 72 |
|
| 66 | 73 |
if (page_route != null) {
|
| 67 | 74 |
pages = new ArrayList<Page>(); |
| 68 |
pages.add(pageDAO.findByPortalTypeAndRoute(portalType, page_route)); |
|
| 75 |
Page page = pageDAO.findByPortalTypeAndRoute(portalType, page_route); |
|
| 76 |
if(page != null) {
|
|
| 77 |
pages.add(page); |
|
| 78 |
} |
|
| 69 | 79 |
} else {
|
| 70 | 80 |
pages = pageDAO.findByPortalType(portalType); |
| 71 | 81 |
} |
| ... | ... | |
| 76 | 86 |
} |
| 77 | 87 |
|
| 78 | 88 |
if (with_positions != null) {
|
| 89 |
if(pages == null) {
|
|
| 90 |
return null; |
|
| 91 |
} |
|
| 92 |
|
|
| 79 | 93 |
boolean at_least_one_position = Boolean.parseBoolean(with_positions); |
| 80 | 94 |
|
| 81 | 95 |
Iterator<Page> iteratorPages = pages.iterator(); |
| ... | ... | |
| 93 | 107 |
} |
| 94 | 108 |
} |
| 95 | 109 |
} |
| 96 |
pages.sort(Comparator.comparing(Page::getName)); |
|
| 110 |
if(pages != null) {
|
|
| 111 |
pages.sort(Comparator.comparing(Page::getName)); |
|
| 112 |
} |
|
| 97 | 113 |
return pages; |
| 98 | 114 |
} |
| 99 | 115 |
|
| 116 |
public List<Page> getPagesByPortalType(String portalType) {
|
|
| 117 |
if (portalType == null) {
|
|
| 118 |
return null; |
|
| 119 |
} |
|
| 120 |
return pageDAO.findByPortalType(portalType); |
|
| 121 |
} |
|
| 122 |
|
|
| 123 |
public Page getPageByPortalTypeAndRoutegetPageByPortalTypeAndRoute(String portalType, String page_route) {
|
|
| 124 |
if (page_route == null || portalType == null) {
|
|
| 125 |
return null; |
|
| 126 |
} |
|
| 127 |
return pageDAO.findByPortalTypeAndRoute(portalType, page_route); |
|
| 128 |
} |
|
| 129 |
|
|
| 100 | 130 |
public void deleteAllPages() {
|
| 101 | 131 |
pageDAO.deleteAll(); |
| 102 | 132 |
} |
| ... | ... | |
| 155 | 185 |
|
| 156 | 186 |
if(!portalPage.getTop()) {
|
| 157 | 187 |
// delete page contents with position "top" related to this page from all portals |
| 158 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "top", null, null); |
|
| 188 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getPortalType(), portalPage.getRoute(), "top", null, null);
|
|
| 159 | 189 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
|
| 160 | 190 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
| 161 | 191 |
} |
| ... | ... | |
| 163 | 193 |
|
| 164 | 194 |
if(!portalPage.getBottom()) {
|
| 165 | 195 |
// delete page contents with position "bottom" related to this page from all portals |
| 166 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "bottom", null, null); |
|
| 196 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getPortalType(), portalPage.getRoute(), "bottom", null, null);
|
|
| 167 | 197 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
|
| 168 | 198 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
| 169 | 199 |
} |
| ... | ... | |
| 171 | 201 |
|
| 172 | 202 |
if(!portalPage.getLeft()) {
|
| 173 | 203 |
// delete page contents with position "left" related to this page from all portals |
| 174 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "left", null, null); |
|
| 204 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getPortalType(), portalPage.getRoute(), "left", null, null);
|
|
| 175 | 205 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
|
| 176 | 206 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
| 177 | 207 |
} |
| ... | ... | |
| 179 | 209 |
|
| 180 | 210 |
if(!portalPage.getRight()) {
|
| 181 | 211 |
// delete page contents with position "right" related to this page from all portals |
| 182 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "right", null, null); |
|
| 212 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getPortalType(), portalPage.getRoute(), "right", null, null);
|
|
| 183 | 213 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
|
| 184 | 214 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
| 185 | 215 |
} |
| ... | ... | |
| 188 | 218 |
|
| 189 | 219 |
public Boolean deletePages(List<String> pages) throws Exception {
|
| 190 | 220 |
for (String id: pages) {
|
| 221 |
Page page = pageDAO.findById(id); |
|
| 191 | 222 |
pageDAO.delete(id); |
| 192 | 223 |
|
| 193 | 224 |
// delete divIds related only to this page from all portals, otherwise remove this page from divIds |
| ... | ... | |
| 211 | 242 |
|
| 212 | 243 |
|
| 213 | 244 |
// delete page contents related to this page from all portals |
| 214 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, id, null, null, null); |
|
| 245 |
List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, page.getPortalType(), id, null, null, null);
|
|
| 215 | 246 |
for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
|
| 216 | 247 |
pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId()); |
| 217 | 248 |
} |
Also available in: Unified diff
[Trunk | Admin Tools Library Service]:
1. DivHelpContentController.java: In "getDivHelpContents()" (/divhelpcontent) method rename parameter "div" to "divId" | Delete unnecessary method "addDivHelpContentsInPortal()".
2. PageHelpContentController.java: In "getPageHelpContents()" (/pagehelpconent) method add request parameter "portalType".
3. PortalController.java: Controller added for common methods of "ExploreController", "ConnectController" and "CommunityController" in "Admin Tools Service" - @RequestMapping with multiple paths.
4. DivIdDAO.java & MongoDBDivIdDAO.java:
a. Method "findByName()" returns List with new schema.
b. Added methods: "List<DivId> findByPagesContainingAndPortalType()", "DivId findByPagesContainingAndNameAndPortalType()", "DivId findByNameAndPortalType()".
5. PortalDAO.java & MongoDBPortalDAO.java: Added method "findByType()".
6. Portal.java & PortalResponse.java: Removed "layout" field and its methods.
7. DivHelpContentService.java:
a. In "getDivHelpContents()" (/divhelpcontent) method rename parameter "div" to "divId"
b. public void addDivHelpContentsInPortal(String pid, String portalId, String divIdName) --> public void addDivHelpContentsInPortal(String portalId, String portalType)
8. DivIdService.java:
a. [Bug fix] "getDivIds()", "getDivIdsFull()", "deleteDivIds()", "getDivIdsPages()" methods
b. Added method "getDivIdsByPortalType()"
c. Commented "getDivIdByName()" method.
9. PageHelpContentService.java:
a. In "getPageHelpContents()" method add parameter "portalType" and do bug fixes.
b. public void addPageHelpContentsInPortal(String pid, String portalId) --> public void addPageHelpContentsInPortal(String portalId, String portalType).
10. PageService.java:
a. [Bug fix] "getPagesFull()", "getAllPages()", "deletePageHelpContentsForPositionsIfDisabled()" methods.
b. Added methods "getPagesByPortalType()" and "getPageByPortalTypeAndRoute()".
11. PortalService.java:
a. [Bug fix] "getPortalFull()".
b. Method "deletePortal()" renamed to "deletePortalId()" and added NEW "deletePortal()" which deletes related page and div contents (and if no portal with the same type, also pages and divIds).