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=8c6970618e2eb9a967665964e6b22ae585b74b63;hp=2489dd468fe44e61c845f192d0be1eca2d21af4e;hpb=289c85bbe2b06073b69fb661380ef742328b77dd;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 2489dd468..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
@@ -8,6 +8,7 @@ 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;
@@ -15,7 +16,9 @@ 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());
 
@@ -56,16 +59,17 @@ public class TestManagerServiceImpl implements TestManagerService {
 							.getTestResultUuid());
 				}
 			} else {
-//				log
-//						.trace("ResultUUID="
-//								+ testRunDescriptor.getTestResultUuid());
-//				addResultToCollection("default", testRunDescriptor
-//						.getTestResultUuid());
+				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) {
@@ -99,10 +103,15 @@ public class TestManagerServiceImpl implements TestManagerService {
 		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());
+		// registerTestRunDescriptor(msg.getTestRunDescriptor());
 
 		if (log.isTraceEnabled())
 			log.trace("Adding result part to test result #"
@@ -122,4 +131,13 @@ public class TestManagerServiceImpl implements TestManagerService {
 		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());
+
+	}
+
 }