diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 69356a2f4..3f079dba8 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -338,7 +338,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer): def create(self, validated_data): validated_data['name'] = validated_data['name'].strip() validated_data['space'] = self.context['request'].space - supermarket = validated_data.pop('supermarket_category') + supermarket = validated_data.pop('supermarket_category', None) obj, created = Food.objects.get_or_create(**validated_data) if supermarket: obj.supermarket_category, created = SupermarketCategory.objects.get_or_create(name=supermarket['name'], space=self.context['request'].space) diff --git a/recipes/settings.py b/recipes/settings.py index 38847284e..0889f25f2 100644 --- a/recipes/settings.py +++ b/recipes/settings.py @@ -277,14 +277,14 @@ else: # } # SQLite testing DB -# DATABASES = { -# 'default': { -# 'ENGINE': 'django.db.backends.sqlite3', -# 'OPTIONS': ast.literal_eval(os.getenv('DB_OPTIONS')) if os.getenv('DB_OPTIONS') else {}, -# 'NAME': 'db.sqlite3', -# 'CONN_MAX_AGE': 600, -# } -# } +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'OPTIONS': ast.literal_eval(os.getenv('DB_OPTIONS')) if os.getenv('DB_OPTIONS') else {}, + 'NAME': 'db.sqlite3', + 'CONN_MAX_AGE': 600, + } +} CACHES = { 'default': {