fix: Create program rule model [DHIS2-17243] #17807
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…7134] (#17169) * fix: Just call sideeffect threads without sending to a queue [DHIS2-17134] * Code review fixes * Code review fixes
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| import org.hisp.dhis.tracker.imports.TrackerImportStrategy; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** | ||
| * @author Zubair Asghar | ||
| */ | ||
| class TrackerSideEffectDataBundleTest { | ||
| class TrackerSideValidationEffectDataBundleTest { |
Check notice
Code scanning / CodeQL
Unused classes and interfaces Note test
enricocolasante
force-pushed
the
DHIS2-17243-model-change
branch
from
5fe80dc to
3ee8b96
Compare
teleivo
reviewed
Jun 26, 2024
...service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationActionType.java
Outdated
Show resolved
Hide resolved
...dhis-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/RuleEngineEffects.java
Outdated
Show resolved
Hide resolved
.../dhis-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/ValidationEffect.java
Outdated
Show resolved
Hide resolved
...service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationActionType.java
Outdated
Show resolved
Hide resolved
...his-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationEffect.java
Outdated
Show resolved
Hide resolved
...dhis-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/RuleEngineEffects.java
Outdated
Show resolved
Hide resolved
...-service-program-rule/src/main/java/org/hisp/dhis/programrule/engine/NotificationHelper.java
Outdated
Show resolved
Hide resolved
...s/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/TrackerBundle.java
Outdated
Show resolved
Hide resolved
teleivo
reviewed
Jun 27, 2024
|
|
||
| // These are needed for rule engine validation | ||
| RuleEngineEffects ruleEffects = | ||
| RuleEngineEffects.merge( |
There was a problem hiding this comment.
Do we need to merge them if we pull them apart again right after in
bundle.setEventNotificationEffects(ruleEffects.getEventNotificationEffects());Maybe you can walk us through how the RuleEffects/RuleEngineEffects enter into tracker. I wonder if we can reduce some of the mapping/merging.
...ker/src/main/java/org/hisp/dhis/tracker/imports/programrule/executor/ValidationExecutor.java
Outdated
Show resolved
Hide resolved
...in/java/org/hisp/dhis/tracker/imports/programrule/executor/enrollment/ShowErrorExecutor.java
Outdated
Show resolved
Hide resolved
teleivo
reviewed
Jun 28, 2024
...his-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationAction.java
Outdated
Show resolved
Hide resolved
...his-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationAction.java
Outdated
Show resolved
Hide resolved
...his-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationEffect.java
Outdated
Show resolved
Hide resolved
...his-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/NotificationEffect.java
Outdated
Show resolved
Hide resolved
.../dhis-service-program-rule/src/main/java/org/hisp/dhis/programrule/api/ValidationEffect.java
Outdated
Show resolved
Hide resolved
muilpp
approved these changes
Jul 1, 2024
teleivo
approved these changes
Jul 1, 2024
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The goal of this PR is to remove the dependency of rule-engine library from
dhis-service-trackermodule.To achieve that, we are creating an API layer in
dhis-program-rulemodule and making tracker use that model instead of rule-engine one.This approach has 2 advantages: