Skip to content

[NAE-1998] Implement transactions for events #266

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

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 1 commit
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
Prev Previous commit
Next Next commit
[NAE-1998] Implement transactions for events
- fix TransactionTest.testBasicTransactionWithFailure
- implement transactional option in DataService.setData
- implement new tests in DataServiceTest
  • Loading branch information
Retoocs committed Aug 26, 2024
commit ee214a6283a6a71e1f20d3f46da4ca0f537c1a5a
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ public class NaeTransaction {
* Transaction code to be executed under transaction.
* */
private Closure<?> event;
/**
* Return value of the {@link #event}
* */
private Object resultOfEvent;
/**
* Callback, that is called when {@link NaeTransaction#event} is successful.
* */
Expand Down Expand Up @@ -72,7 +76,7 @@ public void begin() {
protected void doInTransactionWithoutResult(TransactionStatus status) {
try {
registerTransactionCallBacks();
event.call();
resultOfEvent = event.call();
throwIfDeadlineReached(); // Transaction API does not check the timeout declared in transaction template
} catch (Exception rethrow) {
onEventException = rethrow;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ public class SetDataParams {
private DataSet dataSet;
private IUser user;
@Builder.Default
private boolean isTransactional = false;
@Builder.Default
private Map<String, String> params = new HashMap<>();

public SetDataParams(Task task, DataSet dataSet, IUser user) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.netgrif.application.engine.petrinet.domain.dataset.logic.action.ActionRunner;
import com.netgrif.application.engine.petrinet.domain.events.DataEvent;
import com.netgrif.application.engine.petrinet.domain.events.EventPhase;
import com.netgrif.application.engine.transaction.NaeTransaction;
import com.netgrif.application.engine.validation.service.interfaces.IValidationService;
import com.netgrif.application.engine.workflow.domain.Case;
import com.netgrif.application.engine.workflow.domain.DataFieldBehavior;
Expand All @@ -33,6 +34,7 @@
import com.netgrif.application.engine.workflow.service.interfaces.ITaskService;
import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService;
import com.netgrif.application.engine.workflow.web.responsebodies.DataSet;
import groovy.lang.Closure;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.pdfbox.pdmodel.PDDocument;
Expand All @@ -42,7 +44,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.mongodb.MongoTransactionManager;
import org.springframework.stereotype.Service;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import javax.imageio.ImageIO;
Expand Down Expand Up @@ -76,6 +81,9 @@ public class DataService implements IDataService {
@Autowired
private IHistoryService historyService;

@Autowired
private MongoTransactionManager transactionManager;

@Autowired
private IValidationService validation;

Expand Down Expand Up @@ -158,6 +166,9 @@ private void fillMissingAttributes(GetDataParams getDataParams) throws IllegalAr
}
}

/**
* todo javadoc
* */
@Override
public SetDataEventOutcome setData(SetDataParams setDataParams) {
fillMissingAttributes(setDataParams);
Expand All @@ -168,11 +179,34 @@ public SetDataEventOutcome setData(SetDataParams setDataParams) {
if (task.getUserId() != null) {
task.setUser(userService.findById(task.getUserId()));
}

if (setDataParams.isTransactional()) {
NaeTransaction transaction = NaeTransaction.builder()
.timeout(TransactionDefinition.TIMEOUT_DEFAULT)
.forceCreation(false)
.transactionManager(transactionManager)
.event(new Closure<SetDataEventOutcome>(null) {
@Override
public SetDataEventOutcome call() {
return doSetData(setDataParams);
}
})
.build();
transaction.begin();
return (SetDataEventOutcome) transaction.getResultOfEvent();
} else {
return doSetData(setDataParams);
}
}

private SetDataEventOutcome doSetData(SetDataParams setDataParams) {
Task task = setDataParams.getTask();
List<EventOutcome> outcomes = new ArrayList<>();
for (Map.Entry<String, Field<?>> stringFieldEntry : setDataParams.getDataSet().getFields().entrySet()) {
String fieldId = stringFieldEntry.getKey();
Field<?> newDataField = stringFieldEntry.getValue();
outcomes.add(setDataField(task, fieldId, newDataField, setDataParams.getUser()));
SetDataEventOutcome setDataEventOutcome = setDataField(task, fieldId, newDataField, setDataParams.getUser());
outcomes.add(setDataEventOutcome);
}
Case useCase = workflowService.findOne(task.getCaseId());
return new SetDataEventOutcome(useCase, task, outcomes);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ class TransactionTest {

@Test
void testBasicTransactionWithFailure() {
Case useCase = createTestCaseAndSetButton("test", "testBasicTransactionWithFailure")
importHelper.createCase("toBeRemoved", testNet)
Case useCase = createTestCaseAndSetButton("test", "testBasicTransactionWithFailure")

assert findAllByIdentifier("transaction_test").size() == 4

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,18 @@ import com.netgrif.application.engine.petrinet.domain.DataGroup
import com.netgrif.application.engine.petrinet.domain.DataRef
import com.netgrif.application.engine.petrinet.domain.PetriNet
import com.netgrif.application.engine.petrinet.domain.VersionType
import com.netgrif.application.engine.petrinet.domain.dataset.ButtonField
import com.netgrif.application.engine.petrinet.domain.dataset.Field
import com.netgrif.application.engine.petrinet.domain.params.ImportPetriNetParams
import com.netgrif.application.engine.petrinet.service.interfaces.IPetriNetService
import com.netgrif.application.engine.startup.ImportHelper
import com.netgrif.application.engine.startup.SuperCreator
import com.netgrif.application.engine.workflow.domain.outcomes.eventoutcomes.dataoutcomes.SetDataEventOutcome
import com.netgrif.application.engine.workflow.domain.outcomes.eventoutcomes.petrinetoutcomes.ImportPetriNetEventOutcome
import com.netgrif.application.engine.workflow.domain.params.SetDataParams
import com.netgrif.application.engine.workflow.service.interfaces.IDataService
import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService
import com.netgrif.application.engine.workflow.web.responsebodies.DataSet
import groovy.transform.CompileStatic
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Disabled
Expand All @@ -24,6 +29,8 @@ import org.springframework.mock.web.MockMultipartFile
import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.junit.jupiter.SpringExtension

import static org.junit.jupiter.api.Assertions.assertThrows

@ExtendWith(SpringExtension.class)
@ActiveProfiles(["test"])
@SpringBootTest
Expand Down Expand Up @@ -125,6 +132,74 @@ class DataServiceTest {
assert dataGroups.get(3).getParentTaskRefId() == "taskRef_0"
}

@Test
void testTransactionalSetDataOutcomes() {
def aCase = importHelper.createCase("Case", this.setDataNet)
ButtonField buttonWithValueOne = new ButtonField()
buttonWithValueOne.setRawValue(1)

assert aCase != null

SetDataParams setDataParams = SetDataParams.with()
.useCase(aCase)
.user(superCreator.superUser)
.isTransactional(true)
.dataSet(new DataSet(Map.of(
"button_1", (Field<Integer>) buttonWithValueOne,
"button_0", (Field<Integer>) buttonWithValueOne
)))
.build()
SetDataEventOutcome outcome = dataService.setData(setDataParams)
assert outcome
assert outcome.getOutcomes().size() == 2
}

@Test
void testTransactionalSetDataFailure() {
def aCase = importHelper.createCase("Case", this.setDataNet)
ButtonField buttonWithValueOne = new ButtonField()
buttonWithValueOne.setRawValue(1)

assert aCase != null

SetDataParams setDataParams = SetDataParams.with()
.useCase(aCase)
.user(superCreator.superUser)
.isTransactional(true)
.dataSet(new DataSet(Map.of(
"button_1", (Field<Integer>) buttonWithValueOne,
"non_existing_button", (Field<Integer>) buttonWithValueOne
)))
.build()
assertThrows(IllegalArgumentException.class, { dataService.setData(setDataParams) })

aCase = workflowService.findOne(aCase.stringId)
assert aCase.getDataSet().get("button_1").getRawValue() != 1
}

@Test
void testTransactionalSetDataSuccess() {
def aCase = importHelper.createCase("Case", this.setDataNet)
ButtonField buttonWithValueOne = new ButtonField()
buttonWithValueOne.setRawValue(1)

assert aCase != null

SetDataParams setDataParams = SetDataParams.with()
.useCase(aCase)
.user(superCreator.superUser)
.isTransactional(false)
.dataSet(new DataSet(Map.of(
"button_1", (Field<Integer>) buttonWithValueOne,
"non_existing_button", (Field<Integer>) buttonWithValueOne
)))
.build()
assertThrows(IllegalArgumentException.class, { dataService.setData(setDataParams) })

aCase = workflowService.findOne(aCase.stringId)
assert aCase.getDataSet().get("button_1").getRawValue() == 1
}

// @Test
// void testSetDataAllowednets() {
// def aCase = importHelper.createCase("test allowed nets", setDataNet)
Expand Down