Feature/oi integration fixes

requirements/base.in

@@ -10,5 +10,5 @@ django-treebeard
 # django-extra-fields
 django-tinymce
 geopy
-
+django-open-forms-client
 django-localflavor

requirements/base.txt

@@ -82,6 +82,7 @@ django==4.2.13
     #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
+    #   django-open-forms-client
     #   django-otp
     #   django-phonenumber-field
     #   django-privates
@@ -130,6 +131,8 @@ django-log-outgoing-requests==0.6.1
     # via open-api-framework
 django-markup==1.8.1
     # via open-api-framework
+django-open-forms-client==0.4.0
+    # via -r requirements/base.in
 django-ordered-model==3.7.4
     # via django-admin-index
 django-otp==1.5.0
@@ -154,6 +157,7 @@ django-solo==2.3.0
     # via
     #   commonground-api-common
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -306,6 +310,7 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework

requirements/ci.txt

@@ -153,6 +153,7 @@ django==4.2.13
     #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
+    #   django-open-forms-client
     #   django-otp
     #   django-phonenumber-field
     #   django-privates
@@ -228,6 +229,10 @@ django-markup==1.8.1
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   open-api-framework
+django-open-forms-client==0.4.0
+    # via
+    #   -c requirements/base.txt
+    #   -r requirements/base.txt
 django-ordered-model==3.7.4
     # via
     #   -c requirements/base.txt
@@ -284,6 +289,7 @@ django-solo==2.3.0
     #   -r requirements/base.txt
     #   commonground-api-common
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -633,6 +639,7 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework

requirements/dev.txt

@@ -183,6 +183,7 @@ django==4.2.13
     #   django-localflavor
     #   django-log-outgoing-requests
     #   django-markup
+    #   django-open-forms-client
     #   django-otp
     #   django-phonenumber-field
     #   django-privates
@@ -262,6 +263,10 @@ django-markup==1.8.1
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   open-api-framework
+django-open-forms-client==0.4.0
+    # via
+    #   -c requirements/ci.txt
+    #   -r requirements/ci.txt
 django-ordered-model==3.7.4
     # via
     #   -c requirements/ci.txt
@@ -318,6 +323,7 @@ django-solo==2.3.0
     #   -r requirements/ci.txt
     #   commonground-api-common
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   mozilla-django-oidc-db
     #   notifications-api-common
     #   zgw-consumers
@@ -724,6 +730,7 @@ requests==2.32.3
     #   commonground-api-common
     #   coreapi
     #   django-log-outgoing-requests
+    #   django-open-forms-client
     #   gemma-zds-client
     #   mozilla-django-oidc
     #   open-api-framework

src/open_producten/conf/base.py

@@ -17,6 +17,7 @@
     "localflavor",
     "treebeard",
     "tinymce",
+    "openformsclient",
     "django.contrib.gis",
     "open_producten.accounts",
     "open_producten.utils",

src/open_producten/fixtures/default_admin_index.json

@@ -147,6 +147,10 @@
             [
                 "admin_index",
                 "contenttypeproxy"
+            ],
+            [
+                "openformsclient",
+                "configuration"
             ]
         ]
     }

src/open_producten/locations/admin/location.py

@@ -1,11 +1,12 @@
 from django.contrib.gis import admin
 
+from open_producten.utils.geocode import GeoAdminMixin
+
 from ..models import Location
 
 
 @admin.register(Location)
-class LocationAdmin(admin.GISModelAdmin):
+class LocationAdmin(GeoAdminMixin, admin.GISModelAdmin):
     list_display = ("name", "city", "postcode", "street", "house_number")
     list_filter = ("city",)
     search_fields = ("name", "city")
-    readonly_fields = ["coordinates"]

src/open_producten/locations/admin/organisation.py

@@ -1,17 +1,17 @@
 from django.contrib.gis import admin
 from django.utils.translation import gettext_lazy as _
 
+from open_producten.utils.geocode import GeoAdminMixin
+
 from ..models import Neighbourhood, Organisation, OrganisationType
 
 
 @admin.register(Organisation)
-class OrganisationAdmin(admin.GISModelAdmin):
+class OrganisationAdmin(GeoAdminMixin, admin.GISModelAdmin):
     list_display = ("name", "type")
     list_filter = ("type__name", "city")
     search_fields = ("name",)
     ordering = ("name",)
-    readonly_fields = ["coordinates"]
-    modifiable = False
 
     fieldsets = (
         (

src/open_producten/locations/serializers/location.py

@@ -75,9 +75,8 @@ def update(self, instance, validated_data: dict) -> Location:
 
 
 class ContactSerializer(serializers.ModelSerializer):
-    organisation = OrganisationSerializer(read_only=True)
     organisation_id = serializers.PrimaryKeyRelatedField(
-        write_only=True, queryset=Organisation.objects.all(), source="organisation"
+        queryset=Organisation.objects.all(), source="organisation"
     )
 
     class Meta:

src/open_producten/locations/tests/test_geoadmin.py

@@ -0,0 +1,35 @@
+from django.contrib.admin import AdminSite
+from django.http import HttpRequest
+from django.test import TestCase
+
+from open_producten.locations.admin import LocationAdmin
+from open_producten.locations.models import Location
+from open_producten.locations.tests.factories import LocationFactory
+
+
+class TestGeoAdminMixin(TestCase):
+
+    def setUp(self):
+        site = AdminSite()
+        self.admin = LocationAdmin(Location, site)
+
+    def test_get_read_only_fields_when_creating_object(self):
+        read_only_fields = self.admin.get_readonly_fields(HttpRequest())
+        self.assertIn("coordinates", read_only_fields)
+
+    def test_get_read_only_fields_when_updating_object(self):
+        read_only_fields = self.admin.get_readonly_fields(
+            HttpRequest(), LocationFactory()
+        )
+        self.assertNotIn("coordinates", read_only_fields)
+
+    def test_form_when_creating_object(self):
+        form_class = self.admin.get_form(HttpRequest())
+        form = form_class()
+        self.assertNotIn("coordinates", form.fields)
+
+    def test_form_when_updating_object(self):
+        form_class = self.admin.get_form(HttpRequest(), LocationFactory())
+        form = form_class()
+        self.assertIn("coordinates", form.fields)
+        self.assertTrue(form.fields["coordinates"].disabled)

src/open_producten/producttypes/migrations/0008_producttype_open_forms_slug_and_more.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.13 on 2024-10-28 15:38
+
+from django.db import migrations, models
+import openformsclient.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("producttypes", "0007_alter_category_description_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="producttype",
+            name="open_forms_slug",
+            field=openformsclient.models.OpenFormsSlugField(
+                blank=True,
+                db_index=False,
+                help_text="Open forms slug of the product type form.",
+                max_length=100,
+                null=True,
+                verbose_name="Open forms slug",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="condition",
+            name="negative_text",
+            field=models.TextField(
+                help_text="Description how not to meet the condition",
+                verbose_name="Negative text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="condition",
+            name="positive_text",
+            field=models.TextField(
+                help_text="Description how to meet the condition",
+                verbose_name="Positive text",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="condition",
+            name="question",
+            field=models.TextField(
+                help_text="Question used in the question-answer game",
+                verbose_name="Question",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="producttype",
+            name="summary",
+            field=models.TextField(
+                default="",
+                help_text="Short description of the product type, limited to 300 characters.",
+                max_length=300,
+                verbose_name="Summary",
+            ),
+        ),
+    ]

src/open_producten/producttypes/models/condition.py

@@ -1,8 +1,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from tinymce import models as tinymce_models
-
 from open_producten.utils.models import BaseModel
 
 
@@ -12,15 +10,15 @@ class Condition(BaseModel):
         max_length=100,
         help_text=_("Short name of the condition"),
     )
-    question = tinymce_models.HTMLField(
+    question = models.TextField(
         verbose_name=_("Question"),
         help_text=_("Question used in the question-answer game"),
     )
-    positive_text = tinymce_models.HTMLField(
+    positive_text = models.TextField(
         verbose_name=_("Positive text"),
         help_text=_("Description how to meet the condition"),
     )
-    negative_text = tinymce_models.HTMLField(
+    negative_text = models.TextField(
         verbose_name=_("Negative text"),
         help_text=_("Description how not to meet the condition"),
     )

src/open_producten/producttypes/models/producttype.py

@@ -4,6 +4,7 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
+from openformsclient.models import OpenFormsSlugField
 from tinymce import models as tinymce_models
 
 from open_producten.locations.models import Contact, Location, Organisation
@@ -14,8 +15,6 @@
 from .tag import Tag
 from .upn import UniformProductName
 
-# from ...utils.models import HTMLField
-
 
 class CategoryProductType(models.Model):
     """
@@ -31,7 +30,7 @@ class ProductType(BasePublishableModel):
         verbose_name=_("Name"), max_length=100, help_text=_("Name of the product type")
     )
 
-    summary = tinymce_models.HTMLField(
+    summary = models.TextField(
         verbose_name=_("Summary"),
         default="",
         max_length=300,
@@ -61,6 +60,13 @@ class ProductType(BasePublishableModel):
         help_text=_("Action link to request the product type."),
     )
 
+    open_forms_slug = OpenFormsSlugField(
+        verbose_name=_("Open forms slug"),
+        null=True,
+        blank=True,
+        help_text=_("Open forms slug of the product type form."),
+    )
+
     content = tinymce_models.HTMLField(
         verbose_name=_("Content"),
         help_text=_("Product type content with build-in WYSIWYG editor."),
@@ -145,6 +151,14 @@ class Meta:
     def __str__(self):
         return self.name
 
+    def clean(self):
+        for contact in self.contacts.all():
+            if (
+                contact.organisation_id is not None
+                and not self.organisations.filter(id=contact.organisation_id).exists()
+            ):
+                self.organisations.add(contact.organisation)
+
     @property
     def current_price(self):
         now = date.today()

src/open_producten/producttypes/serializers/producttype.py

@@ -169,6 +169,7 @@ def create(self, validated_data):
             organisations=organisations,
             contacts=contacts,
         )
+        product_type.clean()
         product_type.save()
 
         return product_type
@@ -194,7 +195,7 @@ def update(self, instance, validated_data):
             organisations=organisations,
             contacts=contacts,
         )
-
+        instance.clean()
         instance.save()
 
         return instance

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

@@ -215,6 +215,9 @@ def test_create_product_type_with_contact(self):
             [contact.first_name],
         )
 
+        # contact org is added in ProductType clean
+        self.assertEqual(ProductType.objects.first().organisations.count(), 1)
+
     def test_create_product_type_with_duplicate_ids_returns_error(self):
         tag = TagFactory.create()
         condition = ConditionFactory.create()
@@ -379,6 +382,9 @@ def test_update_product_type_with_contact(self):
             [contact.first_name],
         )
 
+        # contact org is added in ProductType clean
+        self.assertEqual(ProductType.objects.first().organisations.count(), 1)
+
     def test_update_product_type_with_duplicate_ids_returns_error(self):
         product_type = ProductTypeFactory.create()
         tag = TagFactory.create()