From 67b803bc8553e60750bae746ee85f9e3499b0df3 Mon Sep 17 00:00:00 2001
From: tosmers <tosmers@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 29 Jun 2017 18:33:11 +0000
Subject: [PATCH] [CCM][UPDATE] - modifies import test with output message of
 selected group to check members - changes RoleMembershipMarshaller's
 insertIntoDb-method

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4826 8810af33-2d31-482b-a856-94f89814c4df
---
 .../categorization/CategoryIdResolver.java    |  1 -
 .../security/GroupMembershipMarshaller.java   |  3 ++-
 .../security/RoleMembershipMarshaller.java    | 12 ++++++++++--
 .../portation/CoreDataImportTest.java         | 19 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java
index a3e863394..7849b879e 100644
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryIdResolver.java
@@ -28,7 +28,6 @@ import javax.enterprise.context.RequestScoped;
  * @author <a href="mailto:tosmers@uni-bremen.de>Tobias Osmers</a>
  * @version created on 3/23/17
  */
-@RequestScoped
 public class CategoryIdResolver implements ObjectIdResolver {
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
index 27439e01f..e48eef5a5 100644
--- a/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
+++ b/ccm-core/src/main/java/org/libreccm/security/GroupMembershipMarshaller.java
@@ -44,8 +44,9 @@ public class GroupMembershipMarshaller extends AbstractMarshaller<GroupMembershi
 
     @Override
     @Transactional(Transactional.TxType.REQUIRED)
-    protected void insertIntoDb(GroupMembership portableObject) {
+    protected void insertIntoDb(final GroupMembership portableObject) {
         portableObject.setMembershipId(portableObject.getMembershipId() * -1);
         entityManager.merge(portableObject);
+        entityManager.flush();
     }
 }
diff --git a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
index 0efcd0eac..8a4f95b6d 100644
--- a/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
+++ b/ccm-core/src/main/java/org/libreccm/security/RoleMembershipMarshaller.java
@@ -46,7 +46,7 @@ public class RoleMembershipMarshaller extends AbstractMarshaller<RoleMembership>
         return RoleMembership.class;
     }
 
-    @Override
+    /*@Override
 //    @Transactional(Transactional.TxType.REQUIRED)
     protected void insertIntoDb(final RoleMembership portableObject) {
 
@@ -60,11 +60,19 @@ public class RoleMembershipMarshaller extends AbstractMarshaller<RoleMembership>
         LOGGER.debug("Saved RoleMembership with id {}.",
                      roleMembership.getMembershipId());
     }
-    
+
     @Transactional(Transactional.TxType.REQUIRES_NEW)
     protected RoleMembership save(final RoleMembership membership) {
         entityManager.persist(membership);
         return membership;
+    }*/
+
+    @Override
+    @Transactional(Transactional.TxType.REQUIRED)
+    protected void insertIntoDb(final RoleMembership portableObject) {
+        portableObject.setMembershipId(portableObject.getMembershipId() * -1);
+        entityManager.merge(portableObject);
+        entityManager.flush();
     }
 
 }
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 d92d28695..e0ff67079 100644
--- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
@@ -33,10 +33,14 @@ import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.*;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
+import org.libreccm.security.Group;
+import org.libreccm.security.GroupRepository;
 import org.libreccm.tests.categories.IntegrationTest;
 
 import javax.inject.Inject;
 
+import java.util.concurrent.TimeUnit;
+
 import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 
@@ -58,6 +62,8 @@ public class CoreDataImportTest {
 
     @Inject
     private ImportHelper importHelper;
+    @Inject
+    private GroupRepository groupRepository;
 
     public CoreDataImportTest() {
 
@@ -124,13 +130,24 @@ public class CoreDataImportTest {
 
     @Test
     @InSequence(100)
-    public void objectsShouldBeImported() {
+    public void objectsShouldBeImported() throws InterruptedException {
         // assert for no errors
         Assert.assertFalse(importHelper.importUsers());
         Assert.assertFalse(importHelper.importGroups());
         Assert.assertFalse(importHelper.importGroupMemberships());
+
         Assert.assertFalse(importHelper.importRoles());
         Assert.assertFalse(importHelper.importRoleMemberships());
+
+
+        final String name = "research_Administration_Publisher";
+        Group group = groupRepository
+                .findByName(name)
+                .orElseThrow(() -> new IllegalArgumentException(String
+                .format("No Group fount with the name: %s", name)));
+        System.err.println(group.toString());
+
+
         //Assert.assertFalse(importHelper.importCategories());
 
     }