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

Add country transfer

Browse Source
This commit is contained in:
littlewolf 2019-10-26 09:18:45 +03:00
parent 7e757aa63f
commit 06b12f9427
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/location/transfer_data.py
View File

@ -6,7 +6,8 @@ from pprint import pprint
def transfer_countries(): def transfer_countries():
queryset = Cities.objects.exclude(country_code_2__isnull=True).values_list("country_code_2", flat=True).distinct() queryset = Cities.objects.exclude(Q(country_code_2__isnull=True) | Q(country_code_2=""))\
.values_list("country_code_2", flat=True).distinct()
serialized_data = CountrySerializer(data=list(queryset.values()), many=True) serialized_data = CountrySerializer(data=list(queryset.values()), many=True)
if serialized_data.is_valid(): if serialized_data.is_valid():
@ -17,7 +18,11 @@ def transfer_countries():
def transfer_regions(): def transfer_regions():
regions_without_subregion_queryset = Cities.objects.\ regions_without_subregion_queryset = Cities.objects.\
exclude(Q(subregion_code__isnull=False) | Q(region_code__isnull=True) | Q(country_code_2__isnull=True)).\ exclude(Q(subregion_code__isnull=False) |
Q(region_code__isnull=True) |
Q(country_code_2__isnull=True) |
Q(region_code="") |
Q(country_code_2="")).\
values('region_code', 'country_code_2', 'subregion_code').distinct() values('region_code', 'country_code_2', 'subregion_code').distinct()
serialized_without_subregion = RegionSerializer(data=list(regions_without_subregion_queryset.values()), many=True) serialized_without_subregion = RegionSerializer(data=list(regions_without_subregion_queryset.values()), many=True)

14
apps/transfer/serializers/location.py
View File

@ -40,19 +40,21 @@ class RegionSerializer(serializers.ModelSerializer):
def validate(self, data): def validate(self, data):
data['code'] = data.pop('region_code') data['code'] = data.pop('region_code')
if "country_code_2" in data and data["country_code_2"] is not None:
try: try:
country = Country.objects.get(code=data['country_code_2']) country = Country.objects.get(code=data['country_code_2'])
data.country = country except Exception as e:
raise ValueError(f"{data}: {e}")
data["country"] = country
del (data['country_code_2']) del (data['country_code_2'])
except Country.DoesNotExist as e:
print(f"Country error: {e}")
del(data['subregion_code']) del(data['subregion_code'])
return data return data
def create(self, validated_data): def create(self, validated_data):
# Some regions may be already in database # Some regions may be already in database
try:
region, _ = Region.objects.get_or_create(**validated_data) region, _ = Region.objects.get_or_create(**validated_data)
except Exception as e:
raise ValueError(f"{validated_data}: {e}")
return region return region