From d79946633e1b2ce13760329678fe56851bee145d Mon Sep 17 00:00:00 2001 From: michail Date: Fri, 25 Oct 2019 13:17:35 +0500 Subject: [PATCH] fix get_description for recipe.py --- apps/transfer/serializers/recipe.py | 19 ++++++++++++++----- project/settings/base.py | 3 ++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/apps/transfer/serializers/recipe.py b/apps/transfer/serializers/recipe.py index 890d2b42..3948bbdd 100644 --- a/apps/transfer/serializers/recipe.py +++ b/apps/transfer/serializers/recipe.py @@ -1,8 +1,10 @@ from rest_framework import serializers from recipe.models import Recipe +from utils.legacy_parser import parse_legacy_content class RecipeSerializer(serializers.ModelSerializer): + locale = serializers.CharField() body = serializers.CharField(allow_null=True) title = serializers.CharField() state = serializers.CharField() @@ -14,7 +16,8 @@ class RecipeSerializer(serializers.ModelSerializer): "body", "title", "state", - "created_at" + "created_at", + 'locale', ) def validate(self, data): @@ -22,6 +25,7 @@ class RecipeSerializer(serializers.ModelSerializer): data["title"] = self.get_title(data) data["description"] = self.get_description(data) data.pop("body") + data.pop("locale") return data def create(self, validated_data): @@ -38,9 +42,14 @@ class RecipeSerializer(serializers.ModelSerializer): return Recipe.WAITING def get_title(self, obj): - tit = obj.get("title") - return {"en-GB": tit} + # tit = obj.get("title") + # return {"en-GB": tit} + return {obj['locale']: obj['title']} def get_description(self, obj): - desc = obj.get("body") - return {"en-GB": desc} + # desc = obj.get("body") + # return {"en-GB": desc} + content = None + if obj['body']: + content = parse_legacy_content(obj['body']) + return {obj['locale']: content} diff --git a/project/settings/base.py b/project/settings/base.py index 752691ea..676a67d1 100644 --- a/project/settings/base.py +++ b/project/settings/base.py @@ -159,7 +159,8 @@ DATABASES = { }, 'legacy': { 'ENGINE': 'django.db.backends.mysql', - 'HOST': '172.23.0.1', + 'HOST': '172.17.0.1', + # 'HOST': '172.23.0.1', # 'HOST': 'mysql_db', 'PORT': 3306, 'NAME': 'dev',