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

Jump to bottom

chore: Propagate includeDeleted through relationships [DHIS2-18883] #19919

Merged
merged 1 commit into from
Feb 17, 2025
Merged

chore: Propagate includeDeleted through relationships [DHIS2-18883] #19919

merged 1 commit into from
Feb 17, 2025

Conversation

enricocolasante
Copy link
Contributor

@enricocolasante enricocolasante commented Feb 13, 2025 •
edited
Loading

Propagate includeDeleted params from any entity service to RelationshipService to include soft-deleted relationshipItems when includeDeleted is true.

Next steps

  • Fix isDeleted check in OperationsParamsValidator
  • Check if we can remove isDeleted check from RelationshipService
  • Serve multiple and single tracked entities using the same path
  • Pass field params to RelationshipService in order to only retrieve from the DB what is needed.
  • Changing the test input to use the view model in relationship tests

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed 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

@enricocolasante enricocolasante marked this pull request as ready for review February 17, 2025 10:51
@enricocolasante enricocolasante requested a review from a team as a code owner February 17, 2025 10:51
@enricocolasante enricocolasante enabled auto-merge (squash) February 17, 2025 12:53
teleivo
teleivo approved these changes Feb 17, 2025
View reviewed changes
...g/hisp/dhis/webapi/controller/tracker/export/enrollment/EnrollmentsExportControllerTest.java

JsonList<JsonRelationship> jsonRelationships =
GET(
"/tracker/enrollments?enrollments={id}&fields=*&includeDeleted=false",
Copy link
Contributor

Choose a reason for hiding this comment

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

Our tests should probably also only ask for what they need in the fields to make them as slow as necessary 😅

@enricocolasante enricocolasante merged commit 68ffdfb into master Feb 17, 2025
17 checks passed
@enricocolasante enricocolasante deleted the DHIS2-18883 branch February 17, 2025 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ameenhere ameenhere ameenhere approved these changes

@teleivo teleivo teleivo approved these changes

@muilpp muilpp Awaiting requested review from muilpp

@zubaira zubaira Awaiting requested review from zubaira

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@enricocolasante @ameenhere @teleivo