fix get_description for recipe.py

This commit is contained in:
michail 2019-10-25 13:17:35 +05:00
parent 95811c7437
commit d79946633e
2 changed files with 16 additions and 6 deletions

View File

@ -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}

View File

@ -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',