fix: Use correct get single TE for deduplication feature [DHIS2-18541] #20124
Conversation
This file contains 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
enricocolasante
force-pushed
the
DHIS2-18541-deduplication
branch
from
9be412d to
2eb8818
Compare
teleivo
approved these changes
Feb 28, 2025
...e/src/test/java/org/hisp/dhis/tracker/deduplication/merge/PotentialDuplicatesMergeTests.java
Outdated
Show resolved
Hide resolved
...test/java/org/hisp/dhis/tracker/deduplication/PotentialDuplicateRemoveTrackedEntityTest.java
Show resolved
Hide resolved
|
muilpp
reviewed
Feb 28, 2025
| DeduplicationMergeParams params = | ||
| DeduplicationMergeParams.builder() | ||
| .potentialDuplicate(potentialDuplicate) | ||
| .mergeObject(mergeObject) | ||
| .original(original) | ||
| .duplicate(duplicate) | ||
| .original(hibernateOriginal) |
There was a problem hiding this comment.
is this a temporary fix only?
There was a problem hiding this comment.
Yes, in this case we should completely refactor deduplication service and use the importer instead of custom stores. And then, we wouldn't need to get the tracked entities using the manager.
muilpp
approved these changes
Feb 28, 2025
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.
Moving
getTrackedEntity()to use the same code as multiple entities has a big impact in a lot of places in the system and it is going to be done in small steps, changing it feature by feature.Changes in this PR
getNewTrackedEntitymethod inDeduplicationController. We are using theTrackedEntityServiceonly to validate the tracked entity, then we use the manager to get a managed object that is needed for the deduplication operations.getTrackedEntity(UID)method.Challenges in tests
TrackedEntityAggregateis loading data in new threads so they have their own transaction and not committed data are not visible in those threads, that is why we cannot use@Transactionalannotation when we are importing data and reading in one one transaction.Common misconfigurations in tests
Next Steps
getTrackedEntity()methods and rename new onesOptional<T> find(UID)to our services