Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NAE-1998] Implement transactions for events #266

Open
wants to merge 50 commits into
base: release/8.0.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
c1b53c8
[NAE-1998] Implement transactions for events
Retoocs Jul 23, 2024
75c9f62
[NAE-1998] Implement transactions for events
Retoocs Jul 24, 2024
4aa4343
[NAE-1998] Implement transactions for events
Retoocs Jul 25, 2024
f0cdb49
[NAE-1998] Implement transactions for events
Retoocs Jul 26, 2024
6402c4b
[NAE-1998] Implement transactions for events
Retoocs Jul 29, 2024
44bdd01
[NAE-1998] Implement transactions for events
Retoocs Jul 30, 2024
2dae3a5
[NAE-1998] Implement transactions for events
Retoocs Jul 30, 2024
8fbae16
[NAE-1998] Implement transactions for events
Retoocs Jul 30, 2024
ca38f56
[NAE-1998] Implement transactions for events
Retoocs Jul 31, 2024
d84b099
[NAE-1998] Implement transactions for events
Retoocs Jul 31, 2024
b065b16
[NAE-1998] Implement transactions for events
Retoocs Jul 31, 2024
7d84da0
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
b708b64
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
c25fd5e
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
df95e08
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
ca90d16
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
a64e469
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
ad33f60
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
e366c59
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
a3405dd
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
91cf4f7
[NAE-1998] Implement transactions for events
machacjozef Jul 31, 2024
28c887a
[NAE-1998] Implement transactions for events
Retoocs Aug 5, 2024
a943bdc
[NAE-1998] Implement transactions for events
Retoocs Aug 5, 2024
41dd101
Merge remote-tracking branch 'origin/NAE-1998' into NAE-1998
Retoocs Aug 5, 2024
910a017
[NAE-1998] Implement transactions for events
Retoocs Aug 5, 2024
022a16d
[NAE-1998] Implement transactions for events
Retoocs Aug 6, 2024
4445d27
[NAE-1998] Implement transactions for events
Retoocs Aug 6, 2024
dc1af89
[NAE-1998] Implement transactions for events
Retoocs Aug 6, 2024
d5fbc7b
[NAE-1998] Implement transactions for events
Retoocs Aug 7, 2024
ad45169
[NAE-1998] Implement transactions for events
Retoocs Aug 7, 2024
b947432
[NAE-1998] Implement transactions for events
Retoocs Aug 7, 2024
109e60c
[NAE-1998] Implement transactions for events
Retoocs Aug 8, 2024
031f697
[NAE-1998] Implement transactions for events
Retoocs Aug 8, 2024
dc74e8e
[NAE-1998] Implement transactions for events
Retoocs Aug 9, 2024
dd7060e
[NAE-1998] Implement transactions for events
Retoocs Aug 9, 2024
4f9e4a6
[NAE-1998] Implement transactions for events
Retoocs Aug 9, 2024
22b93bb
Merge remote-tracking branch 'origin/release/8.0.0' into NAE-1998
Retoocs Aug 9, 2024
cf7713d
[NAE-1998] Implement transactions for events
Retoocs Aug 9, 2024
ee214a6
[NAE-1998] Implement transactions for events
Retoocs Aug 26, 2024
808f3de
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
d5797db
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
430ecc6
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
0c13aef
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
1d8bf43
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
411eb47
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
0770948
[NAE-1998] Implement transactions for events
Retoocs Aug 27, 2024
77fca7b
[NAE-1998] Implement transactions for events
Retoocs Aug 28, 2024
110e145
[NAE-1998] Implement transactions for events
Retoocs Aug 28, 2024
8a362d6
[NAE-1998] Implement transactions for events
Retoocs Aug 30, 2024
01ffba3
[NAE-1998] Implement transactions for events
Retoocs Sep 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 200
services:
mongo:
image: mongo:4.4
ports:
- 27017:27017

redis:
image: redis
Expand All @@ -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/mongodb-github-action@1.2.0
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:
Expand Down Expand Up @@ -86,7 +115,6 @@ 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

Expand Down
7 changes: 7 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/_media/roles/usersRef_functions.groovy
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Long getDummyUser() {
return userService.findByEmail("dummy@netgrif.com", true).id
return userService.findByEmail("dummy@netgrif.com").id
}

void debug() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ 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.petrinet.domain.VersionType
import com.netgrif.application.engine.petrinet.domain.params.ImportPetriNetParams
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
Expand All @@ -20,11 +21,12 @@ 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())
ImportPetriNetEventOutcome newPetriNet = petriNetService.importPetriNet(new ImportPetriNetParams(netStream,
VersionType.MAJOR, userService.loggedOrSystem.transformToLoggedUser()))
List<PetriNet> oldPetriNets

if(newPetriNet.getNet() != null) {
Expand All @@ -50,15 +52,15 @@ class ActionMigration {
}
}

private void migrateDataSetActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
private static void migrateDataSetActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
newPetriNet.dataSet.each { key, data ->
if (data.events != null && data.events.size() > 0) {
oldPetriNet.dataSet[key].events = data.events
}
}
}

private void migrateDataRefActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
private static void migrateDataRefActions(PetriNet newPetriNet, PetriNet oldPetriNet) {
newPetriNet.transitions.each { transKey, trans ->
trans.dataSet.each { dataKey, data ->
if (data.events != null && data.events.size() > 0) {
Expand Down
Loading
Loading