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.

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

feat: skipAnalytics and ConfidentialFlag only for QUERY Analytics [DHIS2-18259] #19350

Merged
merged 10 commits into from
Dec 3, 2024

Conversation

gnespolino
Copy link
Contributor

This pull request introduces updates to the handling of confidential Tracked Entity Attributes (TEA) and Program Attributes (PA), as well as skipAnalytics data elements (DE).

Key Changes:

  • Export Behavior: TEA/PA and DE are now consistently exported, irrespective of the confidential or skipAnalytics flags.
  • Query Endpoints: An error will be returned when attempting to use TEA/PA/DE with the confidential or skipAnalytics flags in QUERY endpoints.
  • Aggregate Analytics: The use of confidential TEA/PA and skipAnalytics DE is now supported in AGGREGATE analytics.

@gnespolino gnespolino requested a review from d-bernat December 1, 2024 18:17
@gnespolino gnespolino added the run-api-analytics-tests Enables analytics e2e tests label Dec 1, 2024
new ErrorMessage(
ErrorCode.E7240,
skipAnalyticsDataElements.stream()
.map(DataElement::getDisplayName)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we usually use uid in API validation responses as it is more compact.

…ytics_Confidential

# Conflicts:
#	dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEnrollmentAnalyticsTableManager.java
#	dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcEventAnalyticsTableManager.java
…ntial' into DHIS-18259_skipAnalytics_Confidential
@gnespolino gnespolino requested a review from larshelge December 2, 2024 13:33
Copy link
Contributor

@maikelarabori maikelarabori left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one minor about unit testing, please take a look.

Signed-off-by: Giuseppe Nespolino <[email protected]>
…ntial' into DHIS-18259_skipAnalytics_Confidential
Copy link

sonarqubecloud bot commented Dec 3, 2024

@gnespolino gnespolino merged commit dc0fa5e into master Dec 3, 2024
16 checks passed
@gnespolino gnespolino deleted the DHIS-18259_skipAnalytics_Confidential branch December 3, 2024 13:23
larshelge added a commit that referenced this pull request Dec 4, 2024
larshelge added a commit that referenced this pull request Dec 4, 2024
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants