From 31cca7cb4f62b39cf460d4f39522e44a14f54627 Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 15 Jan 2018 16:48:08 +0000
Subject: [PATCH] [NG][FEATURE] - adds import of taskDependencies and
 taskAssignments - successfully imports data for all major core classes

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5198 8810af33-2d31-482b-a856-94f89814c4df
---
 .../java/org/libreccm/categorization/CategoryRepository.java  | 1 +
 .../src/main/java/org/libreccm/security/PartyIdResolver.java  | 4 ++--
 .../src/main/java/org/libreccm/workflow/TaskRepository.java   | 2 ++
 .../test/java/org/libreccm/portation/CoreDataImportTest.java  | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java
index 79f4fca18..1cee4432c 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java
@@ -97,6 +97,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
      *
      * @return An optional either with the found item or empty
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Category> findByUuid(final String uuid) {
         final TypedQuery<Category> query = getEntityManager().
             createNamedQuery("Category.findByUuid", Category.class);
diff --git a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java
index 9c71ec970..0e0578a3d 100644
--- a/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java
+++ b/ccm-core/src/main/java/org/libreccm/security/PartyIdResolver.java
@@ -47,8 +47,8 @@ public class PartyIdResolver implements ObjectIdResolver {
         return partyRepository
                 .findByName(id.key.toString())
                 .orElseThrow(() -> new IllegalArgumentException(String
-                .format("No Party with name %s in the database.",
-                        id.key.toString())));
+                        .format("No Party with name %s in the database.",
+                                id.key.toString())));
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java
index 3b1f00a2a..1ca43549a 100644
--- a/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java
+++ b/ccm-core/src/main/java/org/libreccm/workflow/TaskRepository.java
@@ -23,6 +23,7 @@ import org.libreccm.core.AbstractEntityRepository;
 import javax.enterprise.context.RequestScoped;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
+import javax.transaction.Transactional;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -57,6 +58,7 @@ public class TaskRepository extends AbstractEntityRepository<Long, Task> {
      *
      * @return An optional either with the found item or empty
      */
+    @Transactional(Transactional.TxType.REQUIRED)
     public Optional<Task> findByUuid(final String uuid) {
         final TypedQuery<Task> query = getEntityManager().createNamedQuery(
                 "Task.findByUuid", Task.class);
diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
index 4f42dcfaa..16a2b8525 100644
--- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
@@ -154,8 +154,8 @@ public class CoreDataImportTest {
         Assert.assertFalse(importHelper.importWorkflows());
         Assert.assertFalse(importHelper.importTaskComments());
         Assert.assertFalse(importHelper.importAssignableTasks());
-//        Assert.assertFalse(importHelper.importTaskDependencies());
-//        Assert.assertFalse(importHelper.importTaskAssignments());
+        Assert.assertFalse(importHelper.importTaskDependencies());
+        Assert.assertFalse(importHelper.importTaskAssignments());
     }
 
 }