Skip to content

REPORT-921: Fix null cohortQuery parameter in addColumn method #266

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

Open
AdityaBharatiya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

REPORT-921: Fix null cohortQuery parameter in addColumn method #266

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions ...c/main/java/org/openmrs/module/reporting/web/reports/PeriodIndicatorReportController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.openmrs.Location;
import org.openmrs.api.context.Context;
import org.openmrs.module.reporting.cohort.definition.CohortDefinition;
import org.openmrs.module.reporting.cohort.definition.service.CohortDefinitionService;
import org.openmrs.module.reporting.common.ObjectUtil;
import org.openmrs.module.reporting.dataset.definition.CohortIndicatorDataSetDefinition;
import org.openmrs.module.reporting.dataset.definition.CohortIndicatorDataSetDefinition.CohortIndicatorAndDimensionColumn;
Expand Down Expand Up @@ -95,14 +96,23 @@ public String addColumn(@RequestParam("uuid") String uuid,
@RequestParam("key") String key,
@RequestParam("displayName") String displayName,
@RequestParam("indicator") CohortIndicator indicator,
@RequestParam("cohortQuery") CohortDefinition cohortDefinition,
@RequestParam("cohortQuery") String cohortQueryUuid, // CHANGED: From CohortDefinition to String
@RequestParam(value = "createFromCohortQuery", required = false) String createFromCohortQuery,
WebRequest request) {

PeriodIndicatorReportDefinition report = (PeriodIndicatorReportDefinition) Context.getService(ReportDefinitionService.class).getDefinitionByUuid(uuid);
PeriodIndicatorReportUtil.ensureDataSetDefinition(report);
CohortIndicatorDataSetDefinition cidsd = report.getIndicatorDataSetDefinition();

// ADDED: Fetch the CohortDefinition using the UUID
CohortDefinitionService cohortDefinitionService = Context.getService(CohortDefinitionService.class);
CohortDefinition cohortDefinition = cohortDefinitionService.getDefinitionByUuid(cohortQueryUuid);

// ADDED: Safety check
if (cohortDefinition == null) {
throw new IllegalArgumentException("Could not find a CohortDefinition with UUID: " + cohortQueryUuid);
}

CohortIndicatorAndDimensionColumn column = null;
if (ObjectUtil.notNull(index)) {
column = cidsd.getColumns().get(index);
Expand Down Expand Up @@ -145,7 +155,7 @@ public String addColumn(@RequestParam("uuid") String uuid,
PeriodIndicatorReportUtil.saveDataSetDefinition(report);

return "redirect:periodIndicatorReport.form?uuid=" + uuid;
}
}

@RequestMapping("/module/reporting/reports/periodIndicatorReportRemoveColumn.form")
public String removeColumn(@RequestParam("uuid") String uuid,
Expand Down