[NAE-2058] Role refactor

.github/workflows/pr-build.yml

@@ -34,10 +34,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 200
     services:
-      mongo:
-        image: mongo:4.4
-        ports:
-          - 27017:27017
 
       redis:
         image: redis
@@ -52,12 +48,45 @@ jobs:
         options: -e="discovery.type=single-node" -e="xpack.security.enabled=false" --health-cmd="curl http://localhost:9200/_cluster/health" --health-interval=10s --health-timeout=5s --health-retries=10
 
     steps:
+      - name: Start MongoDB
+        uses: MongoCamp/[email protected]
+        with:
+          mongodb-version: 4.4
+          mongodb-replica-set: rs0
+
+      - name: Wait for Elasticsearch to be ready
+        run: |
+          echo "Waiting for Elasticsearch to be ready..."
+          for i in {1..30}; do
+            if curl -fsSL http://localhost:9200/_cluster/health | grep '"status":"green"' &>/dev/null; then
+              echo "Elasticsearch is up"
+              break
+            fi
+            echo "Waiting for Elasticsearch..."
+            sleep 2
+          done
+
+      - name: Wait for MongoDB to be ready
+        run: |
+          echo "Waiting for MongoDB to be ready..."
+          for i in {1..30}; do
+            if mongo --eval "printjson(db.serverStatus())" &>/dev/null; then
+              echo "MongoDB is up"
+              break
+            fi
+            echo "Waiting for MongoDB..."
+            sleep 2
+          done
+
       - name: Test Database
         env:
           ELASTIC_SEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
+          MONGO_URL: http://localhost:27017
         run: |
           echo $ELASTIC_SEARCH_URL
+          echo $MONGO_URL
           curl -fsSL "$ELASTIC_SEARCH_URL/_cat/health?h=status"
+          curl -fsSL "$MONGO_URL"
 
       - uses: actions/checkout@v3
         with:
@@ -69,12 +98,12 @@ jobs:
           java-version: 11
           distribution: 'adopt'
 
-#      - name: Cache SonarCloud packages
-#        uses: actions/cache@v3
-#        with:
-#          path: ~/.sonar/cache
-#          key: ${{ runner.os }}-sonar
-#          restore-keys: ${{ runner.os }}-sonar
+      #      - name: Cache SonarCloud packages
+      #        uses: actions/cache@v3
+      #        with:
+      #          path: ~/.sonar/cache
+      #          key: ${{ runner.os }}-sonar
+      #          restore-keys: ${{ runner.os }}-sonar
 
       - name: Cache Maven packages
         uses: actions/cache@v3
@@ -86,17 +115,16 @@ jobs:
       - name: Generate certificates
         run: cd src/main/resources/certificates && openssl genrsa -out keypair.pem 4096 && openssl rsa -in keypair.pem -pubout -out public.crt && openssl pkcs8 -topk8 -inform PEM -outform DER -nocrypt -in keypair.pem -out private.der && cd ../../../..
 
-
       - name: Build
         run: mvn clean package install -DskipTests=true
 
-#       Upgrade Java
-#      - name: Build, test, and analyze
-#        timeout-minutes: 180
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-#        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=netgrif_application-engine
+      #       Upgrade Java
+      #      - name: Build, test, and analyze
+      #        timeout-minutes: 180
+      #        env:
+      #          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=netgrif_application-engine
 
       - name: Build, test
         timeout-minutes: 180

docker-compose.yml

@@ -3,8 +3,15 @@ version: "3.3"
 services:
   docker-mongo:
     image: mongo:4.4
+    command: [ "--replSet", "rs0", "--bind_ip_all", "--port", "27017" ]
+    hostname: 127.0.0.1
     ports:
       - "27017:27017"
+    healthcheck:
+      test: echo "try { rs.status() } catch (err) { rs.initiate({_id:'rs0',members:[{_id:0,host:'host.docker.internal:27017'}]}) }" | mongosh --port 27017 --quiet
+      interval: 5s
+      timeout: 30s
+      retries: 10
     deploy:
       resources:
         limits:

pom.xml

@@ -527,6 +527,7 @@
                         </goals>
                         <configuration>
                             <!-- The package of your generated sources -->
+                            <!--TODO: release/8.0.0 fix importer package marked as generated sources inside generated sources bug-->
                             <packageName>com.netgrif.application.engine.importer.model</packageName>
                             <outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>
                             <sources>

src/main/groovy/com/netgrif/application/engine/DevConsole.groovy

@@ -1,6 +1,5 @@
 package com.netgrif.application.engine
 
-import com.netgrif.application.engine.importer.model.Document
 import com.netgrif.application.engine.petrinet.domain.repositories.PetriNetRepository
 import com.netgrif.application.engine.workflow.domain.repositories.CaseRepository
 import groovy.util.logging.Slf4j
@@ -11,9 +10,6 @@ import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
-import javax.xml.bind.JAXBContext
-import javax.xml.bind.Marshaller
-import javax.xml.bind.Unmarshaller
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE
 import static org.springframework.http.MediaType.APPLICATION_XML_VALUE
@@ -34,48 +30,49 @@ class DevConsole {
     @GetMapping(value = "/dataset/{title}", produces = APPLICATION_JSON_VALUE)
     String dataset(@PathVariable String title) {
         def useCase = caseRepository.findAll().find { it.title == title }
-        return "{ ${useCase?.dataSet?.collect { "\"${useCase?.petriNet?.dataSet?.get(it?.key)?.importId}:${useCase?.petriNet?.dataSet?.get(it?.key)?.name?.toString()?.replaceAll("\n[ ]{2}", "")}\":\"${it?.value?.value as String}\"" }?.join(", ")} }"
+        return "{ ${useCase?.dataSet?.collect { "\"${useCase?.process?.dataSet?.get(it?.key)?.importId}:${useCase?.process?.dataSet?.get(it?.key)?.title?.toString()?.replaceAll("\n[ ]{2}", "")}\":\"${it?.value?.value as String}\"" }?.join(", ")} }"
     }
 
     @GetMapping(value = "/net/{title}", produces = APPLICATION_XML_VALUE)
     String netSnapshot(@PathVariable String title) {
-        try {
-            def useCase = caseRepository.findAll().find { it.title == title }
-            def net = useCase.petriNet
-            def xml = new File(net.importXmlPath)
-
-            JAXBContext jaxbContext = JAXBContext.newInstance(Document.class)
-            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller()
-            Document document = (Document) jaxbUnmarshaller.unmarshal(xml)
-
-            document.getImportPlaces().each { importPlace ->
-                importPlace.tokens = useCase.activePlaces.get(net.places.values().find {
-                    it.importId == importPlace.id
-                }.getStringId())
-                if (importPlace.tokens == null)
-                    importPlace.tokens = 0
-            }
-            document.getImportData().each {
-                it.action = null
-                it.values = null
-                it.documentRefs = null
-            }
-            document.getImportTransitions().each {
-                it.dataGroup = null
-            }
-            document.importRoles = null
-            document.importTransactions = null
-            document.importData = null
-
-            Marshaller marshaller = jaxbContext.createMarshaller()
-            StringWriter stringWriter = new StringWriter()
-            marshaller.marshal(document, stringWriter)
-
-            return stringWriter.toString()
-        } catch (Exception ignored) {
-            log.error("Getting snapshot of net failed: ", ignored)
+        // TODO: NAE-1969 fix
+//        try {
+//            def useCase = caseRepository.findAll().find { it.title == title }
+//            def net = useCase.petriNet
+//            def xml = new File(net.importXmlPath)
+//
+//            JAXBContext jaxbContext = JAXBContext.newInstance(Document.class)
+//            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller()
+//            Document document = (Document) jaxbUnmarshaller.unmarshal(xml)
+//
+//            document.getImportPlaces().each { importPlace ->
+//                importPlace.tokens = useCase.activePlaces.get(net.places.values().find {
+//                    it.importId == importPlace.id
+//                }.getStringId())
+//                if (importPlace.tokens == null)
+//                    importPlace.tokens = 0
+//            }
+//            document.getImportData().each {
+//                it.action = null
+//                it.values = null
+//                it.documentRefs = null
+//            }
+//            document.getImportTransitions().each {
+//                it.dataGroup = null
+//            }
+//            document.importRoles = null
+//            document.importTransactions = null
+//            document.importData = null
+//
+//            Marshaller marshaller = jaxbContext.createMarshaller()
+//            StringWriter stringWriter = new StringWriter()
+//            marshaller.marshal(document, stringWriter)
+//
+//            return stringWriter.toString()
+//        } catch (Exception ignored) {
+//            log.error("Getting snapshot of net failed: ", ignored)
             return null
-        }
+//        }
     }
 
 }

src/main/groovy/com/netgrif/application/engine/migration/ActionMigration.groovy

@@ -1,10 +1,11 @@
 package com.netgrif.application.engine.migration
 
-import com.netgrif.application.engine.auth.service.interfaces.IUserService
-import com.netgrif.application.engine.petrinet.domain.PetriNet
+import com.netgrif.application.engine.authorization.service.interfaces.IUserService
+import com.netgrif.application.engine.petrinet.domain.Process
 import com.netgrif.application.engine.petrinet.domain.VersionType
+import com.netgrif.application.engine.petrinet.domain.params.ImportProcessParams
 import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
-import com.netgrif.application.engine.workflow.domain.eventoutcomes.petrinetoutcomes.ImportPetriNetEventOutcome
+import com.netgrif.application.engine.workflow.domain.outcomes.eventoutcomes.petrinetoutcomes.ImportPetriNetEventOutcome
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.core.io.ClassPathResource
@@ -20,49 +21,50 @@ class ActionMigration {
     private IPetriNetService petriNetService
 
     @Autowired
-    private IUserService userService;
+    private IUserService userService
 
     void migrateActions(String petriNetPath) {
         InputStream netStream = new ClassPathResource(petriNetPath).inputStream
-        ImportPetriNetEventOutcome newPetriNet = petriNetService.importPetriNet(netStream, VersionType.MAJOR, userService.loggedOrSystem.transformToLoggedUser())
-        List<PetriNet> oldPetriNets
+        ImportPetriNetEventOutcome newPetriNet = petriNetService.importProcess(new ImportProcessParams(netStream, VersionType.MAJOR,
+                userService.getSystemUser().stringId))
+        List<Process> oldPetriNets
 
-        if(newPetriNet.getNet() != null) {
+        if(newPetriNet.getProcess() != null) {
             String message = "Petri net from file [" + petriNetPath + "] was not imported"
             log.error(message)
             throw new IllegalArgumentException(message)
         } else {
-            oldPetriNets = petriNetService.getByIdentifier(newPetriNet.getNet().importId)
-                    .stream().filter({ net -> (net.version != newPetriNet.getNet().version)})
+            oldPetriNets = petriNetService.getByIdentifier(newPetriNet.getProcess().importId)
+                    .stream().filter({ net -> (net.version != newPetriNet.getProcess().version)})
                     .collect(Collectors.toList())
         }
 
         if(oldPetriNets.size() == 0){
-            String message = "Older version of Petri net with ID [" + newPetriNet.getNet().importId + "] is not present in MongoDB."
+            String message = "Older version of Petri net with ID [" + newPetriNet.getProcess().importId + "] is not present in MongoDB."
             log.error(message)
             throw new IllegalArgumentException(message)
         } else {
             oldPetriNets.each {net ->
-                migrateDataSetActions(newPetriNet.getNet(), net)
-                migrateDataRefActions(newPetriNet.getNet(), net)
+                migrateDataSetActions(newPetriNet.getProcess(), net)
+                migrateDataRefActions(newPetriNet.getProcess(), net)
                 petriNetService.save(net)
             }
         }
     }
 
-    private void migrateDataSetActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
+    private void migrateDataSetActions(Process newPetriNet, Process oldPetriNet) {
         newPetriNet.dataSet.each { key, data ->
             if (data.events != null && data.events.size() > 0) {
-                oldPetriNet.dataSet[key].events = data.events
+                oldPetriNet.dataSet.get(key).events = data.events
             }
         }
     }
 
-    private void migrateDataRefActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
+    private void migrateDataRefActions(Process newPetriNet, Process oldPetriNet) {
         newPetriNet.transitions.each { transKey, trans ->
             trans.dataSet.each { dataKey, data ->
                 if (data.events != null && data.events.size() > 0) {
-                    oldPetriNet.transitions[transKey].dataSet[dataKey].events = data.events
+                    oldPetriNet.transitions.get(transKey).dataSet.get(dataKey).events = data.events
                 }
             }
         }

src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionAPI.groovy

@@ -1,7 +1,7 @@
 package com.netgrif.application.engine.petrinet.domain.dataset.logic.action
 
 import com.netgrif.application.engine.elastic.web.requestbodies.CaseSearchRequest
-import com.netgrif.application.engine.petrinet.domain.PetriNet
+import com.netgrif.application.engine.petrinet.domain.Process
 import com.netgrif.application.engine.workflow.domain.Case
 import com.netgrif.application.engine.workflow.domain.Task
 import com.querydsl.core.types.Predicate
@@ -36,7 +36,7 @@ interface ActionAPI {
 
     Case createCase(ObjectId netId)
 
-    Case createCase(PetriNet net)
+    Case createCase(Process net)
 
     setData(Field, Map)