Merge pull request #6 from Amsterdam/improvement/add-id-to-serializer…

…-create-case

Added styling pre-commit

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+
 repos:
   -   repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v3.2.0

README.md

@@ -42,3 +42,20 @@ python manage.py migrate
 
 name_of_apps is the model you would like to change like: cases, events, workflow or schedules.
 You can use the `---empty` flag to create a custom migration.
+
+## Adding pre-commit hooks
+
+You can add pre-commit hooks for checking and cleaning up your changes:
+
+```bash
+bash bin/install_pre_commit.sh
+```
+
+
+## Running tests
+
+Containers should be running to run tests via docker.
+
+```bash
+docker compose exec -T zwd-backend python manage.py test /app/apps
+```

app/apps/cases/admin.py

@@ -8,3 +8,4 @@
 @admin.register(Case)
 class CaseAdmin(admin.ModelAdmin):
     list_display = ("id", "description")
+    search_fields = ("id",)

app/apps/cases/models.py

@@ -4,6 +4,9 @@
 class Case(models.Model):
     description = models.TextField(null=True)
 
+    def __str__(self):
+        return f"Case: {self.id}"
+
 
 class CaseStateType(models.Model):
     name = models.CharField(max_length=255, unique=True)

app/apps/cases/serializers.py

@@ -14,4 +14,4 @@ class Meta:
 class CaseCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Case
-        fields = ("description", "id")
+        fields = ("id", "description")

app/apps/workflow/admin.py

@@ -5,7 +5,19 @@
 
 @admin.register(CaseWorkflow)
 class CaseWorkflowAdmin(admin.ModelAdmin):
-    list_display = ("id", "case")
+    list_display = (
+        "id",
+        "case",
+        "main_workflow",
+        "workflow_type",
+        "workflow_version",
+        "case_state_type",
+        "completed",
+    )
+
+    search_fields = ("case__id",)
+
+    list_filter = ("main_workflow", "completed")
 
 
 @admin.register(CaseUserTask)

app/apps/workflow/models.py

@@ -72,6 +72,9 @@ class CaseWorkflow(models.Model):
         default=False,
     )
 
+    def __str__(self):
+        return f"W: {self.id}, C: {self.case.id}"
+
     def start(self):
         workflow = self._get_or_restore_workflow_state()
         initial_data = get_initial_data_from_config(

app/apps/workflow/serializers.py

@@ -1,6 +1,7 @@
 import re
 
 from apps.cases.models import Case
+from drf_spectacular.utils import extend_schema_field
 from rest_framework import serializers
 from rest_framework.fields import empty
 
@@ -41,6 +42,7 @@ class Meta:
             "tasks",
         )
 
+    @extend_schema_field(CaseUserTaskSerializer(many=True))
     def get_tasks(self, obj):
         return CaseUserTaskSerializer(
             CaseUserTask.objects.filter(