fix: do not ignore measure criteria in aggregated analytics query [DHIS2-18788]

[luciano-fiandesio]

Summary

This PR fixes a bug with aggregated analytics query containing the measureCriteria parameter. The parameter is ignored and the filtering condition is not applied to the final SQL query.

Problem

Given this query params:

/analytics?dimension=dx:GSae40Fyppf,pe:LAST_10_YEARS;LAST_12_MONTHS
&filter=ou:USER_ORGUNIT
&measureCriteria=GT:15;LE:21 <- measure criteria

The resulting SQL aggregated query does not contain the measuring criteria

select
	avg((date_part('year', age(cast(occurreddate as date), cast("iESIqZ0R0R0" as date))))) as value,
	ax."monthly"
from
	analytics_event_uy2gu8kt1jf as ax
where
	(ax."monthly" in ('202402', '202403', '202404', '202405', '202406', '202407', '202408', '202409', '202410', '202411', '202412', '202501') )
	and ax."uidlevel1" in ('ImspTQPwCqd')
	and ("iESIqZ0R0R0" is not null)
	and ax."yearly" in ('2025', '2024')
group by
	ax."monthly"

Fix

• Propagate the original measureFilter data from DataQueryParams to EventQueryParams
• Add the having clause to the query whenever measureFilter is present in EventQueryParams.
• Cast the expression to Numeric and round it, otherwise the comparison may fail due to floating point precision.
• Added 3 e2e test cases to verify various scenario

Fixed SQL aggregated query

select
	avg((date_part('year', age(cast(occurreddate as date), cast("iESIqZ0R0R0" as date))))) as value,
	ax."monthly"
from
	analytics_event_uy2gu8kt1jf as ax
where
	(ax."monthly" in ('202402', '202403', '202404', '202405', '202406', '202407', '202408', '202409', '202410', '202411', '202412', '202501') )
	and ax."uidlevel1" in ('ImspTQPwCqd')
	and ("iESIqZ0R0R0" is not null)
	and ax."yearly" in ('2025', '2024')
group by
	ax."monthly"
having round(avg(date_part('year', age(cast(occurreddate as date), cast("iESIqZ0R0R0" as date))))::NUMERIC,10) > 15

[maikelarabori]

We can also add an e2e, we can chat later on

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud