Fixes to managers for mergable models #4528
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request includes several changes aimed at improving the handling of merge status objects in the
household
schema and permissions. The most important changes include modifications to theget_node
method, updates to various resolve methods to useall_merge_status_objects
, and adjustments to theSoftDeletableRepresentationMergeStatusModel
.Improvements to handling merge status objects:
src/hct_mis_api/apps/account/permissions.py
: Updated theget_node
method to accept additional keyword arguments and useget_object_queryset
if provided.src/hct_mis_api/apps/household/schema.py
: Added theget_node
method to theIndividualNode
andHousehold
classes to useall_merge_status_objects
for querying. [1] [2]src/hct_mis_api/apps/household/schema.py
: Updated various resolve methods to useall_merge_status_objects
for querying related objects, ensuring consistent handling of merge status. [1] [2] [3] [4]Adjustments to model managers:
src/hct_mis_api/apps/utils/models.py
: Changed theSoftDeletableRepresentationMergeStatusModel
to useSoftDeletableRepresentationMergedManager
for theobjects
manager, ensuring proper filtering byrdi_merge_status
.Minor changes:
src/frontend/src/containers/tables/rdi/ImportedHouseholdsTable/ImportedHouseholdTableRow.tsx
: Simplified the display logic for household IDs in theImportedHouseholdTableRow
component.src/hct_mis_api/apps/household/schema.py
: Added theModel
import to the schema file.