diff --git a/apps/account/transfer.py b/apps/account/transfer.py index 964705e5..54db107b 100644 --- a/apps/account/transfer.py +++ b/apps/account/transfer.py @@ -32,7 +32,7 @@ card = { "Accounts": { "username": "nickname", "email": "email", - "email_confirmed": ("confirmed_at", "BooleanField") + "email_confirmed": ("confirmed_at", "django.db.models.BooleanField") }, "relations": { "Profiles": { diff --git a/apps/collection/transfer.py b/apps/collection/transfer.py index 0d276030..6c18c9ae 100644 --- a/apps/collection/transfer.py +++ b/apps/collection/transfer.py @@ -18,9 +18,9 @@ card = { # нету аналогов для полей description, start и end "name": "title", "slug": "slug", - "block_size": ("geometries", "JSONField"), - "is_publish": ("active", "BooleanField"), - "image_url": ("attachment_file_name", "URLField") + "block_size": ("geometries", "django.db.models.JSONField"), + "is_publish": ("active", "django.db.models.BooleanField"), + "image_url": ("attachment_file_name", "django.db.models.URLField") } }, "relations": { diff --git a/apps/comment/transfer.py b/apps/comment/transfer.py index 51eeed38..64c0abab 100644 --- a/apps/comment/transfer.py +++ b/apps/comment/transfer.py @@ -32,7 +32,7 @@ card = { "fields": { "Comments": { "text": "comment", - "mark": ("mark", "PositiveIntegerField") + "mark": ("mark", "django.db.models.PositiveIntegerField") # как работать с GenericForeignKey - ? # "content_object" : "" }, diff --git a/apps/establishment/transfer.py b/apps/establishment/transfer.py index 6e3e49aa..604cc933 100644 --- a/apps/establishment/transfer.py +++ b/apps/establishment/transfer.py @@ -19,7 +19,7 @@ card = { "Establishments": { # значения для поля "name" берутся из поля "type" legacy модели "establishments" # https://jira.spider.ru/browse/GM-199 - "name": ("name", "TJSONField") + "name": ("name", "django.db.models.TJSONField") } } }, @@ -31,7 +31,7 @@ card = { "Establishments": { "name": "name", "slug": "slug", - "is_publish": ("state", "BooleanField") + "is_publish": ("state", "django.db.models.BooleanField") }, "relations": { "EstablishmentInfos": { @@ -53,9 +53,9 @@ card = { (("location", None), ("Address", "address", None, None)), ], - "Establishment": [#TODO правильно ли заполнена связь с EstablishmentType - ? + "Establishments": [#TODO правильно ли заполнена связь с EstablishmentType - ? (("type", "type"), - ("EstablishmentType", "establishment_type", "id", "PositiveIntegerField")) + ("EstablishmentType", "establishment_type", "id", "django.db.models.PositiveIntegerField")) ] # # "establishment_subtypes": "EstablishmentSubType", # "collections": "Collection", @@ -74,7 +74,7 @@ card = { "dependencies": ("Establishment", ), "fields": { "Menus": { - "category": ("name", "TJSONField") + "category": ("name", "django.db.models.TJSONField") } }, "relations": { @@ -94,7 +94,7 @@ card = { "relations": { #TODO правильно ли заполнена связь с Establishment - ? "Establishments": [ (("id", "id"), - ("Establishment", "establishment", "id", "PositiveIntegerField")) + ("Establishment", "establishment", "id", "django.db.models.PositiveIntegerField")) ] } } diff --git a/apps/location/transfer.py b/apps/location/transfer.py index 7528b45c..74099303 100644 --- a/apps/location/transfer.py +++ b/apps/location/transfer.py @@ -88,7 +88,7 @@ card = { "relations": { "Cities": [( (None, "country_code_2"), - ("Country", "country", "code", "CharField")), + ("Country", "country", "code", "django.db.models.CharField")), # ((None, "subregion_code"), #TODO: как сопоставлять parent_region из postgres с subregion_code из legacy ? # ("Region", "parent_region", "code", "CharField")) @@ -104,7 +104,7 @@ card = { "coordinates": (("lat", "latitude"), ("long", "longitude")), "code": "country_code_2", "postal_code": "zip_code", - "is_island": ("is_island", "is_island", "Boolean") + "is_island": ("is_island", "is_island", "django.db.models.Boolean") }, "relations": { "CityNames": { @@ -124,9 +124,9 @@ card = { "relations": { "Cities": [( (None, "region_code"), - ("Region", "region", "code", "CharField")), + ("Region", "region", "code", "django.db.models.CharField")), ((None, "country_code_2"), - ("Country", "country", "code", "CharField")) + ("Country", "country", "code", "django.db.models.CharField")) ] } }, diff --git a/apps/main/transfer.py b/apps/main/transfer.py index 0d22ef72..5d9caafe 100644 --- a/apps/main/transfer.py +++ b/apps/main/transfer.py @@ -64,14 +64,14 @@ card = { "data_type": "objects", "dependencies": ("Country",), "fields": { - "SiteSettings": { + "Sites": { "subdomain": "country_code_2", "pinterest_page_url": "pinterest_page_url", "twitter_page_url": "twitter_page_url", "facebook_page_url": "facebook_page_url", "instagram_page_url": "instagram_page_url", "contact_email": "contact_email", - "config": ("config", "JSONField") #TODO в качесте ключа использовать country_code_2 из legacy - ? + "config": ("config", "django.db.models.JSONField") #TODO в качесте ключа использовать country_code_2 из legacy - ? }, # "relations": { # # Как работать c отношение OneToOneField @@ -97,7 +97,7 @@ card = { "dependencies": ("SiteSettings", "Feature"), "fields": { "SiteFeatures": { - "published": ("state", "BooleanField") + "published": ("state", "django.db.models.BooleanField") } }, "relations": { @@ -129,7 +129,7 @@ card = { "dependencies": ("AwardType", "ContentType"), "fields": { "Awards": { - "title": ("title", "TJSONField"), + "title": ("title", "django.db.models.JSONField"), "vintage_year": "year", } }, diff --git a/apps/notification/transfer.py b/apps/notification/transfer.py index 1feb4385..9fa47a20 100644 --- a/apps/notification/transfer.py +++ b/apps/notification/transfer.py @@ -35,7 +35,7 @@ card = { "fields": { "EmailAddresses": { "email": "email", - "state": ("state", "PositiveIntegerField") # из legacy брать только те записи у которых state=usable + "state": ("state", "django.db.models.PositiveIntegerField") # из legacy брать только те записи у которых state=usable }, # "relations": [ # # отложено до выяснения Уточнения и вопросы по мигратору(Как поступать со сбором данных) diff --git a/apps/recipe/transfer.py b/apps/recipe/transfer.py index 081ca51c..7b0d4bf8 100644 --- a/apps/recipe/transfer.py +++ b/apps/recipe/transfer.py @@ -67,14 +67,14 @@ card = { "dependencies": None, "fields": { "Pages": { - "state": ("state", "PositiveSmallIntegerField") + "state": ("state", "django.db.models.PositiveSmallIntegerField") }, "relations": { "PageTexts": { "key": "page", "fields": { - "title": ("title", "TJSONField"), - "description": ("body", "TJSONField") + "title": ("title", "django.db.models.JSONField"), + "description": ("body", "django.db.models.JSONField") } } } diff --git a/apps/review/transfer.py b/apps/review/transfer.py index 63f6f925..fa56c4b2 100644 --- a/apps/review/transfer.py +++ b/apps/review/transfer.py @@ -36,7 +36,7 @@ card = { "Reviews": { "published_at": "published_at", "vintage": "vintage", - "status": ("aasm_state", "PositiveSmallIntegerField") + "status": ("aasm_state", "django.db.models.PositiveSmallIntegerField") # "content_object": "" }, @@ -46,7 +46,7 @@ card = { "fields": { # полу text в модели Review имеет тип TJSONField, а поле text в модели ReviewTexts имеет тип TextField # при их сопоставлении использовать поле locale модели ReviewTexts - "text": ("text", "TJSONField") + "text": ("text", "django.db.models.JSONField") } } },