Prevent import of duplicate default COCs #19101
Merged
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
dhis-2/dhis-api/src/main/java/org/hisp/dhis/feedback/ErrorCode.java
Outdated
Show resolved
Hide resolved
...java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/CategoryOptionComboObjectBundleHook.java
Outdated
Show resolved
Hide resolved
...java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/CategoryOptionComboObjectBundleHook.java
Outdated
Show resolved
Hide resolved
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...isp/dhis/webapi/controller/dataintegrity/DataIntegrityCategoryOptionComboDuplicatedTest.java
Fixed
Show fixed
Hide fixed
...web-api/src/test/java/org/hisp/dhis/webapi/controller/CategoryOptionComboControllerTest.java
Fixed
Show fixed
Hide fixed
...java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/CategoryOptionComboObjectBundleHook.java
Fixed
Show fixed
Hide fixed
...java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/CategoryOptionComboObjectBundleHook.java
Fixed
Show fixed
Hide fixed
...ration/src/test/java/org/hisp/dhis/tracker/imports/validation/EventImportValidationTest.java
Outdated
Show resolved
Hide resolved
jbee
reviewed
Nov 26, 2024
...java/org/hisp/dhis/dxf2/metadata/objectbundle/hooks/CategoryOptionComboObjectBundleHook.java
Outdated
Show resolved
Hide resolved
|
As discussed the basic idea of this PR is not wrong but to really validate duplicates correctly we need to consider all effects of the import context as a whole which is difficult to do in the bundle hooks. This needs some more thinking about where we could have such a overall consistency validation. |
jason-p-pickering
changed the title
jbee
approved these changes
Nov 30, 2024
|
david-mackessy
approved these changes
Dec 2, 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.
This PR attempts to solve two problems when importing an alternative default Category option combos through the metadata API. This PR should prevent the import of a duplicated, non-standard default category option combination.
Some time ago, this was hard-coded into the system, but it is still possible to import another default COC with a different UID. This creates all sorts of analysis and configuration issues. A separate integrity check has also been created to identify this situation in existing systems. Various tests which utilized the alternative default COCs needed to be updated.
Some tests needed to be updated as part of this PR. Some integration and E2E tests were utilizing an alternative default COC, and these have now been updated to use the standard default COC instead.