[NAE-1998] Implement transactions for events

- fix tests
- update application-test.properties

docs/_media/roles/usersRef_functions.groovy

@@ -1,5 +1,5 @@
 Long getDummyUser() {
-   return userService.findByEmail("[email protected]", true).id
+   return userService.findByEmail("[email protected]").id
 }
 
 void debug() {

src/test/groovy/com/netgrif/application/engine/action/ActionDelegateTest.groovy

@@ -65,15 +65,15 @@ class ActionDelegateTest {
     void deleteUser(){
         GreenMail smtpServer = new GreenMail(new ServerSetup(2525, null, "smtp"))
         smtpServer.start()
-        String mail = "[email protected]";
+        String mail = "[email protected]"
         MessageResource messageResource = actionDelegate.inviteUser(mail)
         assert messageResource.getContent().success
-        IUser user = userService.findByEmail(mail, false)
+        IUser user = userService.findByEmail(mail)
         assert user != null
         MimeMessage[] messages = smtpServer.getReceivedMessages()
         assert messages
         actionDelegate.deleteUser(mail)
-        IUser user2 = userService.findByEmail(mail, false)
+        IUser user2 = userService.findByEmail(mail)
         assert user2 == null
         smtpServer.stop()
     }

src/test/groovy/com/netgrif/application/engine/elastic/DataSearchRequestTest.groovy

@@ -114,7 +114,7 @@ class DataSearchRequestTest {
                 new FileInputStream("src/test/resources/all_data.xml"), VersionType.MAJOR, superCreator.getLoggedSuper()))
         assert net.getNet() != null
 
-        def users = userService.findAll(true)
+        def users = userService.findAll()
         assert users.size() >= 2
         def testUser1 = users[0]
         def testUser2 = users[1]

src/test/groovy/com/netgrif/application/engine/event/GroovyShellFactoryTest.groovy

@@ -84,7 +84,7 @@ class GroovyShellFactoryTest {
     void roleActionsTest() {
         userService.metaClass.groovyShellTestMethod = { String string, I18nString i18nString -> println("groovyShellTestMethod") }
 
-        def user = userService.findByEmail(userService.getSystem().getEmail(), false)
+        def user = userService.findByEmail(userService.getSystem().getEmail())
         def processRoleCount = user.processRoles.size()
         def roles = roleService.findAll(net.getStringId())
         assert roles.size() == 1
@@ -93,7 +93,7 @@ class GroovyShellFactoryTest {
                 new HashSet<String>(roles.collect { it.stringId } + user.processRoles.collect { it.stringId }),
                 new LoggedUser("", "a", "", [])
         )
-        user = userService.findByEmail(userService.getSystem().getEmail(), false)
+        user = userService.findByEmail(userService.getSystem().getEmail())
         assert user.processRoles.size() == processRoleCount + 1
     }
 

src/test/groovy/com/netgrif/application/engine/insurance/mvc/InsuranceTest.groovy

@@ -146,7 +146,7 @@ class InsuranceTest {
                 [auths.get("user"), auths.get("admin")] as Authority[],
                 [processRoles.get("agent"), processRoles.get("company")] as ProcessRole[])
         List<ProcessRole> roles = processRoleService.findAll(netId)
-        processRoleService.assignRolesToUser(userService.findByEmail(USER_EMAIL, false).stringId, roles.findAll { it.importId in ["1", "2"] }.collect { it.stringId } as Set, userService.getLoggedOrSystem().transformToLoggedUser())
+        processRoleService.assignRolesToUser(userService.findByEmail(USER_EMAIL).stringId, roles.findAll { it.importId in ["1", "2"] }.collect { it.stringId } as Set, userService.getLoggedOrSystem().transformToLoggedUser())
 
         auth = new UsernamePasswordAuthenticationToken(USER_EMAIL, "password")
         auth.setDetails(new WebAuthenticationDetails(new MockHttpServletRequest()))

src/test/groovy/com/netgrif/application/engine/orgstructure/groups/NextGroupServiceTest.groovy

@@ -80,7 +80,7 @@ class NextGroupServiceTest {
     }
 
     Case createGroup() {
-        return nextGroupService.createGroup("CUSTOM_GROUP_1", userService.findByEmail(DUMMY_USER_MAIL, false)).getCase()
+        return nextGroupService.createGroup("CUSTOM_GROUP_1", userService.findByEmail(DUMMY_USER_MAIL)).getCase()
     }
 
     List<Case> findGroup() {
@@ -95,15 +95,15 @@ class NextGroupServiceTest {
     Case addUser() {
         QCase qCase = new QCase("case")
         Case group = nextGroupService.findByPredicate(qCase.title.eq("CUSTOM_GROUP_1")).get(0)
-        nextGroupService.addUser(userService.findByEmail(CUSTOMER_USER_MAIL, false), group)
-        nextGroupService.addUser(userService.findByEmail("[email protected]", false), group)
+        nextGroupService.addUser(userService.findByEmail(CUSTOMER_USER_MAIL), group)
+        nextGroupService.addUser(userService.findByEmail("[email protected]"), group)
         return group
     }
 
     Case removeUser() {
         QCase qCase = new QCase("case")
         Case group = nextGroupService.findByPredicate(qCase.title.eq("CUSTOM_GROUP_1")).get(0)
-        nextGroupService.removeUser(userService.findByEmail(CUSTOMER_USER_MAIL, false), group)
+        nextGroupService.removeUser(userService.findByEmail(CUSTOMER_USER_MAIL), group)
         return group
     }
 }

src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileFieldTest.groovy

@@ -104,7 +104,7 @@ class FileFieldTest {
     void downloadFileByCase() {
         PetriNet net = getNet()
 
-        IUser user = userService.findByEmail(configuration.email, true)
+        IUser user = userService.findByEmail(configuration.email)
         assert user != null
 
         CreateCaseParams createCaseParams = CreateCaseParams.with()
@@ -130,7 +130,7 @@ class FileFieldTest {
     void downloadFileByTask() {
         PetriNet net = getNet()
 
-        IUser user = userService.findByEmail(configuration.email, true)
+        IUser user = userService.findByEmail(configuration.email)
         assert user != null
 
         CreateCaseParams createCaseParams = CreateCaseParams.with()

src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileListFieldTest.groovy

@@ -104,7 +104,7 @@ class FileListFieldTest {
     void downloadFileByCaseAndName() {
         PetriNet net = getNet()
 
-        IUser user = userService.findByEmail(configuration.email, true)
+        IUser user = userService.findByEmail(configuration.email)
         assert user != null
 
         CreateCaseParams createCaseParams = CreateCaseParams.with()
@@ -131,7 +131,7 @@ class FileListFieldTest {
     void downloadFileByTask() {
         PetriNet net = getNet()
 
-        IUser user = userService.findByEmail(configuration.email, true)
+        IUser user = userService.findByEmail(configuration.email)
         assert user != null
 
         CreateCaseParams createCaseParams = CreateCaseParams.with()

src/test/groovy/com/netgrif/application/engine/petrinet/service/PetriNetServiceTest.groovy

@@ -118,12 +118,12 @@ class PetriNetServiceTest {
         assert taskRepository.count() == taskCount + 3
         assert processRoleRepository.count() == processRoleCount + 2
 
-        def user = userService.findByEmail(CUSTOMER_USER_MAIL, false)
+        def user = userService.findByEmail(CUSTOMER_USER_MAIL)
         assert user != null
         assert user.processRoles.size() == 1
 
         userService.addRole(user, testNet.roles.values().collect().get(0).stringId)
-        user = userService.findByEmail(CUSTOMER_USER_MAIL, false)
+        user = userService.findByEmail(CUSTOMER_USER_MAIL)
         assert user != null
         assert user.processRoles.size() == 2
         assert petriNetService.get(new ObjectId(testNet.stringId)) != null
@@ -135,7 +135,7 @@ class PetriNetServiceTest {
         assert caseRepository.findAllByProcessIdentifier(testNetOptional.getNet().getImportId()).size() == 0
         assert taskRepository.count() == taskCount
         assert processRoleRepository.count() == processRoleCount
-        user = userService.findByEmail(CUSTOMER_USER_MAIL, false)
+        user = userService.findByEmail(CUSTOMER_USER_MAIL)
         assert user != null
         assert user.processRoles.size() == 1
 
@@ -167,7 +167,7 @@ class PetriNetServiceTest {
     void processSearch() {
         long processCount = petriNetRepository.count()
 
-        def user = userService.findByEmail(CUSTOMER_USER_MAIL, false)
+        def user = userService.findByEmail(CUSTOMER_USER_MAIL)
         assert user != null
         petriNetService.importPetriNet(new ImportPetriNetParams(
                 stream(NET_FILE), VersionType.MAJOR, superCreator.getLoggedSuper()))

src/test/resources/application-test.properties

@@ -20,6 +20,9 @@ nae.security.limits.login-timeout-unit=seconds
 # Storage
 nae.storage.clean=true
 
+# Rule engine
+rule-engine.enabled=true
+
 nae.admin.password=password
 
 

src/test/resources/petriNets/dynamic_init.xml

@@ -8,13 +8,13 @@
     <data type="text" immediate="true">
         <id>text</id>
         <title>Text</title>
-        <init dynamic="true">userService.findByEmail("[email protected]", true).name</init>
+        <init dynamic="true">userService.findByEmail("[email protected]").name</init>
     </data>
 
     <data type="number" immediate="true">
         <id>number</id>
         <title>number</title>
-        <init dynamic="true">userService.findByEmail("[email protected]", true).name.length()</init>
+        <init dynamic="true">userService.findByEmail("[email protected]").name.length()</init>
     </data>
 
     <data type="date" immediate="true">

src/test/resources/userrefs_test.xml

@@ -89,7 +89,7 @@
                     <action>
                         userList: f.user_list_1,
                         email: f.email;
-                        change userList value { [userService.findByEmail(email.value, true).id] }
+                        change userList value { [userService.findByEmail(email.value).id] }
                     </action>
                 </actions>
             </event>