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

task_24859 #13

Merged
francesco.mangiacrapa merged 14 commits from task_24859 into master 2023-03-30 11:00:17 +02:00
Conversation 0 Commits 14 Files Changed 26 +54 -28
2 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7fb96e75fe - Show all commits

1
default-lc-managers/CHANGELOG.md
View File

@ -3,6 +3,7 @@
## [v1.2.0-SNAPSHOT] ## [v1.2.0-SNAPSHOT]
- Integrated the field 'geov_link' (Geoportal GisViewer link) in the centroid layer [#24859] - Integrated the field 'geov_link' (Geoportal GisViewer link) in the centroid layer [#24859]
- Fixed Draft execution step executing dematerialization and de-indexing actions [#24877]
## [v1.1.1] - 2023-03-06 ## [v1.1.1] - 2023-03-06

29
default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
View File

@ -178,8 +178,9 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
} }
protected StepExecutionReport executeSubmit(StepExecutionReport theReport) throws Exception { protected StepExecutionReport executeSubmit(StepExecutionReport theReport) throws Exception {
// Materialize log.info(STEPS.SUBMIT + " running...");
// Materialize
for (MaterializationPlugin mat : getMaterializers(theReport.getTheRequest())) for (MaterializationPlugin mat : getMaterializers(theReport.getTheRequest()))
theReport = materializeDocument(theReport, mat, getMaterializationParameters(theReport.getTheRequest())); theReport = materializeDocument(theReport, mat, getMaterializationParameters(theReport.getTheRequest()));
if (theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) { if (theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) {
@ -187,13 +188,16 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
for (IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest())) for (IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest()))
theReport = index(theReport, indexer, getInternalIndexParams(theReport.getTheRequest())); theReport = index(theReport, indexer, getInternalIndexParams(theReport.getTheRequest()));
// setPhase // setPhase
if(theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) if (theReport.getToSetLifecycleInformation().getLastOperationStatus()
.equals(LifecycleInformation.Status.OK))
theReport.getToSetLifecycleInformation().setPhase(Phases.PENDING_APPROVAL); theReport.getToSetLifecycleInformation().setPhase(Phases.PENDING_APPROVAL);
} }
return theReport; return theReport;
} }
protected StepExecutionReport executeApprove(StepExecutionReport theReport) throws Exception { protected StepExecutionReport executeApprove(StepExecutionReport theReport) throws Exception {
log.info(STEPS.APPROVE + " running...");
// Index // Index
for (IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest())) for (IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest()))
theReport = index(theReport, indexer, getPublicIndexParams(theReport.getTheRequest())); theReport = index(theReport, indexer, getPublicIndexParams(theReport.getTheRequest()));
@ -204,8 +208,29 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
} }
protected StepExecutionReport executeReject(StepExecutionReport theReport) throws Exception { protected StepExecutionReport executeReject(StepExecutionReport theReport) throws Exception {
log.info(STEPS.REJECT + " running...");
// DeMaterialize
JSONPathWrapper wrapper = new JSONPathWrapper(
theReport.getTheRequest().getDocument().getTheDocument().toJson());
for (String s : wrapper.getMatchingPaths("$..[?(@." + RegisteredFileSet.PAYLOADS + ")]")) {
log.info("Requesting dematerialization for {} ", s);
for (MaterializationPlugin mat : getMaterializers(theReport.getTheRequest()))
theReport = deMaterialize(theReport, mat, new Document("fileSetPath", s));
if (!theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK))
break;
}
// DeIndexing
if (theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) {
for (IndexerPluginInterface indexer : getIndexers(theReport.getTheRequest())) {
log.info("Requesting deindexing for {} ", indexer.getDescriptor());
theReport = deIndex(theReport, indexer, getInternalIndexParams(theReport.getTheRequest()));
}
}
if (theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK)) if (theReport.getToSetLifecycleInformation().getLastOperationStatus().equals(LifecycleInformation.Status.OK))
theReport.getToSetLifecycleInformation().setPhase(LifecycleInformation.CommonPhases.DRAFT_PHASE); theReport.getToSetLifecycleInformation().setPhase(LifecycleInformation.CommonPhases.DRAFT_PHASE);
return theReport; return theReport;
} }