Improve web services

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / services / test / impl / TestManagerServiceImpl.java

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
index 17ee530468d7643134085f98aa5a4f6021d04c46..b9a3a7045b6a14e0dad8c8950b141443d365876a 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/services/test/impl/TestManagerServiceImpl.java
@@ -2,10 +2,8 @@ package org.argeo.slc.services.test.impl;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-\r
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.test.TestRunDescriptor;\r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;\r
 import org.argeo.slc.dao.process.SlcExecutionDao;\r
 import org.argeo.slc.dao.test.TestRunDescriptorDao;\r
@@ -33,10 +31,6 @@ public class TestManagerServiceImpl implements TestManagerService {
 \r
        public void registerTestRunDescriptor(TestRunDescriptor testRunDescriptor) {\r
                if (testRunDescriptor != null) {\r
-                       if (log.isDebugEnabled())\r
-                               log.debug("Updating test run descriptor with id "\r
-                                               + testRunDescriptor.getTestRunUuid());\r
-\r
                        testRunDescriptorDao.saveOrUpdate(testRunDescriptor);\r
 \r
                        // Update tree test result collection\r
@@ -47,8 +41,11 @@ public class TestManagerServiceImpl implements TestManagerService {
                                                .getSlcExecution(testRunDescriptor\r
                                                                .getSlcExecutionUuid());\r
                                if (slcExecution != null) {\r
-                                       addResultToCollection(slcExecution.getUser(),\r
-                                                       testRunDescriptor.getTestResultUuid());\r
+                                       String collectionId = slcExecution.getUser() != null ? slcExecution\r
+                                                       .getUser()\r
+                                                       : "default";\r
+                                       addResultToCollection(collectionId, testRunDescriptor\r
+                                                       .getTestResultUuid());\r
                                }\r
                        }\r
                }\r
@@ -61,9 +58,7 @@ public class TestManagerServiceImpl implements TestManagerService {
                        ttrc = new TreeTestResultCollection(collectionId);\r
                        treeTestResultCollectionDao.create(ttrc);\r
                }\r
-               TreeTestResult ttr = treeTestResultDao.getTestResult(resultUuid);\r
-               ttrc.getResults().add(ttr);\r
-               treeTestResultCollectionDao.update(ttrc);\r
+               treeTestResultCollectionDao.addResultToCollection(ttrc, resultUuid);\r
        }\r
 \r
        public void removeResultFromCollection(String collectionId,\r
@@ -71,10 +66,8 @@ public class TestManagerServiceImpl implements TestManagerService {
                TreeTestResultCollection ttrc = treeTestResultCollectionDao\r
                                .getTestResultCollection(collectionId);\r
                if (ttrc != null) {\r
-                       TreeTestResult ttr = treeTestResultDao.getTestResult(resultUuid);\r
-                       if (ttrc.getResults().remove(ttr)) {\r
-                               treeTestResultCollectionDao.update(ttrc);\r
-                       }\r
+                       treeTestResultCollectionDao.removeResultFromCollection(ttrc,\r
+                                       resultUuid);\r
                }\r
        }\r
 \r