From bbd4d202102f1f90f259c2210e60db1da4cc12c7 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 18 May 2021 17:34:01 +0200
Subject: [PATCH] uniqueness fixes

---
 .../migrations/0121_auto_20210518_1638.py     | 23 +++++++++++++++++++
 cookbook/serializer.py                        |  5 ++++
 recipes/settings.py                           | 13 +++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 cookbook/migrations/0121_auto_20210518_1638.py

diff --git a/cookbook/migrations/0121_auto_20210518_1638.py b/cookbook/migrations/0121_auto_20210518_1638.py
new file mode 100644
index 000000000..678bfd368
--- /dev/null
+++ b/cookbook/migrations/0121_auto_20210518_1638.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.3 on 2021-05-18 14:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0120_bookmarklet'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userpreference',
+            name='search_style',
+            field=models.CharField(choices=[('SMALL', 'Small'), ('LARGE', 'Large'), ('NEW', 'New')], default='LARGE', max_length=64),
+        ),
+        migrations.AlterField(
+            model_name='userpreference',
+            name='use_fractions',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 11591f69c..c67bf5f25 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -177,6 +177,10 @@ class UnitSerializer(UniqueFieldsMixin, serializers.ModelSerializer):
     def create(self, validated_data):
         obj, created = Unit.objects.get_or_create(name=validated_data['name'].strip(), space=self.context['request'].space)
         return obj
+    
+    def update(self, instance, validated_data):
+        validated_data['name'] = validated_data['name'].strip()
+        return super(UnitSerializer, self).update(instance, validated_data)
 
     class Meta:
         model = Unit
@@ -222,6 +226,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
         return obj
 
     def update(self, instance, validated_data):
+        validated_data['name'] = validated_data['name'].strip()
         return super(FoodSerializer, self).update(instance, validated_data)
 
     class Meta:
diff --git a/recipes/settings.py b/recipes/settings.py
index 431f8b1ef..e7865df97 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -223,6 +223,19 @@ else:
         }
     }
 
+# Local testing DB
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.postgresql',
+#         'HOST': 'localhost',
+#         'PORT': 5432,
+#         'USER': 'postgres',
+#         'PASSWORD': 'postgres', # set to local pw
+#         'NAME': 'postgres',
+#         'CONN_MAX_AGE': 600,
+#     }
+# }
+
 # Vue webpack settings
 VUE_DIR = os.path.join(BASE_DIR, 'vue')