fix(asset_location): added duty_staff endpoint #1689

aeswibon · 2023-10-27T13:15:00Z

Feature Request

Proposed Changes

Adds duty_staff field to asset location model and serializer

Associated PR

Required by fix(location): duty doctors and staff for each location in a facility care_fe#6512

Merge Checklist

Tests added/fixed
Update docs in /docs
Linting Complete

@coronasafe/code-reviewers

codecov · 2023-10-27T13:22:57Z

Codecov Report

Attention: Patch coverage is 70.21277% with 14 lines in your changes missing coverage. Please review.

Project coverage is 61.43%. Comparing base (5177552) to head (7e690cf).
Report is 364 commits behind head on develop.

Files with missing lines	Patch %	Lines
care/facility/api/viewsets/asset.py	60.60%	8 Missing and 5 partials ⚠️
care/facility/models/asset.py	87.50%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1689      +/-   ##
===========================================
+ Coverage    61.39%   61.43%   +0.03%     
===========================================
  Files          211      211              
  Lines        11593    11639      +46     
  Branches      1660     1674      +14     
===========================================
+ Hits          7118     7150      +32     
- Misses        4203     4212       +9     
- Partials       272      277       +5

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

nihal467 · 2023-10-30T09:13:45Z

@cp-coder remove the maximum limit of 3 users

aeswibon · 2023-10-30T16:54:17Z

Okay, I will remove the validation

nihal467 · 2023-10-31T11:58:41Z

LGTM

rithviknishad

When removing a duty staff user from asset location, those records are not set to deleted=True instead it's permanently deleted right?

cc: @sainak

care/facility/api/serializers/asset.py

sainak · 2023-11-03T07:13:29Z

When removing a duty staff user from asset location, those records are not set to deleted=True instead it's permanently deleted right?

cc: @sainak

yeah we can use a custom through model

cc: @vigneshhari

rithviknishad

@cp-coder I don't see a custom through model that inherits BaseModel

care/facility/models/asset.py

rithviknishad

When removing a duty staff user from asset location, those records are not set to deleted=True instead it's permanently deleted right?

There still seems to be no API endpoint/way to unlink a staff from a location.

aeswibon · 2023-11-20T12:35:10Z

When removing a duty staff user from asset location, those records are not set to deleted=True instead it's permanently deleted right?

There still seems to be no API endpoint/way to unlink a staff from a location.

We can just remove the staff from the doctor/staff list in the location form and it will automatically unlink the staff.

rithviknishad

But this just deletes and recreates the same objects everytime a new user is assigned to a location. Say there are three users, A, B, C. And you want to remove user C and add user D.

In the current approach, you are removing all existing ones for a particular location (A, B, C) and you create new M2M records with (A, B, D).
This performs unnecessary soft deletes and create operations for user A and B. And if we inspect the created_date of those records, it'd end up being the new date, although A and B user were linked before this datetime.

Imaging you have 10 users linked to a location. You'd end up recreating 10 records? Why?

This seems unnecessary.

What's required is, two API endpoints:

POST /location/{location__external_id}/duty_staff which will link a user to a location.

DELETE /location{id}/duty_staff/{external_id} which will unlink a user from a location (soft-delete).

This would avoid unnecessary soft deletes and creates too, and the created_date of the m2m record also would be correct.

vigneshhari · 2024-01-03T09:00:15Z

care/facility/api/viewsets/asset.py

+                {"duty_staff": "Staff already assigned to the location"}
+            )
+
+        user = User.objects.filter(id=duty_staff, home_facility=asset.facility)


This needs to be performed first, we need to check if a use exists before doing anything else, we also need to ensure that the id is an integer or perform some validation on it.

vigneshhari · 2024-01-03T09:00:45Z

care/facility/api/viewsets/asset.py

+                {"duty_staff": "Staff already assigned to the location"}
+            )
+
+        user = User.objects.filter(id=duty_staff, home_facility=asset.facility)


use first() here itself. no need for 2 queries.

rithviknishad · 2024-01-08T06:46:57Z

Marking as hold as the requirements have changed and a more refined feature "User Availability" will be built that adds more depth and it would replace the "Duty Staff for Locations" feature.

Issue: ohcnetwork/care_fe#6968

nihal467 · 2024-08-13T08:16:13Z

reopening the PR, we can fix and merge it for now, as the larger PR of generic scheduling is under the planning phase

@rithviknishad can you clear conflict and make it ready for testing

vigneshhari · 2024-09-22T17:09:20Z

Closing because of inactivity.

aeswibon requested a review from sainak October 27, 2023 13:16

aeswibon force-pushed the issue#5364 branch from 34d2e04 to 49f1381 Compare October 30, 2023 17:48

rithviknishad reviewed Oct 31, 2023

View reviewed changes

rithviknishad added the waiting-for-review label Oct 31, 2023

sainak reviewed Nov 3, 2023

View reviewed changes

care/facility/api/serializers/asset.py Outdated Show resolved Hide resolved

care/facility/api/serializers/asset.py Outdated Show resolved Hide resolved

rithviknishad added changes required and removed waiting-for-review labels Nov 5, 2023

aeswibon force-pushed the issue#5364 branch from 49f1381 to 94fcef3 Compare November 8, 2023 13:54

aeswibon added waiting-for-review done and removed changes required labels Nov 8, 2023

rithviknishad requested changes Nov 8, 2023

View reviewed changes

rithviknishad added changes required and removed waiting-for-review done labels Nov 8, 2023

aeswibon force-pushed the issue#5364 branch from 94fcef3 to 5675971 Compare November 17, 2023 07:30

rithviknishad reviewed Nov 17, 2023

View reviewed changes

care/facility/models/asset.py Outdated Show resolved Hide resolved

rithviknishad reviewed Nov 17, 2023

View reviewed changes

care/facility/models/asset.py Outdated Show resolved Hide resolved

aeswibon force-pushed the issue#5364 branch from 7bddcd3 to 397a085 Compare November 17, 2023 13:29

aeswibon added waiting-for-review and removed changes required labels Nov 17, 2023

rithviknishad requested a review from sainak November 18, 2023 04:23

rithviknishad requested changes Nov 20, 2023

View reviewed changes

rithviknishad approved these changes Nov 28, 2023

View reviewed changes

aeswibon force-pushed the issue#5364 branch from a02f263 to 6d388cf Compare December 4, 2023 14:54

sainak approved these changes Dec 6, 2023

View reviewed changes

aeswibon force-pushed the issue#5364 branch from 0911947 to dc90af2 Compare December 8, 2023 06:15

aeswibon added 5 commits December 15, 2023 08:44

fix(asset_location): added duty_staff endpoint

5fd0e78

fix(asset): replaced bulk operation with individual operation

825d68b

fix(asset): fixed migrations

38081e9

fix(asset): fixed linting errors

8e03aee

fix(facility): rebased with master branch

7e690cf

aeswibon force-pushed the issue#5364 branch from dc90af2 to 7e690cf Compare December 15, 2023 03:16

rithviknishad approved these changes Dec 20, 2023

View reviewed changes

Ashesh3 approved these changes Dec 20, 2023

View reviewed changes

khavinshankar approved these changes Dec 20, 2023

View reviewed changes

vigneshhari requested changes Jan 3, 2024

View reviewed changes

rithviknishad added the Hold label Jan 8, 2024

rithviknishad added the do-not-merge label Jan 8, 2024

sainak added the to-be-closed PRs with no updates in the last 3 weeks will be closed label May 12, 2024

vigneshhari closed this May 12, 2024

nihal467 reopened this Aug 13, 2024

nihal467 requested a review from a team as a code owner August 13, 2024 08:13

nihal467 assigned rithviknishad Aug 13, 2024

nihal467 added changes required and removed do-not-merge waiting-for-review Hold to-be-closed PRs with no updates in the last 3 weeks will be closed labels Aug 13, 2024

vigneshhari closed this Sep 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(asset_location): added duty_staff endpoint #1689

fix(asset_location): added duty_staff endpoint #1689

aeswibon commented Oct 27, 2023 •

edited

Loading

codecov bot commented Oct 27, 2023 •

edited

Loading

nihal467 commented Oct 30, 2023

aeswibon commented Oct 30, 2023

nihal467 commented Oct 31, 2023

rithviknishad left a comment

sainak commented Nov 3, 2023 •

edited

Loading

rithviknishad left a comment •

edited

Loading

rithviknishad left a comment •

edited

Loading

aeswibon commented Nov 20, 2023

rithviknishad left a comment •

edited

Loading

vigneshhari Jan 3, 2024

vigneshhari Jan 3, 2024

rithviknishad commented Jan 8, 2024 •

edited

Loading

nihal467 commented Aug 13, 2024 •

edited

Loading

vigneshhari commented Sep 22, 2024

fix(asset_location): added duty_staff endpoint #1689

fix(asset_location): added duty_staff endpoint #1689

Conversation

aeswibon commented Oct 27, 2023 • edited Loading

Feature Request

Proposed Changes

Associated PR

Merge Checklist

codecov bot commented Oct 27, 2023 • edited Loading

Codecov Report

nihal467 commented Oct 30, 2023

aeswibon commented Oct 30, 2023

nihal467 commented Oct 31, 2023

rithviknishad left a comment

Choose a reason for hiding this comment

sainak commented Nov 3, 2023 • edited Loading

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

aeswibon commented Nov 20, 2023

rithviknishad left a comment • edited Loading

Choose a reason for hiding this comment

vigneshhari Jan 3, 2024

Choose a reason for hiding this comment

vigneshhari Jan 3, 2024

Choose a reason for hiding this comment

rithviknishad commented Jan 8, 2024 • edited Loading

nihal467 commented Aug 13, 2024 • edited Loading

vigneshhari commented Sep 22, 2024

aeswibon commented Oct 27, 2023 •

edited

Loading

codecov bot commented Oct 27, 2023 •

edited

Loading

sainak commented Nov 3, 2023 •

edited

Loading

rithviknishad left a comment •

edited

Loading

rithviknishad left a comment •

edited

Loading

rithviknishad left a comment •

edited

Loading

rithviknishad commented Jan 8, 2024 •

edited

Loading

nihal467 commented Aug 13, 2024 •

edited

Loading