Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters #2204

shivankacker · 2024-05-28T16:53:46Z

Proposed Changes

Overwrites last_consultation_admitted_bed_type_list filter in Discharge Patient Viewset

Associated Issue

Follow-up : Admitted to filter in Facility Specific discharge patient page care_fe#7869

Merge Checklist

Tests added/fixed
Update docs in /docs
Linting Complete
Any other necessary step

Only PR's with test cases included and passing lint and test pipelines will be reviewed

@coronasafe/care-backend-maintainers @coronasafe/care-backend-admins

nihal467 · 2024-06-04T13:48:18Z

QA test failed, @skks1212 make the necessary fixes

…charge-admitted-to-filter

nihal467 · 2024-06-10T19:48:57Z

QA test failed, @skks1212 make the necessary fixes

…charge-admitted-to-filter

codecov · 2024-06-15T11:19:24Z

Codecov Report

Attention: Patch coverage is 85.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 65.50%. Comparing base (e029196) to head (6bbc84b).
Report is 1 commits behind head on develop.

Files with missing lines	Patch %	Lines
care/facility/api/viewsets/patient.py	83.33%	1 Missing and 2 partials ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2204      +/-   ##
===========================================
+ Coverage    65.49%   65.50%   +0.01%     
===========================================
  Files          243      243              
  Lines        14054    14070      +16     
  Branches      1949     1952       +3     
===========================================
+ Hits          9204     9217      +13     
- Misses        4464     4465       +1     
- Partials       386      388       +2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

nihal467 · 2024-06-18T12:14:50Z

LGTM

care/facility/api/viewsets/patient.py

…charge-admitted-to-filter

care/facility/tests/test_patient_api.py

nihal467 · 2024-07-03T14:24:01Z

@skks1212 can you modify the test as requested before proceeding to further review

shivankacker · 2024-07-03T15:19:12Z

@sainak made requested changes, please review

care/facility/api/viewsets/patient.py

vigneshhari · 2024-07-08T16:48:38Z

care/facility/api/viewsets/patient.py

    queryset = (
-        PatientRegistration.objects.select_related(
+        PatientRegistration.objects.annotate(
+            last_discharge_consultation__id=Subquery(


You dont need to explicitly specify it as a subquery, it should automatically understand that its a subquery.
ids = Something.objects.values_list('id', flat=True)
SomethingElse.objects.filter(something_id__in=ids)

Will only have one query.

But will it not be required to use OuterRef?

…charge-admitted-to-filter

shivankacker · 2024-07-08T21:35:05Z

Lint failing but I have no idea why.
pre-commit run --all-files throws :

flake8...................................................................Failed
- hook id: flake8
- exit code: 1

care/utils/assetintegration/hl7monitor.py:19:36: E713 test for membership should be 'not in'
care/utils/assetintegration/onvif.py:26:36: E713 test for membership should be 'not in'
care/utils/assetintegration/ventilator.py:19:36: E713 test for membership should be 'not in'

These files are not related to the PR
cc. @sainak

care/facility/api/viewsets/patient.py

anroopak · 2024-09-16T09:47:19Z

care/facility/api/viewsets/patient.py

        filters.DjangoFilterBackend,
        rest_framework_filters.OrderingFilter,
        PatientCustomOrderingFilter,
    )
-    filterset_class = PatientFilterSet
+    filterset_class = DischargePatientFilterSet
    queryset = (


@shivankacker This seems like a pretty complex query. Can you add a simple comment about what this filter does?

@anroopak I have added some documentation for the filter, please have a look

vigneshhari

Ignore this approval

Shivank Kacker added 2 commits May 28, 2024 20:25

fixes admitted-to filter for discharged patients

7ae7872

added test

383dba5

shivankacker requested a review from a team as a code owner May 28, 2024 16:53

shivankacker mentioned this pull request May 28, 2024

Reenabled discharge patient admitted to filter ohcnetwork/care_fe#7933

Merged

6 tasks

shivankacker added 3 commits June 4, 2024 19:23

Merge branch 'develop' of https://github.com/coronasafe/care into dis…

105980e

…charge-admitted-to-filter

.

370332d

fixed

3ab9e09

shivankacker added 4 commits June 14, 2024 21:44

.

00f81f0

revert

e663efc

Merge branch 'develop' of https://github.com/coronasafe/care into dis…

4da837d

…charge-admitted-to-filter

fixed

9c6f4e6

sainak approved these changes Jun 18, 2024

View reviewed changes

vigneshhari reviewed Jun 24, 2024

View reviewed changes

care/facility/api/viewsets/patient.py Show resolved Hide resolved

sainak reviewed Jul 2, 2024

View reviewed changes

care/facility/api/viewsets/patient.py Show resolved Hide resolved

shivankacker added 3 commits July 2, 2024 20:32

Merge branch 'develop' of https://github.com/coronasafe/care into dis…

a97d281

…charge-admitted-to-filter

Filter permissions

25aabbb

Fixed tests

27d115c

sainak reviewed Jul 3, 2024

View reviewed changes

care/facility/tests/test_patient_api.py Outdated Show resolved Hide resolved

updated tests

49e7bd6

shivankacker requested a review from vigneshhari July 3, 2024 15:21

sainak approved these changes Jul 3, 2024

View reviewed changes

vigneshhari requested changes Jul 8, 2024

View reviewed changes

shivankacker added 2 commits July 9, 2024 02:34

optimizations

a18cd40

Merge branch 'develop' of https://github.com/coronasafe/care into dis…

c517d34

…charge-admitted-to-filter

shivankacker added 2 commits July 9, 2024 02:46

trying to fix lint

7e12e98

trying to fix lint

743d7f8

shivankacker requested a review from vigneshhari July 8, 2024 21:35

sainak reviewed Jul 9, 2024

View reviewed changes

care/facility/api/viewsets/patient.py Outdated Show resolved Hide resolved

sainak added 2 commits July 9, 2024 16:06

fix lint error

ea9b637

Merge branch 'develop' into discharge-admitted-to-filter

f4221ff

sainak approved these changes Jul 30, 2024

View reviewed changes

shivankacker self-assigned this Sep 2, 2024

Merge branch 'develop' into discharge-admitted-to-filter

3ca7f47

anroopak reviewed Sep 16, 2024

View reviewed changes

vigneshhari approved these changes Sep 16, 2024

View reviewed changes

added documentation

5514ce9

shivankacker requested a review from anroopak September 17, 2024 07:11

fix merge conflict

5bb8b4b

vigneshhari added the changes required label Sep 23, 2024

anroopak approved these changes Sep 23, 2024

View reviewed changes

vigneshhari approved these changes Sep 23, 2024

View reviewed changes

Merge branch 'develop' into discharge-admitted-to-filter

6bbc84b

vigneshhari merged commit c7637ea into develop Sep 23, 2024
7 of 8 checks passed

vigneshhari deleted the discharge-admitted-to-filter branch September 23, 2024 07:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters #2204

Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters #2204

shivankacker commented May 28, 2024 •

edited

Loading

nihal467 commented Jun 4, 2024

nihal467 commented Jun 10, 2024

codecov bot commented Jun 15, 2024 •

edited

Loading

nihal467 commented Jun 18, 2024

nihal467 commented Jul 3, 2024 •

edited

Loading

shivankacker commented Jul 3, 2024

vigneshhari Jul 8, 2024

shivankacker Jul 8, 2024

shivankacker commented Jul 8, 2024 •

edited

Loading

anroopak Sep 16, 2024

shivankacker Sep 17, 2024

vigneshhari left a comment •

edited

Loading

Adds functionality for last_consultation_admitted_bed_type_list in discharge patient filters #2204

Adds functionality for last_consultation_admitted_bed_type_list in discharge patient filters #2204

Conversation

shivankacker commented May 28, 2024 • edited Loading

Proposed Changes

Associated Issue

Merge Checklist

nihal467 commented Jun 4, 2024

nihal467 commented Jun 10, 2024

codecov bot commented Jun 15, 2024 • edited Loading

Codecov Report

nihal467 commented Jun 18, 2024

nihal467 commented Jul 3, 2024 • edited Loading

shivankacker commented Jul 3, 2024

vigneshhari Jul 8, 2024

Choose a reason for hiding this comment

shivankacker Jul 8, 2024

Choose a reason for hiding this comment

shivankacker commented Jul 8, 2024 • edited Loading

anroopak Sep 16, 2024

Choose a reason for hiding this comment

shivankacker Sep 17, 2024

Choose a reason for hiding this comment

vigneshhari left a comment • edited Loading

Choose a reason for hiding this comment

Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters #2204

Adds functionality for `last_consultation_admitted_bed_type_list` in discharge patient filters #2204

shivankacker commented May 28, 2024 •

edited

Loading

codecov bot commented Jun 15, 2024 •

edited

Loading

nihal467 commented Jul 3, 2024 •

edited

Loading

shivankacker commented Jul 8, 2024 •

edited

Loading

vigneshhari left a comment •

edited

Loading