From 089341c375f4e4492b1418b69e7e32e2323847d0 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 17 Feb 2022 16:01:05 +0100 Subject: [PATCH] Report Validation --- .../plugins/reports/DocumentHandlingReport.java | 14 ++++++++++---- .../cms/plugins/reports/EventExecutionReport.java | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java index 0e1ed89..410fa39 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java @@ -29,11 +29,14 @@ public class DocumentHandlingReport extends Repo } if(toSetLifecycleInformation != null){ log.trace("Merging lifecycleInformation"); - Document original = Serialization.asDocument(toReturn.getLifecycleInformation()); - Document toSet = Serialization.asDocument(toSetLifecycleInformation); - toSet.putAll(original); - toReturn.setLifecycleInformation(Serialization.convert(toSet,LifecycleInformation.class)); +// Document original = Serialization.asDocument(toReturn.getLifecycleInformation()); +// Document toSet = Serialization.asDocument(toSetLifecycleInformation); +// toSet.putAll(original); +// toReturn.setLifecycleInformation(Serialization.convert(toSet,LifecycleInformation.class)); + toReturn.setLifecycleInformation(toSetLifecycleInformation); } + + // Force Report status into info log.trace("Report status is {} ",getStatus()); LifecycleInformation info = toReturn.getLifecycleInformation(); switch (getStatus()){ @@ -48,6 +51,9 @@ public class DocumentHandlingReport extends Repo break; } case OK: { + if(info.getLastOperationStatus()==null) + info.setLastOperationStatus(LifecycleInformation.Status.OK); + break; } } return toReturn; diff --git a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java index 8aed17a..08d1aeb 100644 --- a/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java +++ b/cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java @@ -4,9 +4,13 @@ import com.fasterxml.jackson.core.JsonProcessingException; import lombok.Data; import org.gcube.application.cms.plugins.requests.EventExecutionRequest; import org.gcube.application.geoportal.common.model.document.ProfiledDocument; +import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation; @Data public class EventExecutionReport extends DocumentHandlingReport{ + @Override + public void setToSetLifecycleInformation(LifecycleInformation toSetLifecycleInformation) { + } }