gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug_24754 #12

Merged
francesco.mangiacrapa merged 7 commits from bug_24754 into master 2023-03-14 11:23:06 +01:00
Conversation 0 Commits 7 Files Changed 6 +13 -25
1 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2bc5d3a192 - Show all commits

38
concessioni-lifecycle/src/main/java/org/gcube/application/cms/concessioni/plugins/ConcessioniLifeCycleManager.java
View File

@ -173,7 +173,7 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements
Project indexingProject = request.getDocument(); Project indexingProject = request.getDocument();
// Evaluate to display project IDs // Evaluate to display project IDs
log.info("Evaluating Last ID in relationship chain. Current ID is {}", indexingProject.getId()); log.info("Evaluating relationship chain. Current ID is {}", indexingProject.getId());
try { try {
ArrayList<Project> projects = new ArrayList<>(); ArrayList<Project> projects = new ArrayList<>();
ProjectAccess access = ImplementationProvider.get().getProvidedObjectByClass(ProjectAccess.class); ProjectAccess access = ImplementationProvider.get().getProvidedObjectByClass(ProjectAccess.class);
@ -210,48 +210,36 @@ public class ConcessioniLifeCycleManager extends Default3PhaseManager implements
} }
log.trace("Checking from LAST.. "); log.trace("Checking from LAST.. ");
//I'm ignoring the phase, this code is called on
// SUBMIT (DRAFT-> PENDING_APPROVAL)
// APPROVE (PENDING_APPROVAL -> PUBLISH
//
//Operation (go to PENDING APPROVAL or PUBLISHED) called on the indexingProject
for (int i = 0; i < projects.size(); i++) { for (int i = 0; i < projects.size(); i++) {
Project p = projects.get(i); Project p = projects.get(i);
String phase = p.getLifecycleInformation().getPhase(); String phase = p.getLifecycleInformation().getPhase();
// IS TO DISPLAY EMPTY? Step into only once. Indexing the first project that is in PENDING APPROVAL or PUBLISHED // IS TO DISPLAY EMPTY? Step into only once.
// Indexing the first project that is in PENDING APPROVAL or PUBLISHED or
// updating the phase of the indexing (selected) project
if (toDisplayId.isEmpty()) { if (toDisplayId.isEmpty()) {
// IF PHASE IS PENDING APPROVAL OR PUBLISHED adding toDisplayId // IF PHASE IS PENDING APPROVAL OR PUBLISHED adding toDisplayId
if ((phase.equals(Phases.PENDING_APPROVAL) || phase.equals(Phases.PUBLISHED))) { if ((phase.equals(Phases.PENDING_APPROVAL) || phase.equals(Phases.PUBLISHED))) {
toDisplayId.add(p.getId()); toDisplayId.add(p.getId());
}else if(p.getId().compareTo(indexingProject.getId())==0) { } else if (p.getId().compareTo(indexingProject.getId()) == 0) {
//Means that the operation is is called on indexing project from DRAFT phase to PENDING_APPROVAL or PUBLISH // Means that the operation has been called on the indexing project from DRAFT
// phase to PENDING_APPROVAL or PUBLISH
toDisplayId.add(p.getId()); toDisplayId.add(p.getId());
} }
} else {
toHideIds.add(p.getId());
// IF PHASE IS PENDING APPROVAL OR PUBLISHED adding (the remaining) toHideIds } else {
// switch (phase) { // Hides the centroid regardless of project phase
// case Phases.PENDING_APPROVAL: toHideIds.add(p.getId());
// case Phases.PUBLISHED: {
// toHideIds.add(p.getId());
// break;
// }
// }
} }
} }
toReturn.put("_toHideIds", toHideIds); toReturn.put("_toHideIds", toHideIds);
toReturn.put("_toDisplayIds", toDisplayId); toReturn.put("_toDisplayIds", toDisplayId);
log.info("Indexing request for "+indexingProject.getProfileID()+" [ID {}] with to _toHideIds {} and _toDisplayIds {} ", log.info(
"Indexing request for " + indexingProject.getProfileID()
+ " [ID {}] with to _toHideIds {} and _toDisplayIds {} ",
indexingProject.getId(), toHideIds, toDisplayId); indexingProject.getId(), toHideIds, toDisplayId);
return toReturn; return toReturn;
} catch (Exception e) { } catch (Exception e) {