Feature/46 producttype nl datamodel

src/open_producten/producttypen/admin/bestand.py

@@ -12,6 +12,7 @@ class BestandInline(admin.TabularInline):
 class BestandAdmin(admin.ModelAdmin):
     list_display = ("product_type", "bestand")
     list_filter = ("product_type",)
+    search_fields = ("bestand",)
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related("product_type")

src/open_producten/producttypen/admin/link.py

@@ -12,6 +12,8 @@ class LinkInline(admin.TabularInline):
 @admin.register(Link)
 class LinkAdmin(admin.ModelAdmin):
     list_display = ("product_type", "naam", "url")
+    list_filter = ("product_type__naam",)
+    search_fields = ("naam", "product_type__naam")
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related("product_type")

src/open_producten/producttypen/admin/onderwerp.py

@@ -36,7 +36,7 @@ def clean(self):
                 if not gepubliceerd and any([data[child] for child in children]):
                     raise forms.ValidationError(
                         _(
-                            "Hoofd onderwerpen moeten gepubliceerd zijn met gepubliceerde sub onderwerpen."
+                            "Onderwerpen moeten gepubliceerd zijn met gepubliceerde sub onderwerpen."
                         )
                     )
 
@@ -70,9 +70,7 @@ class OnderwerpAdmin(TreeAdmin):
         ),
     )
 
-    list_filter = [
-        "gepubliceerd",
-    ]
+    list_filter = ["gepubliceerd", "product_typen"]
 
     def get_changelist_formset(self, request, **kwargs):
         kwargs["formset"] = OnderwerpAdminFormSet

src/open_producten/producttypen/admin/prijs.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.core.exceptions import ValidationError
 from django.forms import BaseInlineFormSet
+from django.utils.datetime_safe import datetime
 from django.utils.translation import gettext_lazy as _
 
 from ..models import Prijs, PrijsOptie
@@ -31,6 +32,13 @@ class PrijsOptieInline(admin.TabularInline):
 class PrijsAdmin(admin.ModelAdmin):
     model = Prijs
     inlines = [PrijsOptieInline]
+    list_display = ("__str__", "actief_vanaf")
+    list_filter = ("product_type__naam", "actief_vanaf")
 
     def get_queryset(self, request):
         return super().get_queryset(request).select_related("product_type")
+
+    def has_change_permission(self, request, obj=None):
+        if obj and obj.actief_vanaf < datetime.today().date():
+            return False
+        return super().has_change_permission(request, obj)

src/open_producten/producttypen/admin/producttype.py

@@ -30,7 +30,14 @@ def clean(self):
 
 @admin.register(ProductType)
 class ProductTypeAdmin(admin.ModelAdmin):
-    list_display = ("naam", "aanmaak_datum", "display_onderwerpen", "gepubliceerd")
+    list_display = (
+        "naam",
+        "uniforme_product_naam",
+        "aanmaak_datum",
+        "display_onderwerpen",
+        "gepubliceerd",
+        "keywords",
+    )
     list_filter = ("gepubliceerd", "onderwerpen")
     list_editable = ("gepubliceerd",)
     date_hierarchy = "aanmaak_datum"
@@ -39,7 +46,7 @@ class ProductTypeAdmin(admin.ModelAdmin):
         # "contacts",
         # "locations",
     )
-    search_fields = ("naam",)
+    search_fields = ("naam", "uniforme_product_naam__naam", "keywords")
     ordering = ("naam",)
     save_on_top = True
     form = ProductTypeAdminForm
@@ -57,4 +64,4 @@ def get_queryset(self, request):
 
     @admin.display(description="onderwerpen")
     def display_onderwerpen(self, obj):
-        return ", ".join(p.naam for p in obj.onderwerp.all())
+        return ", ".join(p.naam for p in obj.onderwerpen.all())

src/open_producten/producttypen/management/commands/load_upl.py

@@ -1,68 +1,137 @@
+import csv
+import os
 from dataclasses import dataclass
+from io import StringIO
 
 from django.core.management.base import BaseCommand, CommandError
+from django.db import transaction
+
+import requests
 
 from open_producten.producttypen.models import (
     UniformeProductNaam as UniformProductNaamModel,
 )
 
-from ..parsers import CsvParser
-
 
 @dataclass
 class UniformProductName:
     name: str
     uri: str
 
 
+def _check_if_csv_extension(path: str):
+    _, extension = os.path.splitext(path)
+    file_format = extension[1:]
+
+    if file_format != "csv":
+        raise CommandError("File format is not csv.")
+
+
 class Command(BaseCommand):
 
     def __init__(self):
-        self.help = "Load upn to the database from a given XML/CSV file."
-        self.parser = CsvParser()
+        self.help = (
+            "Load upn to the database from a given local csv file or csv file url."
+        )
         super().__init__()
 
     def add_arguments(self, parser):
         parser.add_argument(
-            "filename",
-            help="The name of the file to be imported.",
+            "--file",
+            help="The path to the csv file to be imported.",
+        )
+        parser.add_argument(
+            "--url",
+            help="The url to the csv file to be imported.",
         )
 
     def handle(self, **options):
-        filename = options.pop("filename")
+        file = options.pop("file")
+        url = options.pop("url")
+
+        if file and url:
+            raise CommandError("Only one of --file or --url can be specified.")
 
-        self.stdout.write(f"Importing upn from {filename}...")
+        if not file and not url:
+            raise CommandError("Either --file or --url must be specified.")
+
+        self.stdout.write(f"Importing upn from {file if file else url}...")
 
         try:
-            data = self.parser.parse(filename)
-            upn_objects = [
-                UniformProductName(name=entry["UniformeProductnaam"], uri=entry["URI"])
-                for entry in data
-            ]
-            created_count = self.load_upl(upn_objects)
-
-        except KeyError as e:
-            raise CommandError(f"{str(e)} does not exist in csv.")
+            if file:
+                created_count, update_count, removed_count = self._parse_csv_file(file)
+            else:
+                created_count, update_count, removed_count = self._parse_csv_url(url)
+        except CommandError:
+            raise
         except Exception as e:
-            raise CommandError(str(e))
+            raise CommandError(f"Something went wrong: {str(e)}")
+        self.stdout.write(
+            "Done\n"
+            f"Created {created_count} product names.\n"
+            f"Updated {update_count} product names.\n"
+            f"{removed_count} product names did not exist in the csv."
+        )
+
+    def _parse_csv_file(self, file: str):
+        _check_if_csv_extension(file)
+
+        with open(file, encoding="utf-8-sig") as f:
+            data = csv.DictReader(f)
+            return self._load_upl(data)
+
+    def _parse_csv_url(self, url: str):
+        _check_if_csv_extension(url)
 
-        self.stdout.write(f"Done ({created_count} objects).")
+        response = requests.get(url)
+        if response.status_code != 200:
+            raise CommandError(f"Url returned status code: {response.status_code}.")
 
-    def load_upl(self, data: list[UniformProductName]) -> int:
-        count = 0
+        content = StringIO(response.text)
+        data = csv.DictReader(content)
+        return self._load_upl(data)
+
+    @transaction.atomic
+    def _load_upl(self, data: csv.DictReader) -> tuple[int, int, int]:
+        created_count = 0
+        updated_count = 0
         upn_updated_list = []
+        columns = {
+            "uri": "URI",
+            "name": "UniformeProductnaam",
+        }
+
+        if missing_columns := [
+            f"'{key}'" for key in columns.values() if key not in data.fieldnames
+        ]:
+            raise CommandError(
+                f"Column(s) {', '.join(missing_columns)} do not exist in the CSV."
+            )
+
+        for i, row in enumerate(data):
+            uri = row[columns["uri"]]
+            name = row[columns["name"]]
+
+            if not name or not uri:
+                self.stdout.write(
+                    f"Skipping index {i} because of missing column(s) {' or '.join(columns.values())}."
+                )
+                continue
 
-        for obj in data:
             upn, created = UniformProductNaamModel.objects.update_or_create(
-                uri=obj.uri,
-                defaults={"naam": obj.name, "is_verwijderd": False},
+                uri=uri,
+                defaults={"naam": name, "is_verwijderd": False},
             )
             upn_updated_list.append(upn.id)
 
             if created:
-                count += 1
+                created_count += 1
+            else:
+                updated_count += 1
 
-        UniformProductNaamModel.objects.exclude(id__in=upn_updated_list).update(
+        removed_count = UniformProductNaamModel.objects.exclude(
+            id__in=upn_updated_list
+        ).update(
             is_verwijderd=True,
         )
-        return count
+        return created_count, updated_count, removed_count

src/open_producten/producttypen/migrations/0002_alter_onderwerp_beschrijving_and_more.py

@@ -0,0 +1,98 @@
+# Generated by Django 4.2.16 on 2024-12-09 15:38
+
+import datetime
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import markdownx.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("producttypen", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="onderwerp",
+            name="beschrijving",
+            field=markdownx.models.MarkdownxField(
+                blank=True,
+                default="",
+                help_text="Beschrijving van het onderwerp, ondersteund markdown format.",
+                verbose_name="beschrijving",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="prijs",
+            name="actief_vanaf",
+            field=models.DateField(
+                help_text="De datum vanaf wanneer de prijs actief is.",
+                validators=[
+                    django.core.validators.MinValueValidator(datetime.date.today)
+                ],
+                verbose_name="start datum",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="producttype",
+            name="beschrijving",
+            field=markdownx.models.MarkdownxField(
+                help_text="Product type beschrijving, ondersteund markdown format.",
+                verbose_name="beschrijving",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="producttype",
+            name="naam",
+            field=models.CharField(
+                help_text="naam van het product type.",
+                max_length=100,
+                verbose_name="product type naam",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vraag",
+            name="antwoord",
+            field=markdownx.models.MarkdownxField(
+                help_text="Het antwoord op de vraag, ondersteund markdown format.",
+                verbose_name="antwoord",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vraag",
+            name="onderwerp",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Het onderwerp waarbij deze vraag hoort.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="vragen",
+                to="producttypen.onderwerp",
+                verbose_name="onderwerp",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vraag",
+            name="product_type",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Het product type waarbij deze vraag hoort.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="vragen",
+                to="producttypen.producttype",
+                verbose_name="Product type",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vraag",
+            name="vraag",
+            field=models.CharField(
+                help_text="De vraag die wordt beantwoord.",
+                max_length=250,
+                verbose_name="vraag",
+            ),
+        ),
+    ]