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.

Sign up for GitHub

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

fix: Remove unnecessary calls to the DB during DataValueSet import [DHIS2-16138] #15639

Merged
merged 3 commits into from
Nov 10, 2023
Merged

fix: Remove unnecessary calls to the DB during DataValueSet import [DHIS2-16138] #15639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79e17ab
fix: Remove calls to DB during DataValueSet import [DHIS2-16138]
david-mackessy Nov 10, 2023
b94a09b
fix: Update tests to reflect the removal of DB interaction [DHIS2-16138]
david-mackessy Nov 10, 2023
73d1d89
Merge branch 'master' into DHIS2-16138
david-mackessy Nov 10, 2023
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
4 changes: 1 addition & 3 deletions ...rvice-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetImportValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,7 @@ private void validateDataValueOrgUnitInUserHierarchy(
.getOrgUnitInHierarchyMap()
.get(
valueContext.getOrgUnit().getUid(),
() ->
organisationUnitService.isDescendant(
valueContext.getOrgUnit(), context.getCurrentOrgUnits()));
() -> valueContext.getOrgUnit().isDescendant(context.getCurrentOrgUnits()));

if (!inUserHierarchy) {
context.addConflict(
Expand Down
8 changes: 3 additions & 5 deletions ...e-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetImportValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ void setUp() {
approvalService = mock(DataApprovalService.class);
dataValueService = mock(DataValueService.class);
organisationUnitService = mock(OrganisationUnitService.class);
when(organisationUnitService.isDescendant(any(OrganisationUnit.class), any(Set.class)))
.thenReturn(true);
when(organisationUnitService.isDescendant(
any(OrganisationUnit.class), any(OrganisationUnit.class)))
.thenReturn(true);

i18n = mock(I18n.class);
validator =
Expand Down Expand Up @@ -899,6 +894,9 @@ private DataValueContextBuilder createDataValueContext(DataValue dataValue) {
if (ouId != null) {
OrganisationUnit ou = new OrganisationUnit();
ou.setUid(ouId);
// we set the path here just for the tests. This is usually done by the persistence layer
// but there is no interaction with that in these tests.
ou.setPath(ou.getPath());
builder.orgUnit(ou);
}
if (coId != null) {
Expand Down
Loading