moved abdm endpoints inside abdm app

ohcnetwork · Jul 20, 2023 · 60ba3a7 · 60ba3a7
1 parent 603c0ee
commit 60ba3a7
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 98 deletions.
diff --git a/care/abdm/urls.py b/care/abdm/urls.py
@@ -0,0 +1,99 @@
+from django.urls import path
+from rest_framework.routers import SimpleRouter
+
+from care.abdm.api.viewsets.auth import (
+    AuthNotifyView,
+    DiscoverView,
+    LinkConfirmView,
+    LinkInitView,
+    NotifyView,
+    OnAddContextsView,
+    OnConfirmView,
+    OnFetchView,
+    OnInitView,
+    RequestDataView,
+)
+from care.abdm.api.viewsets.hip import HipViewSet
+from care.abdm.api.viewsets.monitoring import HeartbeatView
+from care.abdm.api.viewsets.status import NotifyView as PatientStatusNotifyView
+from care.abdm.api.viewsets.status import SMSOnNotifyView
+
+
+class OptionalSlashRouter(SimpleRouter):
+    def __init__(self):
+        super().__init__()
+        self.trailing_slash = "/?"
+
+
+abdm_router = OptionalSlashRouter()
+
+abdm_router.register("profile/v1.0/patients/", HipViewSet, basename="hip")
+
+abdm_urlpatterns = [
+    *abdm_router.urls,
+    path(
+        "v0.5/users/auth/on-fetch-modes",
+        OnFetchView.as_view(),
+        name="abdm_on_fetch_modes_view",
+    ),
+    path(
+        "v0.5/users/auth/on-init",
+        OnInitView.as_view(),
+        name="abdm_on_init_view",
+    ),
+    path(
+        "v0.5/users/auth/on-confirm",
+        OnConfirmView.as_view(),
+        name="abdm_on_confirm_view",
+    ),
+    path(
+        "v0.5/users/auth/notify",
+        AuthNotifyView.as_view(),
+        name="abdm_auth_notify_view",
+    ),
+    path(
+        "v0.5/links/link/on-add-contexts",
+        OnAddContextsView.as_view(),
+        name="abdm_on_add_context_view",
+    ),
+    path(
+        "v0.5/care-contexts/discover",
+        DiscoverView.as_view(),
+        name="abdm_discover_view",
+    ),
+    path(
+        "v0.5/links/link/init",
+        LinkInitView.as_view(),
+        name="abdm_link_init_view",
+    ),
+    path(
+        "v0.5/links/link/confirm",
+        LinkConfirmView.as_view(),
+        name="abdm_link_confirm_view",
+    ),
+    path(
+        "v0.5/consents/hip/notify",
+        NotifyView.as_view(),
+        name="abdm_notify_view",
+    ),
+    path(
+        "v0.5/health-information/hip/request",
+        RequestDataView.as_view(),
+        name="abdm_request_data_view",
+    ),
+    path(
+        "v0.5/patients/status/notify",
+        PatientStatusNotifyView.as_view(),
+        name="abdm_patient_status_notify_view",
+    ),
+    path(
+        "v0.5/patients/sms/on-notify",
+        SMSOnNotifyView.as_view(),
+        name="abdm_patient_status_notify_view",
+    ),
+    path(
+        "v0.5/heartbeat",
+        HeartbeatView.as_view(),
+        name="abdm_monitoring_heartbeat_view",
+    ),
+]
diff --git a/config/api_router.py b/config/api_router.py
@@ -5,7 +5,6 @@
 
 from care.abdm.api.viewsets.abha import AbhaViewSet
 from care.abdm.api.viewsets.healthid import ABDMHealthIDViewSet
-from care.abdm.api.viewsets.hip import HipViewSet
 from care.facility.api.viewsets.ambulance import (
     AmbulanceCreateViewSet,
     AmbulanceViewSet,
@@ -92,19 +91,10 @@
 from care.users.api.viewsets.users import UserViewSet
 from care.users.api.viewsets.userskill import UserSkillViewSet
 
-
-class OptionalSlashRouter(SimpleRouter):
-    def __init__(self):
-        super().__init__()
-        self.trailing_slash = "/?"
-
-
 if settings.DEBUG:
     router = DefaultRouter()
-    # abdm_router = DefaultRouter()
 else:
     router = SimpleRouter()
-abdm_router = OptionalSlashRouter()
 
 router.register("users", UserViewSet)
 user_nested_router = NestedSimpleRouter(router, r"users", lookup="users")
@@ -229,7 +219,6 @@ def __init__(self):
 # ABDM endpoints
 if settings.ENABLE_ABDM:
     router.register("abdm/healthid", ABDMHealthIDViewSet, basename="abdm-healthid")
-    abdm_router.register("profile", HipViewSet, basename="hip")
 
 app_name = "api"
 urlpatterns = [
@@ -241,7 +230,3 @@ def __init__(self):
     path("", include(resource_nested_router.urls)),
     path("", include(shifting_nested_router.urls)),
 ]
-
-abdm_urlpatterns = [
-    path("", include(abdm_router.urls)),
-]
diff --git a/config/urls.py b/config/urls.py
@@ -9,21 +9,7 @@
     SpectacularSwaggerView,
 )
 
-from care.abdm.api.viewsets.auth import (
-    AuthNotifyView,
-    DiscoverView,
-    LinkConfirmView,
-    LinkInitView,
-    NotifyView,
-    OnAddContextsView,
-    OnConfirmView,
-    OnFetchView,
-    OnInitView,
-    RequestDataView,
-)
-from care.abdm.api.viewsets.monitoring import HeartbeatView
-from care.abdm.api.viewsets.status import NotifyView as PatientStatusNotifyView
-from care.abdm.api.viewsets.status import SMSOnNotifyView
+from care.abdm.urls import abdm_urlpatterns
 from care.facility.api.viewsets.open_id import OpenIdConfigView
 from care.hcx.api.viewsets.listener import (
     ClaimOnSubmitView,
@@ -110,74 +96,7 @@
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.ENABLE_ABDM:
-    urlpatterns += [
-        path("v1.0/patients/", include(api_router.abdm_urlpatterns)),
-        path(
-            "v0.5/users/auth/on-fetch-modes",
-            OnFetchView.as_view(),
-            name="abdm_on_fetch_modes_view",
-        ),
-        path(
-            "v0.5/users/auth/on-init",
-            OnInitView.as_view(),
-            name="abdm_on_init_view",
-        ),
-        path(
-            "v0.5/users/auth/on-confirm",
-            OnConfirmView.as_view(),
-            name="abdm_on_confirm_view",
-        ),
-        path(
-            "v0.5/users/auth/notify",
-            AuthNotifyView.as_view(),
-            name="abdm_auth_notify_view",
-        ),
-        path(
-            "v0.5/links/link/on-add-contexts",
-            OnAddContextsView.as_view(),
-            name="abdm_on_add_context_view",
-        ),
-        path(
-            "v0.5/care-contexts/discover",
-            DiscoverView.as_view(),
-            name="abdm_discover_view",
-        ),
-        path(
-            "v0.5/links/link/init",
-            LinkInitView.as_view(),
-            name="abdm_link_init_view",
-        ),
-        path(
-            "v0.5/links/link/confirm",
-            LinkConfirmView.as_view(),
-            name="abdm_link_confirm_view",
-        ),
-        path(
-            "v0.5/consents/hip/notify",
-            NotifyView.as_view(),
-            name="abdm_notify_view",
-        ),
-        path(
-            "v0.5/health-information/hip/request",
-            RequestDataView.as_view(),
-            name="abdm_request_data_view",
-        ),
-        path(
-            "v0.5/patients/status/notify",
-            PatientStatusNotifyView.as_view(),
-            name="abdm_patient_status_notify_view",
-        ),
-        path(
-            "v0.5/patients/sms/on-notify",
-            SMSOnNotifyView.as_view(),
-            name="abdm_patient_status_notify_view",
-        ),
-        path(
-            "v0.5/heartbeat",
-            HeartbeatView.as_view(),
-            name="abdm_monitoring_heartbeat_view",
-        ),
-    ]
+    urlpatterns += abdm_urlpatterns
 
 if settings.DEBUG:
     # This allows the error pages to be debugged during development, just visit