diff --git a/care/templates/pages/home.html b/care/templates/pages/home.html
index 7e4326f675..05a436532e 100644
--- a/care/templates/pages/home.html
+++ b/care/templates/pages/home.html
@@ -4,9 +4,10 @@
{% block content %}
-
- {% translate "Open Healthcare Network" %}
- {% blocktranslate %}Our Goal is to defend the Healthcare system of Kerala from overloading beyond capacity.{% endblocktranslate %}
+
+ {% translate "Open Healthcare Network" %}
+
+ {% blocktranslate %}Better Healthcare tools for everyone!{% endblocktranslate %}
diff --git a/care/users/models.py b/care/users/models.py
index 6eeb693e29..57aa401f96 100644
--- a/care/users/models.py
+++ b/care/users/models.py
@@ -130,27 +130,12 @@ def __str__(self):
class CustomUserManager(UserManager):
def get_queryset(self):
qs = super().get_queryset()
- return qs.filter(deleted=False).select_related(
- "local_body", "district", "state"
- )
+ return qs.filter(deleted=False)
def get_entire_queryset(self):
- return super().get_queryset().select_related("local_body", "district", "state")
+ return super().get_queryset()
def create_superuser(self, username, email, password, **extra_fields):
- district = District.objects.all().first()
- data_command = (
- "load_data" if settings.IS_PRODUCTION is True else "load_dummy_data"
- )
- if not district:
- proceed = input(
- f"It looks like you haven't loaded district data. It is recommended to populate district data before you create a super user. Please run `python manage.py {data_command}`.\n Proceed anyway? [y/N]"
- )
- if proceed.lower() != "y":
- raise Exception
- district = None
-
- extra_fields["district"] = district
extra_fields["phone_number"] = "+919696969696"
extra_fields["gender"] = 3
extra_fields["user_type"] = 40
diff --git a/care/utils/schema.py b/care/utils/schema.py
deleted file mode 100644
index 5b8813c1c1..0000000000
--- a/care/utils/schema.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from drf_spectacular.openapi import AutoSchema as SpectacularAutoSchema
-
-
-class AutoSchema(SpectacularAutoSchema):
- def get_tags(self):
- tokenized_path = self._tokenize_path()
- # use last non-parameter path part as default tag
- return [tokenized_path[-1]]
diff --git a/care/utils/swagger/__init__.py b/care/utils/swagger/__init__.py
new file mode 100644
index 0000000000..8105b3f0e5
--- /dev/null
+++ b/care/utils/swagger/__init__.py
@@ -0,0 +1 @@
+import care.utils.swagger.filter
diff --git a/care/utils/swagger/filter.py b/care/utils/swagger/filter.py
new file mode 100644
index 0000000000..c4557faa6b
--- /dev/null
+++ b/care/utils/swagger/filter.py
@@ -0,0 +1,46 @@
+from django.db import models
+from drf_spectacular.contrib.django_filters import DjangoFilterExtension
+from drf_spectacular.drainage import add_trace_message
+from drf_spectacular.plumbing import build_basic_type, get_manager, get_view_model
+from drf_spectacular.types import OpenApiTypes
+
+
+class CustomFilterExtension(DjangoFilterExtension):
+ target_class = "django_filters.rest_framework.DjangoFilterBackend"
+ priority = 1
+
+ def _get_schema_from_model_field(self, auto_schema, filter_field, model):
+ model_field = self._get_model_field(filter_field, model)
+
+ if self._is_gis(model_field):
+ return build_basic_type(OpenApiTypes.STR)
+
+ if not isinstance(model_field, models.Field):
+ if hasattr(auto_schema.view, "database_model"):
+ qs = auto_schema.view.database_model.objects.all()
+ else:
+ qs = auto_schema.view.get_queryset()
+ model_field = qs.query.annotations[filter_field.field_name].field
+ return auto_schema._map_model_field(model_field, direction=None) # noqa SLF001
+
+ def get_schema_operation_parameters(self, auto_schema, *args, **kwargs):
+ if hasattr(auto_schema.view, "database_model"):
+ model = auto_schema.view.database_model
+ else:
+ model = get_view_model(auto_schema.view)
+ if not model:
+ return []
+
+ filterset_class = self.target.get_filterset_class(
+ auto_schema.view, get_manager(model).none()
+ )
+ if not filterset_class:
+ return []
+
+ result = []
+ with add_trace_message(filterset_class):
+ for field_name, filter_field in filterset_class.base_filters.items():
+ result += self.resolve_filter_field(
+ auto_schema, model, filterset_class, field_name, filter_field
+ )
+ return result
diff --git a/care/utils/swagger/schema.py b/care/utils/swagger/schema.py
new file mode 100644
index 0000000000..1cf7b9261e
--- /dev/null
+++ b/care/utils/swagger/schema.py
@@ -0,0 +1,138 @@
+from django.core import exceptions as django_exceptions
+from drf_spectacular.drainage import warn
+from drf_spectacular.openapi import AutoSchema as SpectacularAutoSchema
+from drf_spectacular.plumbing import (
+ build_basic_type,
+ build_parameter_type,
+ follow_model_field_lookup,
+ get_view_model,
+ resolve_django_path_parameter,
+ resolve_regex_path_parameter,
+)
+from drf_spectacular.types import OpenApiTypes
+from drf_spectacular.utils import (
+ OpenApiParameter,
+)
+from rest_framework.mixins import ListModelMixin
+from rest_framework.schemas.utils import get_pk_description
+
+from care.emr.api.viewsets.base import EMRListMixin
+
+
+class AutoSchema(SpectacularAutoSchema):
+ def get_tags(self):
+ if hasattr(self.view, "basename"):
+ return [self.view.basename]
+ tokenized_path = self._tokenize_path()
+ return [tokenized_path[-1]]
+
+ def get_request_serializer(self):
+ view = self.view
+ if self.method == "POST":
+ if hasattr(view, "pydantic_model"):
+ return view.pydantic_model
+ elif self.method in ["PUT", "PATCH"]:
+ if hasattr(view, "pydantic_update_model"):
+ return view.pydantic_update_model
+ if hasattr(view, "pydantic_model"):
+ return view.pydantic_model
+ elif self.method == "GET":
+ return None # Can be improved later, if required
+ return self._get_serializer()
+
+ def get_response_serializers(self):
+ view = self.view
+
+ if self.method in ["POST", "PUT", "PATCH"] and (
+ hasattr(view, "pydantic_model") or hasattr(view, "pydantic_read_model")
+ ):
+ return {200: view.pydantic_read_model or view.pydantic_model}
+
+ if self.method == "DELETE":
+ return {"204": {"description": "No response body"}}
+
+ if (
+ self.method == "GET"
+ and (
+ isinstance(self.view, ListModelMixin)
+ or self.view.action == "list"
+ or isinstance(self.view, EMRListMixin)
+ )
+ and (
+ hasattr(view, "pydantic_model") or hasattr(view, "pydantic_read_model")
+ )
+ ):
+ return {200: view.pydantic_read_model or view.pydantic_model}
+
+ if self.method == "GET" and (
+ hasattr(view, "pydantic_retrieve_model")
+ or hasattr(view, "pydantic_read_model")
+ or hasattr(view, "pydantic_model")
+ ):
+ return {
+ 200: view.pydantic_retrieve_model
+ or view.pydantic_read_model
+ or view.pydantic_model
+ }
+
+ return self._get_serializer()
+
+ def _resolve_path_parameters(self, variables):
+ if hasattr(self.view, "database_model"):
+ model = self.view.database_model
+ else:
+ model = get_view_model(self.view)
+ parameters = []
+ for variable in variables:
+ schema = build_basic_type(OpenApiTypes.STR)
+ description = ""
+
+ resolved_parameter = resolve_django_path_parameter(
+ self.path_regex,
+ variable,
+ self.map_renderers("format"),
+ )
+ if not resolved_parameter:
+ resolved_parameter = resolve_regex_path_parameter(
+ self.path_regex, variable
+ )
+
+ if resolved_parameter:
+ schema = resolved_parameter["schema"]
+ elif model is None:
+ warn(
+ f'could not derive type of path parameter "{variable}" because it '
+ f"is untyped and obtaining queryset from the viewset failed. "
+ f"Consider adding a type to the path (e.g. ) or annotating "
+ f'the parameter type with @extend_schema. Defaulting to "string".'
+ )
+ else:
+ try:
+ if getattr(self.view, "lookup_url_kwarg", None) == variable:
+ model_field_name = getattr(self.view, "lookup_field", variable)
+ elif variable.endswith("_pk"):
+ # Django naturally coins foreign keys *_id. improve chances to match a field
+ model_field_name = f"{variable[:-3]}_id"
+ else:
+ model_field_name = variable
+ model_field = follow_model_field_lookup(model, model_field_name)
+ schema = self._map_model_field(model_field, direction=None)
+ if "description" not in schema and model_field.primary_key:
+ description = get_pk_description(model, model_field)
+ except django_exceptions.FieldError:
+ warn(
+ f'could not derive type of path parameter "{variable}" because model '
+ f'"{model.__module__}.{model.__name__}" contained no such field. Consider '
+ f'annotating parameter with @extend_schema. Defaulting to "string".'
+ )
+
+ parameters.append(
+ build_parameter_type(
+ name=variable,
+ location=OpenApiParameter.PATH,
+ description=description,
+ schema=schema,
+ )
+ )
+
+ return parameters
diff --git a/care/utils/tests/test_swagger_schema.py b/care/utils/tests/test_swagger_schema.py
new file mode 100644
index 0000000000..26514c56c9
--- /dev/null
+++ b/care/utils/tests/test_swagger_schema.py
@@ -0,0 +1,8 @@
+from django.test import TestCase
+from rest_framework import status
+
+
+class SwaggerSchemaTest(TestCase):
+ def test_swagger_endpoint(self):
+ response = self.client.get("/swagger/")
+ self.assertEqual(response.status_code, status.HTTP_200_OK)
diff --git a/config/api_router.py b/config/api_router.py
index 913ffe9974..e1accb3cfd 100644
--- a/config/api_router.py
+++ b/config/api_router.py
@@ -25,6 +25,10 @@
FacilityOrganizationViewSet,
)
from care.emr.api.viewsets.file_upload import FileUploadViewSet
+from care.emr.api.viewsets.location import (
+ FacilityLocationEncounterViewSet,
+ FacilityLocationViewSet,
+)
from care.emr.api.viewsets.medication_administration import (
MedicationAdministrationViewSet,
)
@@ -64,17 +68,7 @@
router.register("users", UserViewSet, basename="users")
-# router.register("plug_config", PlugConfigViewset, basename="plug_configs")
user_nested_router = NestedSimpleRouter(router, r"users", lookup="users")
-# user_nested_router.register("skill", UserSkillViewSet, basename="users-skill")
-
-# router.register("skill", SkillViewSet, basename="skill")
-
-# Local Body / LSG Viewsets
-# router.register("state", StateViewSet, basename="state")
-# router.register("district", DistrictViewSet, basename="district")
-# router.register("local_body", LocalBodyViewSet, basename="local-body")
-# router.register("ward", WardViewSet, basename="ward")
router.register("files", FileUploadViewSet, basename="files")
@@ -84,11 +78,9 @@
router.register("otp/slots", OTPSlotViewSet, basename="otp-slots")
-# router.register("notification", NotificationViewSet, basename="notification")
router.register("batch_requests", BatchRequestView, basename="batch-requests")
-# router.register("units", UnitsView, basename="units")
router.register("valueset", ValueSetViewSet, basename="value-set")
@@ -116,13 +108,6 @@
"users", OrganizationUsersViewSet, basename="organization-users"
)
-# router.register("items", FacilityInventoryItemViewSet, basename="items")
-
-# router.register("shift", ShiftingViewSet, basename="patient-shift")
-# shifting_nested_router = NestedSimpleRouter(router, r"shift", lookup="shift")
-# shifting_nested_router.register(
-# r"comment", ShifitngRequestCommentViewSet, basename="patient-shift-comment"
-# )
router.register("resource", ResourceRequestViewSet, basename="resource-request")
resource_nested_router = NestedSimpleRouter(router, r"resource", lookup="resource")
@@ -134,34 +119,6 @@
router.register("getallfacilities", AllFacilityViewSet, basename="getallfacilities")
facility_nested_router = NestedSimpleRouter(router, r"facility", lookup="facility")
-# facility_nested_router.register(
-# r"get_users", FacilityUserViewSet, basename="facility-users"
-# )
-# facility_nested_router.register(
-# r"asset_location", AssetLocationViewSet, basename="facility-location"
-# )
-
-# facility_location_nested_router = NestedSimpleRouter(
-# facility_nested_router, r"asset_location", lookup="asset_location"
-# )
-# facility_location_nested_router.register(
-# r"availability", AvailabilityViewSet, basename="facility-location-availability"
-# )
-
-# facility_nested_router.register(
-# r"patient_asset_beds",
-# PatientAssetBedViewSet,
-# basename="facility-patient-asset-beds",
-# )
-# facility_nested_router.register(
-# r"discharged_patients",
-# FacilityDischargedPatientViewSet,
-# basename="facility-discharged-patients",
-# )
-# facility_nested_router.register(
-# r"spokes", FacilitySpokesViewSet, basename="facility-spokes"
-# )
-# facility_nested_router.register(r"hubs", FacilityHubsViewSet, basename="facility-hubs")
facility_nested_router.register(
r"organizations", FacilityOrganizationViewSet, basename="facility-organization"
@@ -202,44 +159,24 @@
basename="schedule-exceptions",
)
-# router.register("asset", AssetViewSet, basename="asset")
-# asset_nested_router = NestedSimpleRouter(router, r"asset", lookup="asset")
-# asset_nested_router.register(
-# r"camera_presets", CameraPresetViewSet, basename="asset-camera-presets"
-# )
-# asset_nested_router.register(
-# r"availability", AvailabilityViewSet, basename="asset-availability"
-# )
-# asset_nested_router.register(
-# r"service_records", AssetServiceViewSet, basename="asset-service-records"
-# )
-#
-# router.register("asset_config", AssetRetrieveConfigViewSet, basename="asset-config")
-# router.register("asset_transaction", AssetTransactionViewSet)
-
-# router.register("bed", BedViewSet, basename="bed")
-# bed_nested_router = NestedSimpleRouter(router, r"bed", lookup="bed")
-# bed_nested_router.register(
-# r"camera_presets", CameraPresetViewSet, basename="bed-camera-presets"
-# )
-#
-# router.register("assetbed", AssetBedViewSet, basename="asset-bed")
-# router.register("consultationbed", ConsultationBedViewSet, basename="consultation-bed")
-# assetbed_nested_router = NestedSimpleRouter(router, r"assetbed", lookup="assetbed")
-# assetbed_nested_router.register(
-# r"camera_presets", AssetBedCameraPresetViewSet, basename="assetbed-camera-presets"
-# )
-
-# router.register("patient/search", PatientSearchViewSet, basename="patient-search")
+facility_nested_router.register(
+ r"location",
+ FacilityLocationViewSet,
+ basename="location",
+)
+
+facility_location_nested_router = NestedSimpleRouter(
+ facility_nested_router, r"location", lookup="location"
+)
+
+facility_location_nested_router.register(
+ r"association",
+ FacilityLocationEncounterViewSet,
+ basename="association",
+)
+
router.register("patient", PatientViewSet, basename="patient")
patient_nested_router = NestedSimpleRouter(router, r"patient", lookup="patient")
-# patient_nested_router.register(r"notes", PatientNotesViewSet, basename="patient-notes")
-# patient_notes_nested_router = NestedSimpleRouter(
-# patient_nested_router, r"notes", lookup="notes"
-# )
-# patient_notes_nested_router.register(
-# r"edits", PatientNotesEditViewSet, basename="patient-notes-edits"
-# )
patient_nested_router.register(
r"allergy_intolerance", AllergyIntoleranceViewSet, basename="allergy-intolerance"
@@ -294,37 +231,16 @@
basename="note",
)
-# router.register(
-# "consultation", PatientConsultationViewSet, basename="patient-consultation"
-# )
-# consultation_nested_router = NestedSimpleRouter(
-# router, r"consultation", lookup="consultation"
-# )
-#
-# consultation_nested_router.register(
-# r"consents", PatientConsentViewSet, basename="consultation-consents"
-# )
-
-# Public endpoints
-# router.register("public/asset", AssetPublicViewSet, basename="public-asset")
-# router.register("public/asset_qr", AssetPublicQRViewSet, basename="public-asset-qr")
-
app_name = "api"
urlpatterns = [
path("", include(router.urls)),
path("", include(user_nested_router.urls)),
path("", include(facility_nested_router.urls)),
path("", include(schedule_nested_router.urls)),
- # path("", include(facility_location_nested_router.urls)),
- # path("", include(asset_nested_router.urls)),
- # path("", include(bed_nested_router.urls)),
- # path("", include(assetbed_nested_router.urls)),
path("", include(patient_nested_router.urls)),
path("", include(thread_nested_router.urls)),
- # path("", include(patient_notes_nested_router.urls)),
- # path("", include(consultation_nested_router.urls)),
path("", include(resource_nested_router.urls)),
- # path("", include(shifting_nested_router.urls)),
path("", include(organization_nested_router.urls)),
path("", include(facility_organization_nested_router.urls)),
+ path("", include(facility_location_nested_router.urls)),
]
diff --git a/config/settings/base.py b/config/settings/base.py
index b79ce69c0d..7a16a2db96 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -89,7 +89,11 @@
# http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
"IGNORE_EXCEPTIONS": True,
},
- }
+ },
+ "swagger_cache": { # In-memory cache (only for Swagger)
+ "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+ "LOCATION": "swagger-schema-cache",
+ },
}
# URLS
@@ -376,7 +380,7 @@
"DEFAULT_PAGINATION_CLASS": "care.utils.pagination.care_pagination.CareLimitOffsetPagination",
"PAGE_SIZE": 14,
"SEARCH_PARAM": "search_text",
- "DEFAULT_SCHEMA_CLASS": "care.utils.schema.AutoSchema",
+ "DEFAULT_SCHEMA_CLASS": "care.utils.swagger.schema.AutoSchema",
"EXCEPTION_HANDLER": "config.exception_handler.exception_handler",
}
@@ -387,6 +391,7 @@
"TITLE": "Care API",
"DESCRIPTION": "Documentation of API endpoints of Care ",
"VERSION": "1.0.0",
+ "DISABLE_ERRORS_AND_WARNINGS": True,
}
# Simple JWT (JWT Authentication)
diff --git a/config/urls.py b/config/urls.py
index 8503959fc7..c614d0ab91 100644
--- a/config/urls.py
+++ b/config/urls.py
@@ -3,6 +3,7 @@
from django.contrib import admin
from django.urls import include, path
from django.views import defaults as default_views
+from django.views.decorators.cache import cache_page
from drf_spectacular.views import (
SpectacularAPIView,
SpectacularRedocView,
@@ -100,7 +101,11 @@
if settings.DEBUG or not settings.IS_PRODUCTION:
urlpatterns += [
- path("api/schema/", SpectacularAPIView.as_view(), name="schema"),
+ path(
+ "api/schema/",
+ cache_page(None, cache="swagger_cache")(SpectacularAPIView.as_view()),
+ name="schema",
+ ),
path(
"swagger/",
SpectacularSwaggerView.as_view(url_name="schema"),