Update package name & add dependency

requirements/base.in

@@ -13,6 +13,7 @@ django-localflavor
 django-celery-beat
 flower
 django-timeline-logger
+django-json-schema-model
 
 # waiting for > 2.0.1
 commonground-api-common==1.13.4

requirements/base.txt

@@ -85,6 +85,7 @@ django==4.2.17
     #   django-csp
     #   django-filter
     #   django-formtools
+    #   django-json-schema-model
     #   django-jsonform
     #   django-localflavor
     #   django-log-outgoing-requests
@@ -137,6 +138,8 @@ django-filter==24.3
     #   open-api-framework
 django-formtools==2.5.1
     # via django-two-factor-auth
+django-json-schema-model==0.1.0
+    # via -r requirements/base.in
 django-jsonform==2.23.1
     # via
     #   mozilla-django-oidc-db
@@ -249,7 +252,9 @@ jinja2==3.1.4
 josepy==1.14.0
     # via mozilla-django-oidc
 jsonschema==4.23.0
-    # via drf-spectacular
+    # via
+    #   django-json-schema-model
+    #   drf-spectacular
 jsonschema-specifications==2024.10.1
     # via jsonschema
 kombu==5.4.2

requirements/ci.txt

@@ -155,6 +155,7 @@ django==4.2.17
     #   django-csp
     #   django-filter
     #   django-formtools
+    #   django-json-schema-model
     #   django-jsonform
     #   django-localflavor
     #   django-log-outgoing-requests
@@ -228,6 +229,10 @@ django-formtools==2.5.1
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   django-two-factor-auth
+django-json-schema-model==0.1.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 django-jsonform==2.23.1
     # via
     #   -c requirements/base.txt
@@ -478,6 +483,7 @@ jsonschema==4.23.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   django-json-schema-model
     #   drf-spectacular
 jsonschema-specifications==2024.10.1
     # via

requirements/dev.txt

@@ -182,6 +182,7 @@ django==4.2.17
     #   django-extensions
     #   django-filter
     #   django-formtools
+    #   django-json-schema-model
     #   django-jsonform
     #   django-localflavor
     #   django-log-outgoing-requests
@@ -259,6 +260,10 @@ django-formtools==2.5.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   django-two-factor-auth
+django-json-schema-model==0.1.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
 django-jsonform==2.23.1
     # via
     #   -c requirements/ci.txt
@@ -532,6 +537,7 @@ jsonschema==4.23.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   django-json-schema-model
     #   drf-spectacular
 jsonschema-specifications==2024.10.1
     # via

src/open_producten/conf/base.py

@@ -22,7 +22,7 @@
     "localflavor",
     "markdownx",
     "django_celery_beat",
-    "django_json_schema",
+    "django_json_schema_model",
     "open_producten.accounts",
     "open_producten.logging",
     "open_producten.utils",

src/open_producten/producten/migrations/0009_product_verbruiksobject.py → src/open_producten/producten/migrations/0004_product_verbruiksobject.py

@@ -1,12 +1,12 @@
-# Generated by Django 5.1.4 on 2025-01-10 10:17
+# Generated by Django 4.2.17 on 2025-01-19 20:50
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("producten", "0008_alter_product_eind_datum_alter_product_start_datum"),
+        ("producten", "0003_product_status_alter_product_aanmaak_datum_and_more"),
     ]
 
     operations = [

src/open_producten/producten/tests/api/test_product.py

@@ -3,7 +3,7 @@
 from django.urls import reverse
 from django.utils.translation import gettext as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from freezegun import freeze_time
 from rest_framework import status
 from rest_framework.exceptions import ErrorDetail
@@ -151,7 +151,9 @@ def test_create_product_with_invalid_verbruiksobject(self):
             {
                 "verbruiksobject": [
                     ErrorDetail(
-                        string=_("Het verbruiksobject komt niet overeen met het schema gedefinieerd op het product type."),
+                        string=_(
+                            "Het verbruiksobject komt niet overeen met het schema gedefinieerd op het product type."
+                        ),
                         code="invalid",
                     )
                 ]

src/open_producten/producten/tests/test_product.py

@@ -5,7 +5,7 @@
 from django.test import TestCase
 from django.utils.translation import gettext as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from freezegun import freeze_time
 
 from open_producten.producttypen.tests.factories import ProductTypeFactory
@@ -151,7 +151,9 @@ def test_verbruiksobject_is_invalid(self):
 
         with self.assertRaisesMessage(
             ValidationError,
-            _("Het verbruiksobject komt niet overeen met het schema gedefinieerd op het product type."),
+            _(
+                "Het verbruiksobject komt niet overeen met het schema gedefinieerd op het product type."
+            ),
         ):
             product.clean()
 
@@ -183,6 +185,7 @@ def test_verbruiksobject_with_schema_without_object(self):
 
         product.clean()
 
+
 @freeze_time("2024-1-1")
 class TestProductStateTask(TestCase):
     def setUp(self):

src/open_producten/producttypen/migrations/0007_producttype_verbruiksobject_schema.py → src/open_producten/producttypen/migrations/0006_producttype_verbruiksobject_schema.py

@@ -1,14 +1,17 @@
-# Generated by Django 5.1.4 on 2025-01-09 12:52
+# Generated by Django 4.2.17 on 2025-01-19 20:50
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("django_json_schema", "0001_initial"),
-        ("producttypen", "0006_alter_producttype_aanmaak_datum_and_more"),
+        ("django_json_schema_model", "0001_initial"),
+        (
+            "producttypen",
+            "0005_producttype_code_producttype_toegestane_statussen_and_more",
+        ),
     ]
 
     operations = [
@@ -21,7 +24,7 @@ class Migration(migrations.Migration):
                 null=True,
                 on_delete=django.db.models.deletion.PROTECT,
                 related_name="product_typen",
-                to="django_json_schema.jsonschema",
+                to="django_json_schema_model.jsonschema",
                 verbose_name="verbruiksobject schema",
             ),
         ),

src/open_producten/producttypen/models/producttype.py

@@ -4,7 +4,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from markdownx.models import MarkdownxField
 
 from open_producten.locaties.models import Contact, Locatie, Organisatie

src/open_producten/producttypen/serializers/jsonschema.py

@@ -1,4 +1,4 @@
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from jsonschema import Draft202012Validator
 from jsonschema.exceptions import SchemaError
 from rest_framework import serializers

src/open_producten/producttypen/serializers/producttype.py

@@ -1,7 +1,7 @@
 from django.db import transaction
 from django.utils.translation import gettext_lazy as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from rest_framework import serializers
 
 from open_producten.locaties.models import Contact, Locatie, Organisatie

src/open_producten/producttypen/tests/api/test_jsonschema.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
+from django.utils.translation import gettext as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from rest_framework import status
 from rest_framework.exceptions import ErrorDetail
 from rest_framework.test import APIClient
@@ -36,8 +37,12 @@ def test_required_fields(self):
         self.assertEqual(
             response.data,
             {
-                "name": [ErrorDetail(string="Dit veld is vereist.", code="required")],
-                "schema": [ErrorDetail(string="Dit veld is vereist.", code="required")],
+                "name": [
+                    ErrorDetail(string=_("This field is required."), code="required")
+                ],
+                "schema": [
+                    ErrorDetail(string=_("This field is required."), code="required")
+                ],
             },
         )
 
@@ -60,7 +65,7 @@ def test_create_invalid_schema(self):
             {
                 "schema": [
                     ErrorDetail(
-                        string="[] is not valid under any of the given schemas",
+                        string=_("[] is not valid under any of the given schemas"),
                         code="invalid",
                     )
                 ]

src/open_producten/producttypen/tests/api/test_producttype.py

@@ -3,7 +3,7 @@
 from django.urls import reverse
 from django.utils.translation import gettext as _
 
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from freezegun import freeze_time
 from rest_framework import status
 from rest_framework.exceptions import ErrorDetail

src/open_producten/producttypen/views.py

@@ -2,7 +2,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from django_filters.rest_framework import DjangoFilterBackend
-from django_json_schema.models import JsonSchema
+from django_json_schema_model.models import JsonSchema
 from drf_spectacular.utils import OpenApiExample, extend_schema, extend_schema_view
 from rest_framework import status
 from rest_framework.decorators import action

src/producten-openapi.yaml

@@ -110,6 +110,8 @@ paths:
                   gepubliceerd: false
                   bsn: '111222333'
                   status: gereed
+                  verbruiksobject:
+                    uren: 130
                 summary: Create product
         required: true
       security:
@@ -559,6 +561,10 @@ components:
           pattern: ^[0-9]*$
           maxLength: 8
           minLength: 8
+        verbruiksobject:
+          nullable: true
+          description: Verbruiksobject van dit product. Wordt gevalideerd met het
+            `verbruiksobject_schema` uit het product type.
     Product:
       type: object
       properties:
@@ -624,6 +630,10 @@ components:
           pattern: ^[0-9]*$
           maxLength: 8
           minLength: 8
+        verbruiksobject:
+          nullable: true
+          description: Verbruiksobject van dit product. Wordt gevalideerd met het
+            `verbruiksobject_schema` uit het product type.
       required:
       - aanmaak_datum
       - id
@@ -680,6 +690,10 @@ components:
           pattern: ^[0-9]*$
           maxLength: 8
           minLength: 8
+        verbruiksobject:
+          nullable: true
+          description: Verbruiksobject van dit product. Wordt gevalideerd met het
+            `verbruiksobject_schema` uit het product type.
       required:
       - product_type_id
     StatusEnum: