commonground-api-common 1.12.2__py3-none-any.whl → 2.4.1__py3-none-any.whl

vng_api_common/notifications/api/views.py

@@ -1,8 +1,9 @@
 from django.conf import settings
 from django.utils.module_loading import import_string
 
-from drf_yasg.utils import swagger_auto_schema
+from drf_spectacular.utils import extend_schema
 from notifications_api_common.api.serializers import NotificatieSerializer
+from notifications_api_common.constants import SCOPE_NOTIFICATIES_PUBLICEREN_LABEL
 from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -10,7 +11,6 @@ from rest_framework.views import APIView
 from ...permissions import AuthScopesRequired
 from ...scopes import Scope
 from ...serializers import FoutSerializer, ValidatieFoutSerializer
-from ..constants import SCOPE_NOTIFICATIES_PUBLICEREN_LABEL
 
 
 class NotificationBaseView(APIView):
@@ -18,17 +18,15 @@ class NotificationBaseView(APIView):
     Abstract view to receive webhooks
     """
 
-    swagger_schema = None
+    schema = None
 
     permission_classes = (AuthScopesRequired,)
-    required_scopes = Scope(
-        SCOPE_NOTIFICATIES_PUBLICEREN_LABEL
-    )  # FIXME: this should be standalone!
+    required_scopes = Scope(SCOPE_NOTIFICATIES_PUBLICEREN_LABEL, private=True)
 
     def get_serializer(self, *args, **kwargs):
         return NotificatieSerializer(*args, **kwargs)
 
-    @swagger_auto_schema(
+    @extend_schema(
         responses={
             204: "",
             400: ValidatieFoutSerializer,
@@ -55,7 +53,9 @@ class NotificationBaseView(APIView):
 class NotificationView(NotificationBaseView):
     action = "create"
     permission_classes = (AuthScopesRequired,)
-    required_scopes = {"create": Scope(SCOPE_NOTIFICATIES_PUBLICEREN_LABEL)}
+    required_scopes = {
+        "create": Scope(SCOPE_NOTIFICATIES_PUBLICEREN_LABEL, private=True)
+    }
 
     def create(self, request, *args, **kwargs):
         return self.post(request, *args, **kwargs)

vng_api_common/notifications/handlers.py

@@ -4,7 +4,7 @@ from djangorestframework_camel_case.util import underscoreize
 
 from ..authorizations.models import Applicatie
 from ..authorizations.serializers import ApplicatieUuidSerializer
-from ..client import get_client
+from ..client import get_client, to_internal_data
 from ..constants import CommonResourceAction
 from ..utils import get_uuid_from_path
 
@@ -20,8 +20,13 @@ class LoggingHandler:
 class AuthHandler:
     def _request_auth(self, url: str) -> dict:
         client = get_client(url)
-        response = client.retrieve("applicatie", url)
-        return underscoreize(response)
+
+        if not client:
+            return {}
+
+        response = client.get(url)
+        data = to_internal_data(response)
+        return underscoreize(data)
 
     def handle(self, message: dict) -> None:
         uuid = get_uuid_from_path(message["resource_url"])

vng_api_common/notifications/migrations/0011_remove_subscription_config_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2024-10-25 14:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("notifications", "0010_auto_20220704_1419"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="subscription",
+            name="config",
+        ),
+        migrations.DeleteModel(
+            name="NotificationsConfig",
+        ),
+        migrations.DeleteModel(
+            name="Subscription",
+        ),
+    ]

vng_api_common/oas.py

@@ -1,23 +1,19 @@
 """
 Utility module for Open API Specification 3.0.x.
-
-This should get merged into gemma-zds-client, but some heavy refactoring is
-needed for that.
 """
 
 from typing import Union
 
 import requests
 import yaml
-from drf_yasg import openapi
 
 TYPE_MAP = {
-    openapi.TYPE_OBJECT: dict,
-    openapi.TYPE_STRING: str,
-    openapi.TYPE_NUMBER: (float, int),
-    openapi.TYPE_INTEGER: int,
-    openapi.TYPE_BOOLEAN: bool,
-    openapi.TYPE_ARRAY: list,
+    "object": dict,
+    "string": str,
+    "number": (float, int),
+    "integer": int,
+    "boolean": bool,
+    "array": list,
 }
 
 

vng_api_common/pagination.py

@@ -0,0 +1,10 @@
+from rest_framework.pagination import PageNumberPagination
+
+
+class DynamicPageSizeMixin:
+    page_size = 100
+    page_size_query_param = "pageSize"
+    max_page_size = 500
+
+
+class DynamicPageSizePagination(DynamicPageSizeMixin, PageNumberPagination): ...

vng_api_common/routers.py

@@ -8,7 +8,7 @@ class APIRootView(_APIRootView):
     permission_classes = ()
 
 
-class ZDSNestedRegisteringMixin:
+class NestedRegisteringMixin:
     _nested_router = None
 
     def __init__(self, *args, **kwargs):
@@ -47,11 +47,11 @@ class ZDSNestedRegisteringMixin:
             )
 
 
-class NestedSimpleRouter(ZDSNestedRegisteringMixin, routers.NestedSimpleRouter):
+class NestedSimpleRouter(NestedRegisteringMixin, routers.NestedSimpleRouter):
     pass
 
 
-class DefaultRouter(ZDSNestedRegisteringMixin, routers.DefaultRouter):
+class DefaultRouter(NestedRegisteringMixin, routers.DefaultRouter):
     APIRootView = APIRootView