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.

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

Asset location route: modifications for CNS #2545

Merged
merged 5 commits into from
Oct 24, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
CNS location
- Add a parameter to filter for locations with no monitors
	- Also filter for monitors without paitents
Jacobjeevan committed Oct 17, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 988ed9c7015b441ceb8f065b4aa26247b8176b8f
20 changes: 19 additions & 1 deletion care/facility/api/viewsets/asset.py
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@
AvailabilityRecord,
StatusChoices,
)
from care.facility.models.bed import AssetBed, ConsultationBed
from care.users.models import User
from care.utils.assetintegration.asset_classes import AssetClasses
from care.utils.cache.cache_allowed_facilities import get_accessible_facilities
@@ -82,6 +83,22 @@ def delete_asset_cache(sender, instance, created, **kwargs):
cache.delete("asset:qr:" + str(instance.qr_code_id))
cache.delete("asset:qr:" + str(instance.id))

class AssetLocationFilter(filters.FilterSet):
bed_is_occupied = filters.BooleanFilter(method="filter_bed_is_occupied")

def filter_bed_is_occupied(self, queryset, name, value):
asset_locations = AssetBed.objects.select_related("asset","bed").filter(asset__asset_class="HL7MONITOR").values_list("bed__location_id", "bed__id")
if value:
asset_locations = asset_locations.filter(
bed__id__in=Subquery(
ConsultationBed.objects.filter(
bed__id=OuterRef("bed__id"), end_date__isnull=value
).values("bed__id")
)
)
asset_locations = asset_locations.values_list("bed__location_id", flat=True)
return queryset.filter(id__in=asset_locations)


class AssetLocationViewSet(
ListModelMixin,
@@ -100,8 +117,9 @@ class AssetLocationViewSet(
)
serializer_class = AssetLocationSerializer
lookup_field = "external_id"
filter_backends = (drf_filters.SearchFilter,)
filter_backends = (filters.DjangoFilterBackend, drf_filters.SearchFilter)
search_fields = ["name"]
filterset_class = AssetLocationFilter

def get_serializer_context(self):
facility = self.get_facility()