phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix get_description for recipe.py

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/transfer/serializers/recipe.py
View File

@ -1,8 +1,10 @@
from rest_framework import serializers from rest_framework import serializers
from recipe.models import Recipe from recipe.models import Recipe
from utils.legacy_parser import parse_legacy_content
class RecipeSerializer(serializers.ModelSerializer): class RecipeSerializer(serializers.ModelSerializer):
locale = serializers.CharField()
body = serializers.CharField(allow_null=True) body = serializers.CharField(allow_null=True)
title = serializers.CharField() title = serializers.CharField()
state = serializers.CharField() state = serializers.CharField()
@ -14,7 +16,8 @@ class RecipeSerializer(serializers.ModelSerializer):
"body", "body",
"title", "title",
"state", "state",
"created_at" "created_at",
'locale',
) )
def validate(self, data): def validate(self, data):
@ -22,6 +25,7 @@ class RecipeSerializer(serializers.ModelSerializer):
data["title"] = self.get_title(data) data["title"] = self.get_title(data)
data["description"] = self.get_description(data) data["description"] = self.get_description(data)
data.pop("body") data.pop("body")
data.pop("locale")
return data return data
def create(self, validated_data): def create(self, validated_data):
@ -38,9 +42,14 @@ class RecipeSerializer(serializers.ModelSerializer):
return Recipe.WAITING return Recipe.WAITING
def get_title(self, obj): def get_title(self, obj):
tit = obj.get("title") # tit = obj.get("title")
return {"en-GB": tit} # return {"en-GB": tit}
return {obj['locale']: obj['title']}
def get_description(self, obj): def get_description(self, obj):
desc = obj.get("body") # desc = obj.get("body")
return {"en-GB": desc} # return {"en-GB": desc}
content = None
if obj['body']:
content = parse_legacy_content(obj['body'])
return {obj['locale']: content}

3
project/settings/base.py
View File

@ -159,7 +159,8 @@ DATABASES = {
}, },
'legacy': { 'legacy': {
'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.db.backends.mysql',
'HOST': '172.23.0.1', 'HOST': '172.17.0.1',
# 'HOST': '172.23.0.1',
# 'HOST': 'mysql_db', # 'HOST': 'mysql_db',
'PORT': 3306, 'PORT': 3306,
'NAME': 'dev', 'NAME': 'dev',