Project

General

Profile

« Previous | Next » 

Revision 58041

[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).

View differences:

modules/uoa-admin-tools-library/trunk/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/DivIdService.java
1 1
package eu.dnetlib.uoaadmintoolslibrary.services;
2 2

  
3
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivHelpContentController;
4 3
import eu.dnetlib.uoaadmintoolslibrary.dao.DivIdDAO;
5 4
import eu.dnetlib.uoaadmintoolslibrary.entities.DivId;
6 5
import eu.dnetlib.uoaadmintoolslibrary.entities.Page;
......
28 27
    private PortalService portalService;
29 28

  
30 29
    @Autowired
31
    private DivHelpContentController divHelpContentController;
30
    private DivHelpContentService divHelpContentService;
32 31

  
33 32
    public List<DivId> getDivIds(String page, String name, String pid) {
34 33
        Portal portal = portalService.getPortal(pid);
......
113 112
        divIdDAO.deleteAll();
114 113
    }
115 114

  
115
    public DivId insertOrUpdateDivId(DivId divId) {
116
        return divIdDAO.save(divId);
117
    }
118

  
116 119
    public DivIdResponse insertDivId(DivIdResponse divIdResponse) {
117 120
        DivId divId = this.getDivIdByDivIdResponse(divIdResponse);
118 121

  
......
150 153
//            List<Portal> communities = communityController.getAllPortals();
151 154
//            for( Portal community : communities ) {
152 155
//                if(!community.getPid().equals("openaire") && !community.getPid().equals("connect")) {
153
//                    divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
156
//                    divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
154 157
//                }
155 158
//            }
156 159
//        }
157 160
//        if(openaireEnabled && !divIdOld.getOpenaire()) {
158 161
//            Portal community = communityController.getPortal("openaire");
159
//            divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
162
//            divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
160 163
//        }
161 164
//
162 165
//        if(connectEnabled && !divIdOld.getConnect()) {
163 166
//            Portal community = communityController.getPortal("connect");
164
//            divHelpContentController.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
167
//            divHelpContentService.addDivHelpContentsInPortal(community.getPid(), community.getId(), divId.getName());
165 168
//        }
166 169
//
167 170
//        if(!divId.getCommunities()) {
......
169 172
//            for( Portal community : communities ) {
170 173
//                if(!community.getPid().equals("openaire") && !community.getPid().equals("connect")) {
171 174
//                    // delete div contents related to this divId
172
//                    List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(community.getPid(), null, divId.getName(), null);
175
//                    List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(community.getPid(), null, divId.getName(), null);
173 176
//                    for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
174
//                        divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
177
//                        divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
175 178
//                    }
176 179
//                }
177 180
//            }
......
181 184
//            Portal community = communityController.getPortal("openaire");
182 185
//
183 186
//            // delete div contents related to this divId
184
//            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents("openaire", null, divId.getName(), null);
187
//            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents("openaire", null, divId.getName(), null);
185 188
//            for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
186
//                divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
189
//                divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
187 190
//            }
188 191
//        }
189 192
//
......
191 194
//            Portal community = communityController.getPortal("connect");
192 195
//
193 196
//            // delete div contents related to this divId
194
//            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents("connect", null, divId.getName(), null);
197
//            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents("connect", null, divId.getName(), null);
195 198
//            for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
196
//                divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
199
//                divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
197 200
//            }
198 201
//        }
199 202

  
......
208 211
            DivId divId = divIdDAO.findById(id);
209 212

  
210 213
            // delete div contents related to this divId
211
            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(null, null, divId.getName(), null);
214
            List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, null, divId.getName(), null);
212 215
            for(DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
213
                divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
216
                divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
214 217
            }
215 218

  
216 219
            divIdDAO.delete(id);
modules/uoa-admin-tools-library/trunk/src/main/java/eu/dnetlib/uoaadmintoolslibrary/services/PageService.java
1 1
package eu.dnetlib.uoaadmintoolslibrary.services;
2 2

  
3
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivHelpContentController;
4
import eu.dnetlib.uoaadmintoolslibrary.controllers.DivIdController;
5
import eu.dnetlib.uoaadmintoolslibrary.controllers.EntityController;
6
import eu.dnetlib.uoaadmintoolslibrary.controllers.PageHelpContentController;
7
import eu.dnetlib.uoaadmintoolslibrary.dao.DivIdDAO;
8 3
import eu.dnetlib.uoaadmintoolslibrary.dao.PageDAO;
9 4
import eu.dnetlib.uoaadmintoolslibrary.entities.DivId;
10 5
import eu.dnetlib.uoaadmintoolslibrary.entities.Entity;
......
31 26
    private PortalService portalService;
32 27

  
33 28
    @Autowired
34
    private DivIdDAO divIdDAO;
29
    private PageHelpContentService pageHelpContentService;
35 30

  
36 31
    @Autowired
37
    private PageHelpContentController pageHelpContentController;
32
    private DivHelpContentService divHelpContentService;
38 33

  
39 34
    @Autowired
40
    private DivHelpContentController divHelpContentController;
35
    private DivIdService divIdService;
41 36

  
42 37
    @Autowired
43
    private DivIdController divIdController;
38
    private EntityService entityService;
44 39

  
45
    @Autowired
46
    private EntityController entityController;
47 40

  
48

  
49 41
    public List<PortalPage> getPagesFull(String pid, String page_route) {
50 42

  
51 43
        List<Page> pages = this.getAllPages(pid, page_route, null);
......
55 47
            PortalPage portalPage = new PortalPage(page);
56 48
            List<Entity> entities = new ArrayList<>();
57 49
            for(String entityId : page.getEntities()) {
58
                entities.add(entityController.getEntity(entityId));
50
                entities.add(entityService.getEntity(entityId));
59 51
            }
60 52
            portalPage.setEntities(entities);
61 53

  
......
163 155

  
164 156
        if(!portalPage.getTop()) {
165 157
            // delete page contents with position "top" related to this page from all portals
166
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "top", null, null);
158
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "top", null, null);
167 159
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
168
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
160
                pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
169 161
            }
170 162
        }
171 163

  
172 164
        if(!portalPage.getBottom()) {
173 165
            // delete page contents with position "bottom" related to this page from all portals
174
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "bottom", null, null);
166
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "bottom", null, null);
175 167
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
176
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
168
                pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
177 169
            }
178 170
        }
179 171

  
180 172
        if(!portalPage.getLeft()) {
181 173
            // delete page contents with position "left" related to this page from all portals
182
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "left", null, null);
174
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "left", null, null);
183 175
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
184
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
176
                pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
185 177
            }
186 178
        }
187 179

  
188 180
        if(!portalPage.getRight()) {
189 181
            // delete page contents with position "right" related to this page from all portals
190
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, portalPage.getRoute(), "right", null, null);
182
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, portalPage.getRoute(), "right", null, null);
191 183
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
192
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
184
                pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
193 185
            }
194 186
        }
195 187
    }
......
199 191
            pageDAO.delete(id);
200 192

  
201 193
            // delete divIds related only to this page from all portals, otherwise remove this page from divIds
202
            List<DivId> divIds = divIdController.getDivIds(id, null, null);
194
            List<DivId> divIds = divIdService.getDivIds(id, null, null);
203 195
            for(DivId divId : divIds) {
204 196
                if(divId.getPages().size() == 1) {
205
                    divIdController.deleteDivId(divId.getId());
197
                    divIdService.deleteDivId(divId.getId());
206 198

  
207 199
                    // delete div contents related to this page from all portals
208
                    List<DivHelpContentResponse> divHelpContentResponses = divHelpContentController.getDivHelpContents(null, id, divId.getId(), null);
200
                    List<DivHelpContentResponse> divHelpContentResponses = divHelpContentService.getDivHelpContents(null, id, divId.getId(), null);
209 201
                    for (DivHelpContentResponse divHelpContentResponse : divHelpContentResponses) {
210
                        divHelpContentController.deleteDivHelpContent(divHelpContentResponse.getId());
202
                        divHelpContentService.deleteDivHelpContent(divHelpContentResponse.getId());
211 203
                    }
212 204
                } else {
213 205
                    List<String> divIdPages = divId.getPages();
214 206
                    divIdPages.remove(id);
215 207
                    divId.setPages(divIdPages);
216
                    divIdDAO.save(divId);
208
                    divIdService.insertOrUpdateDivId(divId);
217 209
                }
218 210
            }
219 211

  
220 212

  
221 213
            // delete page contents related to this page from all portals
222
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentController.getPageHelpContents(null, id, null, null, null);
214
            List<PageHelpContentResponse> pageHelpContentResponses = pageHelpContentService.getPageHelpContents(null, id, null, null, null);
223 215
            for(PageHelpContentResponse pageHelpContentResponse : pageHelpContentResponses) {
224
                pageHelpContentController.deletePageHelpContent(pageHelpContentResponse.getId());
216
                pageHelpContentService.deletePageHelpContent(pageHelpContentResponse.getId());
225 217
            }
226 218

  
227 219
            // delete page from portals

Also available in: Unified diff