Skip to content

[2.43] fix: Stage.ou dimension metadata with LEVEL/OU_GROUP selectors [DHIS2-21595]#24243

Merged
luciano-fiandesio merged 6 commits into
2.43from
DHIS2-21595_OU_METADATA_FIX_2.43
Jun 19, 2026
Merged

[2.43] fix: Stage.ou dimension metadata with LEVEL/OU_GROUP selectors [DHIS2-21595]#24243
luciano-fiandesio merged 6 commits into
2.43from
DHIS2-21595_OU_METADATA_FIX_2.43

Conversation

@luciano-fiandesio

Copy link
Copy Markdown
Contributor

Backport from 4ffc865

@luciano-fiandesio
luciano-fiandesio requested a review from a team as a code owner June 17, 2026 10:19
@luciano-fiandesio luciano-fiandesio added run-api-analytics-tests Enables analytics e2e tests run-api-analytics-tests-doris Enables analytics e2e tests on Doris labels Jun 17, 2026
luciano-fiandesio and others added 3 commits June 18, 2026 09:49
…-21595] (#24110)

* fix: Stage.ou dimension metadata with LEVEL/OU_GROUP selectors [DHIS2-21595]

* test: verify commit signing

* fix: org unit data element filters rejected with E7143

Filtering a data element by a mix of org units and levels/groups could
fail with an error instead of returning data. Such filters now correctly
match the listed org units together with the level/group members, while
stage org unit dimensions keep their existing behaviour.

* Fix e2e tests (headers)

* Add GPG configuration to API analytics test workflow

* fix: proper implementation of GPG signing

* fix: remove need for KEY_ID

* fix: align signing user

* fix: use SSH instead of PGP keys

* fix: temporarily disable reports push

---------

Co-authored-by: Philip-Larsen-Donnelly <35666657+Philip-Larsen-Donnelly@users.noreply.github.com>
Co-authored-by: Philip-Larsen-Donnelly <phil@dhis2.org>
@luciano-fiandesio
luciano-fiandesio force-pushed the DHIS2-21595_OU_METADATA_FIX_2.43 branch from ec2a646 to f94a755 Compare June 18, 2026 12:10
@sonarqubecloud

Copy link
Copy Markdown

@luciano-fiandesio
luciano-fiandesio enabled auto-merge (squash) June 19, 2026 11:30
@luciano-fiandesio
luciano-fiandesio merged commit c1abd2e into 2.43 Jun 19, 2026
18 of 19 checks passed
@luciano-fiandesio
luciano-fiandesio deleted the DHIS2-21595_OU_METADATA_FIX_2.43 branch June 19, 2026 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

run-api-analytics-tests Enables analytics e2e tests run-api-analytics-tests-doris Enables analytics e2e tests on Doris

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants