Merge pull request #188 from City-of-Helsinki/fix-land-use-agreement-…

…estate-save-existing Remove unique constraint from land use agreement estate ids
City-of-Helsinki · Dec 4, 2020 · 61920e0 · 61920e0
2 parents cf4b251 + 3400a78
commit 61920e0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/leasing/migrations/0026_land_use_agreement_estate_remove_unique.py b/leasing/migrations/0026_land_use_agreement_estate_remove_unique.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.2.13 on 2020-12-03 11:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("leasing", "0025_landuseagreement_improvements"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="landuseagreementestate",
+            name="estate_id",
+            field=models.CharField(max_length=50, verbose_name="Estate id"),
+        ),
+    ]
diff --git a/leasing/models/land_use_agreement.py b/leasing/models/land_use_agreement.py
@@ -315,9 +315,7 @@ class LandUseAgreementEstate(NameModel):
         on_delete=models.CASCADE,
     )
 
-    estate_id = models.CharField(
-        verbose_name=_("Estate id"), max_length=50, unique=True
-    )
+    estate_id = models.CharField(verbose_name=_("Estate id"), max_length=50)
 
 
 class LandUseAgreementDecisionType(NameModel):

diff --git a/leasing/serializers/land_use_agreement.py b/leasing/serializers/land_use_agreement.py
@@ -217,9 +217,21 @@ class Meta:
 class LandUseAgreementEstateSerializer(
     FieldPermissionsSerializerMixin, serializers.ModelSerializer
 ):
+    id = serializers.ReadOnlyField()
+
     class Meta:
         model = LandUseAgreementEstate
-        fields = ("estate_id",)
+        fields = ("id", "estate_id")
+
+
+class LandUseAgreementEstateCreateUpdateSerializer(
+    FieldPermissionsSerializerMixin, serializers.ModelSerializer
+):
+    id = serializers.IntegerField(required=False)
+
+    class Meta:
+        model = LandUseAgreementEstate
+        fields = ("id", "estate_id")
 
 
 class LandUseAgreementLitigantContactSerializer(
@@ -407,7 +419,7 @@ class LandUseAgreementUpdateSerializer(
         required=False,
         allow_null=True,
     )
-    estate_ids = LandUseAgreementEstateSerializer(
+    estate_ids = LandUseAgreementEstateCreateUpdateSerializer(
         many=True, required=False, allow_null=True
     )
     addresses = LandUseAgreementAddressSerializer(