Adapt web services to lazy loading

[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 1a7e110bfe3dc03972222d105729d56f5f3b592d..8c1d109c295e5485ff14655f6d0e1e3a77cdb542 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
@@ -41,11 +41,18 @@ public class TestManagerServiceImpl implements TestManagerService {
 \r
                        // Update tree test result collection\r
                        // TODO: optimize\r
-                       SlcExecution slcExecution = slcExecutionDao\r
-                                       .getSlcExecution(testRunDescriptor.getSlcExecutionUuid());\r
-                       if (slcExecution != null) {\r
-                               addResultToCollection(slcExecution.getUser(), testRunDescriptor\r
-                                               .getTestResultUuid());\r
+\r
+                       if (testRunDescriptor.getSlcExecutionUuid() != null) {\r
+                               SlcExecution slcExecution = slcExecutionDao\r
+                                               .getSlcExecution(testRunDescriptor\r
+                                                               .getSlcExecutionUuid());\r
+                               if (slcExecution != null) {\r
+                                       String collectionId = slcExecution.getUser() != null ? slcExecution\r
+                                                       .getUser()\r
+                                                       : "default";\r
+                                       addResultToCollection(collectionId, testRunDescriptor\r
+                                                       .getTestResultUuid());\r
+                               }\r
                        }\r
                }\r
        }\r
@@ -57,9 +64,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
@@ -67,10 +72,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