X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fws%2Ftest%2Ftree%2FResultPartRequestEp.java;h=d8ebbfd9f2dec5745a73812f5f1cd9ce762221b0;hb=7a8f034133c1112e187e2a2bfd2c56a8d2452345;hp=7e73ff8315016aa79eb02e3d263ea09b18a6c2fc;hpb=319fa0f80e55511d6d425f3de18a5123848b41ad;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
index 7e73ff831..d8ebbfd9f 100644
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/ws/test/tree/ResultPartRequestEp.java
@@ -1,62 +1,44 @@
 package org.argeo.slc.ws.test.tree;
 
-import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
-import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.test.TestRunDescriptor;
-import org.argeo.slc.core.test.tree.PartSubList;
-import org.argeo.slc.core.test.tree.TreeTestResult;
-import org.argeo.slc.dao.test.TestRunDescriptorDao;
 import org.argeo.slc.dao.test.tree.TreeTestResultDao;
 import org.argeo.slc.msg.test.tree.ResultPartRequest;
+import org.argeo.slc.services.test.TestManagerService;
+import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint;
 
 public class ResultPartRequestEp extends AbstractMarshallingPayloadEndpoint {
 
 	private Log log = LogFactory.getLog(getClass());
 
 	private final TreeTestResultDao treeTestResultDao;
-	private final TestRunDescriptorDao testRunDescriptorDao;
+	private final TestManagerService testManagerService;
 
 	public ResultPartRequestEp(TreeTestResultDao treeTestResultDao,
-			TestRunDescriptorDao testRunDescriptorDao) {
+			TestManagerService testManagerService) {
 		this.treeTestResultDao = treeTestResultDao;
-		this.testRunDescriptorDao = testRunDescriptorDao;
+		this.testManagerService = testManagerService;
 	}
 
 	@Override
 	protected Object invokeInternal(Object requestObject) throws Exception {
 		ResultPartRequest msg = (ResultPartRequest) requestObject;
 
-		TestRunDescriptor testRunDescriptor = msg.getTestRunDescriptor();
-		if (testRunDescriptor != null) {
-			if (log.isDebugEnabled())
-				log.debug("Updating test run descriptor with id "
-						+ testRunDescriptor.getTestRunUuid());
-
-			testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
-		}
-
-		TreeTestResult treeTestResult = treeTestResultDao.getTestResult(msg
-				.getResultUuid());
-		if (treeTestResult == null) {
-			throw new SlcException("No result with id " + msg.getResultUuid());
-		}
+		if (log.isTraceEnabled())
+			log.trace("Registering test run descriptor #"
+					+ msg.getTestRunDescriptor().getTestRunUuid());
 
-		PartSubList lst = treeTestResult.getResultParts().get(msg.getPath());
-		if (lst == null) {
-			lst = new PartSubList();
-			treeTestResult.getResultParts().put(msg.getPath(), lst);
-		}
-		lst.getParts().add(msg.getResultPart());
-		treeTestResult.getElements().putAll(msg.getRelatedElements());
+		testManagerService
+				.registerTestRunDescriptor(msg.getTestRunDescriptor());
 
-		if (log.isDebugEnabled())
-			log.debug("Updating result with id " + treeTestResult.getUuid());
+		if (log.isTraceEnabled())
+			log.trace("Adding result part to test result #"
+					+ msg.getResultUuid());
 
-		treeTestResultDao.update(treeTestResult);
+		treeTestResultDao.addResultPart(msg.getResultUuid(), msg.getPath(), msg
+				.getResultPart(), msg.getRelatedElements());
+//		treeTestResultDao.updateAttributes(msg.getResultUuid(), msg
+//				.getAttributes());
 
 		return null;
 	}