Deactivate issue causing bug

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / ws / test / tree / ResultPartRequestEp.java

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 83425ae7b97e20df12fe8facf6f5da3356f8b156..d8ebbfd9f2dec5745a73812f5f1cd9ce762221b0 100644 (file)
--- 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,61 +1,45 @@
 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) {
-                       testRunDescriptorDao.saveOrUpdate(testRunDescriptor);
-                       if (log.isDebugEnabled())
-                               log.debug("Updated test run descriptor with id "
-                                               + testRunDescriptor.getTestRunUuid());
-               }
-
-               TreeTestResult treeTestResult = treeTestResultDao.getTestResult(msg
-                               .getResultUuid());
-               if (treeTestResult == null) {
-                       throw new SlcException("No result with id " + msg.getResultUuid());
-               }
-
-               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());
-
-               treeTestResultDao.update(treeTestResult);
-
-               if (log.isDebugEnabled())
-                       log.debug("Update result with id " + treeTestResult.getUuid());
+               if (log.isTraceEnabled())
+                       log.trace("Registering test run descriptor #"
+                                       + msg.getTestRunDescriptor().getTestRunUuid());
+
+               testManagerService
+                               .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());
+
                return null;
        }