X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fservices%2Fimpl%2Ftest%2FTestManagerServiceImpl.java;h=59b7b37db734b8b1976b27895b5663b63919955a;hb=719f374a748e531ae706115252978e06ad72c308;hp=0b2b5655d8eca1948a89713b790b336d2534b1ef;hpb=11a9d0e8d3e9f610d0546463cfaf07ae884cb249;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
index 0b2b5655d..59b7b37db 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/test/TestManagerServiceImpl.java
@@ -2,16 +2,23 @@ package org.argeo.slc.services.impl.test;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;
 import org.argeo.slc.dao.process.SlcExecutionDao;
 import org.argeo.slc.dao.test.TestRunDescriptorDao;
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
+import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest;
+import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest;
+import org.argeo.slc.msg.test.tree.ResultPartRequest;
 import org.argeo.slc.process.SlcExecution;
 import org.argeo.slc.services.test.TestManagerService;
 import org.argeo.slc.test.TestRunDescriptor;
 
-/** Implementation of complex operations impacting the underlying data. */
+/**
+ * Implementation of complex operations impacting the underlying data.
+ */
 public class TestManagerServiceImpl implements TestManagerService {
 	private Log log = LogFactory.getLog(getClass());
 
@@ -32,6 +39,9 @@ public class TestManagerServiceImpl implements TestManagerService {
 
 	public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) {
 		if (testRunDescriptor != null) {
+			if (log.isTraceEnabled())
+				log.trace("Registering test run descriptor #"
+						+ testRunDescriptor.getTestRunUuid());
 			testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
 
 			// Update tree test result collection
@@ -48,11 +58,18 @@ public class TestManagerServiceImpl implements TestManagerService {
 					addResultToCollection(collectionId, testRunDescriptor
 							.getTestResultUuid());
 				}
+			} else {
+				if (log.isTraceEnabled())
+					log.trace("ResultUUID="
+							+ testRunDescriptor.getTestResultUuid());
+				addResultToCollection("default", testRunDescriptor
+						.getTestResultUuid());
 			}
 		}
 	}
 
 	public void addResultToCollection(String collectionId, String resultUuid) {
+		// TODO: improve collections
 		TreeTestResultCollection ttrc = treeTestResultCollectionDao
 				.getTestResultCollection(collectionId);
 		if (ttrc == null) {
@@ -78,4 +95,49 @@ public class TestManagerServiceImpl implements TestManagerService {
 		}
 	}
 
+	public void createTreeTestResult(CreateTreeTestResultRequest msg) {
+		TreeTestResult treeTestResult = msg.getTreeTestResult();
+
+		if (log.isTraceEnabled())
+			log.trace("Creating result #" + treeTestResult.getUuid());
+		treeTestResultDao.create(treeTestResult);
+
+		registerTestRunDescriptor(msg.getTestRunDescriptor());
+
+		// FIXME: temporary hack before better collection management is found
+		if (msg.getTestRunDescriptor() == null) {
+			addResultToCollection("default", treeTestResult.getUuid());
+		}
+	}
+
+	public void addResultPart(ResultPartRequest msg) {
+		// registerTestRunDescriptor(msg.getTestRunDescriptor());
+
+		if (log.isTraceEnabled())
+			log.trace("Adding result part to test result #"
+					+ msg.getResultUuid());
+
+		treeTestResultDao.addResultPart(msg.getResultUuid(), msg.getPath(), msg
+				.getResultPart(), msg.getRelatedElements());
+		// treeTestResultDao.updateAttributes(msg.getResultUuid(), msg
+		// .getAttributes());
+	}
+
+	public void closeTreeTestResult(CloseTreeTestResultRequest msg) {
+		if (log.isTraceEnabled())
+			log.trace("Closing result #" + msg.getResultUuid() + " at date "
+					+ msg.getCloseDate());
+
+		treeTestResultDao.close(msg.getResultUuid(), msg.getCloseDate());
+	}
+
+	public void addAttachment(AddTreeTestResultAttachmentRequest msg) {
+		if (log.isTraceEnabled())
+			log.trace("Adding attachment " + msg.getAttachment()
+					+ " to result #" + msg.getResultUuid());
+		treeTestResultDao.addAttachment(msg.getResultUuid(), msg
+				.getAttachment());
+
+	}
+
 }