Skip to content

Commit

Permalink
fix lint ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Pranshu1902 committed Oct 19, 2023
1 parent d376e38 commit 81ea749
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
7 changes: 3 additions & 4 deletions care/facility/api/viewsets/facility.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.conf import settings
from django.db.models.query import QuerySet
from django_filters import rest_framework as filters
from djqscsv import render_to_csv_response
from drf_spectacular.utils import extend_schema, extend_schema_view
Expand All @@ -10,7 +9,6 @@
from rest_framework.parsers import MultiPartParser
from rest_framework.permissions import IsAuthenticated
from rest_framework.response import Response
from django.db.models import Q

from care.facility.api.serializers.facility import (
FacilityBasicInfoSerializer,
Expand Down Expand Up @@ -41,21 +39,22 @@ class FacilityFilter(filters.FilterSet):
state = filters.NumberFilter(field_name="state__id")
state_name = filters.CharFilter(field_name="state__name", lookup_expr="icontains")
kasp_empanelled = filters.BooleanFilter(field_name="kasp_empanelled")
exclude_user = filters.BooleanFilter(method='filter_exclude_user')
exclude_user = filters.BooleanFilter(method="filter_exclude_user")

def filter_exclude_user(self, queryset, name, value):
if value:
queryset = queryset.exclude(facilityuser__user__username=value)
return queryset

Check warning on line 47 in care/facility/api/viewsets/facility.py

View check run for this annotation

Codecov / codecov/patch

care/facility/api/viewsets/facility.py#L46-L47

Added lines #L46 - L47 were not covered by tests

def filter_queryset(self, queryset):
exclude_user = self.request.query_params.get('exclude_user')
exclude_user = self.request.query_params.get("exclude_user")
if exclude_user:
queryset = queryset.exclude(facilityuser__user__username=exclude_user)

Check warning on line 52 in care/facility/api/viewsets/facility.py

View check run for this annotation

Codecov / codecov/patch

care/facility/api/viewsets/facility.py#L52

Added line #L52 was not covered by tests

queryset = super().filter_queryset(queryset)
return queryset


class FacilityQSPermissions(DRYPermissionFiltersBase):
def filter_queryset(self, request, queryset, view):
if request.user.is_superuser:
Expand Down
19 changes: 9 additions & 10 deletions care/facility/tests/test_facilityuser_api.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from rest_framework import status
from rest_framework.test import APITestCase

from care.users.models import Skill
from care.utils.tests.test_utils import TestUtils


class FacilityUserTest(TestUtils, APITestCase):
@classmethod
def setUpTestData(cls) -> None:
Expand All @@ -14,8 +14,12 @@ def setUpTestData(cls) -> None:
cls.facility = cls.create_facility(cls.super_user, cls.district, cls.local_body)
cls.user = cls.create_user("staff", cls.district, home_facility=cls.facility)

cls.facility1 = cls.create_facility(cls.super_user,cls.district, cls.local_body)
cls.facility2 = cls.create_facility(cls.super_user, cls.district, cls.local_body)
cls.facility1 = cls.create_facility(
cls.super_user, cls.district, cls.local_body
)
cls.facility2 = cls.create_facility(
cls.super_user, cls.district, cls.local_body
)

def test_get_queryset_with_prefetching(self):
response = self.client.get(
Expand All @@ -34,13 +38,8 @@ def test_link_new_facility(self):
self.assertNumQueries(2)

def test_link_existing_facility(self):
sample_data = {
"exlude_user": self.user.username
}
response = self.client.get(
f"/api/v1/getallfacilities/",
sample_data
)
sample_data = {"exlude_user": self.user.username}
response = self.client.get("/api/v1/getallfacilities/", sample_data)

self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertNumQueries(1)
2 changes: 1 addition & 1 deletion data/medibase.json
Original file line number Diff line number Diff line change
Expand Up @@ -1144305,4 +1144305,4 @@
"cims_class_link": "/india/drug/search?q=drugs+for+erectile+dysfunction&mtype=brand&code=10d",
"cims_class": "Drugs for Erectile Dysfunction",
"atc_classification": "G04BE03 - sildenafil ; Belongs to the class of drugs used in erectile dysfunction."
}]
}]

0 comments on commit 81ea749

Please sign in to comment.