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 redundant count query for TE [DHIS2-15915] #15399

Closed
wants to merge 2 commits into from
Closed

fix: Remove redundant count query for TE [DHIS2-15915] #15399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
840c7ac
fix: Remove redundant count query for TE [DHIS2-15915]
enricocolasante Oct 13, 2023
c688103
Fix test
enricocolasante Oct 13, 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
2 changes: 1 addition & 1 deletion ...s-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ public void validateSearchScope(TrackedEntityQueryParams params, boolean isGridS
}

private void checkIfMaxTeiLimitIsReached(TrackedEntityQueryParams params, int maxTeiLimit) {
if (maxTeiLimit > 0) {
if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit)) {
int teCount = trackedEntityStore.getTrackedEntityCountForGridWithMaxTeiLimit(params);

if (teCount > maxTeiLimit) {
Expand Down
1 change: 1 addition & 0 deletions ...rvice-core/src/test/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ void setup() {
params.setProgram(new Program("Test program"));
params.getProgram().setMaxTeiCountToReturn(10);
params.setTrackedEntityUids(Set.of("1"));
params.setSkipPaging(true);
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/hisp/dhis/tracker/export/trackedentity/DefaultTrackedEntityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ private boolean isProgramMinAttributesViolated(TrackedEntityQueryParams params)
}

private void checkIfMaxTeiLimitIsReached(TrackedEntityQueryParams params, int maxTeiLimit) {
if (maxTeiLimit > 0) {
if (maxTeiLimit > 0 && (!params.isPaging() || params.getPageSize().intValue() > maxTeiLimit)) {
int teCount = trackedEntityStore.getTrackedEntityCountWithMaxTrackedEntityLimit(params);

if (teCount > maxTeiLimit) {
Expand Down
Loading