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

Fix issues with Shifting #1276

Merged
merged 3 commits into from
Apr 27, 2023
Merged

Fix issues with Shifting #1276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6fe2393
Fix typo in shifting permission check
Ashesh3 Apr 27, 2023
535f2b1
Ignore "cancelled" when checking existing shifting
Ashesh3 Apr 27, 2023
a6ba4ba
Fix notifications crashing when facility is None
Ashesh3 Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions care/facility/api/serializers/shifting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def update(self, instance, validated_data):
status = validated_data["status"]
if status == REVERSE_SHIFTING_STATUS_CHOICES[
"CANCELLED"
] and not has_facility_permission(user, instance.origin_facility):
] and not has_facility_permission(user, instance.orgin_facility):
raise ValidationError({"status": ["Permission Denied"]})

if settings.PEACETIME_MODE:
Expand Down Expand Up @@ -347,7 +347,7 @@ def create(self, validated_data):

patient = validated_data["patient"]
if ShiftingRequest.objects.filter(
~Q(status__in=[30, 50, 80]), patient=patient
~Q(status__in=[30, 50, 80, 100]), patient=patient
).exists():
raise ValidationError(
{"request": ["Shifting Request for Patient already exists"]}
Expand Down
3 changes: 2 additions & 1 deletion care/utils/notification_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,14 @@ def __init__(
"caused_object_pk": caused_object.id,
"message": message,
"defer_notifications": defer_notifications,
"facility": facility.id,
"generate_for_facility": generate_for_facility,
"extra_users": extra_users,
"extra_data": self.serialize_extra_data(extra_data),
"notification_mediums": mediums,
"worker_initated": True,
}
if facility:
data["facility"] = facility.id
notification_task_generator.apply_async(kwargs=data, countdown=2)
self.worker_initiated = False
return
Expand Down