From c9ef00c108748ba790856bdcb1145eebfbf484ed Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 3 Mar 2023 12:33:27 +0100
Subject: [PATCH] improved logs

---
 .../AbstractLifeCycleManager.java             |  7 ++++-
 .../implementations/Default3PhaseManager.java |  2 +-
 .../cms/plugins/SimpleLifecycleTests.java     | 28 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
index f54a53e..551e70f 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/AbstractLifeCycleManager.java
@@ -127,7 +127,12 @@ public abstract class AbstractLifeCycleManager extends AbstractPlugin implements
 
     @Override
     public StepExecutionReport performStep(StepExecutionRequest request) throws StepException, InvalidPluginRequestException, InvalidProfileException, ConfigurationException, InsufficientPrivileges {
-        log.info("Serving Request {}",request);
+		log.info("Serving Request - caller {}, ucd id {}, document id {}, step {}", 
+				request.getCaller(),
+				request.getUseCaseDescriptor().getId(), 
+				request.getDocument().getId(), 
+				request.getStep());
+        log.debug("Serving Request full log {}",request);
 
         log.debug("Checking is STEP {} is supported by {}",request.getStep(),DESCRIPTOR.getId());
         if(!registeredSteps.containsKey(request.getStep()))
diff --git a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
index 4f036c1..82918bc 100644
--- a/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
+++ b/default-lc-managers/src/main/java/org/gcube/application/cms/plugins/implementations/Default3PhaseManager.java
@@ -33,7 +33,7 @@ public class Default3PhaseManager extends SimpleLifeCycleManager implements Life
 
     }
 
-    protected static class STEPS{
+    public static final class STEPS{
         public static final OperationDescriptor SUBMIT=new OperationDescriptor("SUBMIT-FOR-REVIEW","Submits the Draft for reviewing");
         public static final OperationDescriptor REJECT=new OperationDescriptor("REJECT-DRAFT","Rejects the submitted Draft");
         public static final OperationDescriptor APPROVE=new OperationDescriptor("APPROVE-SUBMITTED","Approves the submitted Draft");
diff --git a/default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java b/default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
index 3bc4302..9db753a 100644
--- a/default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
+++ b/default-lc-managers/src/test/java/org/gcube/application/cms/plugins/SimpleLifecycleTests.java
@@ -1,8 +1,12 @@
 package org.gcube.application.cms.plugins;
 
+import org.gcube.application.cms.plugins.faults.StepException;
+import org.gcube.application.cms.plugins.implementations.Default3PhaseManager;
+import org.gcube.application.geoportal.common.model.plugins.OperationDescriptor;
+
 public class SimpleLifecycleTests {
 
-    // NB cannot use test commons, need to separate modules
+	// NB cannot use test commons, need to separate modules
 //    extends
 // BasicPluginTest {
 //
@@ -21,4 +25,26 @@ public class SimpleLifecycleTests {
 //        manager.performStep()
 //    }
 
+	public static void main(String[] args) {
+
+		System.out.println("Check start");
+		OperationDescriptor op = Default3PhaseManager.STEPS.APPROVE;
+
+		try {
+			// Check document phase
+			if (op.getAppliableToPhases() != null && !op.getAppliableToPhases().isEmpty()) {
+				String currentPhase = "Pending Approval";
+				if (!op.getAppliableToPhases().contains(currentPhase)) {
+					System.out.println("check KO");
+					throw new StepException(
+							"Document must be in one of the following phases : " + op.getAppliableToPhases());
+				}
+			}
+			System.out.println("check OK");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
+
 }