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

Report Validation

This commit is contained in:
Fabio Sinibaldi 2022-02-17 16:01:05 +01:00
parent 31b7d28572
commit 089341c375
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/DocumentHandlingReport.java
View File

@ -29,11 +29,14 @@ public class DocumentHandlingReport<T extends BaseExecutionRequest> extends Repo
} }
if(toSetLifecycleInformation != null){ if(toSetLifecycleInformation != null){
log.trace("Merging lifecycleInformation"); log.trace("Merging lifecycleInformation");
Document original = Serialization.asDocument(toReturn.getLifecycleInformation()); // Document original = Serialization.asDocument(toReturn.getLifecycleInformation());
Document toSet = Serialization.asDocument(toSetLifecycleInformation); // Document toSet = Serialization.asDocument(toSetLifecycleInformation);
toSet.putAll(original); // toSet.putAll(original);
toReturn.setLifecycleInformation(Serialization.convert(toSet,LifecycleInformation.class)); // toReturn.setLifecycleInformation(Serialization.convert(toSet,LifecycleInformation.class));
toReturn.setLifecycleInformation(toSetLifecycleInformation);
} }
// Force Report status into info
log.trace("Report status is {} ",getStatus()); log.trace("Report status is {} ",getStatus());
LifecycleInformation info = toReturn.getLifecycleInformation(); LifecycleInformation info = toReturn.getLifecycleInformation();
switch (getStatus()){ switch (getStatus()){
@ -48,6 +51,9 @@ public class DocumentHandlingReport<T extends BaseExecutionRequest> extends Repo
break; break;
} }
case OK: { case OK: {
if(info.getLastOperationStatus()==null)
info.setLastOperationStatus(LifecycleInformation.Status.OK);
break;
} }
} }
return toReturn; return toReturn;

4
cms-plugin-framework/src/main/java/org/gcube/application/cms/plugins/reports/EventExecutionReport.java
View File

@ -4,9 +4,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import lombok.Data; import lombok.Data;
import org.gcube.application.cms.plugins.requests.EventExecutionRequest; 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.ProfiledDocument;
import org.gcube.application.geoportal.common.model.document.lifecycle.LifecycleInformation;
@Data @Data
public class EventExecutionReport extends DocumentHandlingReport<EventExecutionRequest>{ public class EventExecutionReport extends DocumentHandlingReport<EventExecutionRequest>{
@Override
public void setToSetLifecycleInformation(LifecycleInformation toSetLifecycleInformation) {
}
} }