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

refactored transfer location serializers

Browse Source
This commit is contained in:
Anatoly 2019-12-16 17:47:01 +03:00
parent 4c27ad5d5a
commit f861aa419c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/location/transfer_data.py
View File

@ -145,18 +145,18 @@ def transfer_addresses():
def transfer_wine_region(): def transfer_wine_region():
queryset = transfer_models.WineLocations.objects.filter(type='WineRegion') queryset = transfer_models.WineLocations.objects.filter(type='WineRegion')
serialized_data = location_serializers.WineRegion( serialized_data = location_serializers.WineRegionSerializer(
data=list(queryset.values()), data=list(queryset.values()),
many=True) many=True)
if serialized_data.is_valid(): if serialized_data.is_valid():
serialized_data.save() serialized_data.save()
else: else:
pprint(f"WineStandardClassificationSerializer errors: {serialized_data.errors}") pprint(f"WineRegionSerializer errors: {serialized_data.errors}")
def transfer_wine_sub_region(): def transfer_wine_sub_region():
queryset = transfer_models.WineLocations.objects.filter(type='WineSubRegion') queryset = transfer_models.WineLocations.objects.filter(type='WineSubRegion')
serialized_data = location_serializers.WineSubRegion( serialized_data = location_serializers.WineSubRegionSerializer(
data=list(queryset.values()), data=list(queryset.values()),
many=True) many=True)
if serialized_data.is_valid(): if serialized_data.is_valid():
@ -167,7 +167,7 @@ def transfer_wine_sub_region():
def transfer_wine_village(): def transfer_wine_village():
queryset = transfer_models.WineLocations.objects.filter(type='Village') queryset = transfer_models.WineLocations.objects.filter(type='Village')
serialized_data = location_serializers.WineVillage( serialized_data = location_serializers.WineVillageSerializer(
data=list(queryset.values()), data=list(queryset.values()),
many=True) many=True)
if serialized_data.is_valid(): if serialized_data.is_valid():
@ -734,7 +734,7 @@ data_types = {
# transfer_countries, # transfer_countries,
# transfer_regions, # transfer_regions,
# transfer_cities, # transfer_cities,
transfer_addresses, # transfer_addresses,
transfer_wine_region, transfer_wine_region,
transfer_wine_sub_region, transfer_wine_sub_region,
transfer_wine_village, transfer_wine_village,

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

@ -275,7 +275,7 @@ class AddressSerializer(serializers.ModelSerializer):
return data return data
class WineRegion(TransferSerializerMixin): class WineRegionSerializer(TransferSerializerMixin):
id = serializers.IntegerField() id = serializers.IntegerField()
name = serializers.CharField() name = serializers.CharField()
@ -303,7 +303,8 @@ class WineRegion(TransferSerializerMixin):
return attrs return attrs
class WineSubRegion(WineRegion):
class WineSubRegionSerializer(WineRegionSerializer):
id = serializers.IntegerField() id = serializers.IntegerField()
name = serializers.CharField() name = serializers.CharField()
@ -330,7 +331,7 @@ class WineSubRegion(WineRegion):
return qs.first() return qs.first()
class WineVillage(TransferSerializerMixin): class WineVillageSerializer(TransferSerializerMixin):
id = serializers.IntegerField() id = serializers.IntegerField()
name = serializers.CharField() name = serializers.CharField()
@ -479,7 +480,7 @@ class CepageWineRegionSerializer(TransferSerializerMixin):
queryset=Cepages.objects.all()) queryset=Cepages.objects.all())
wine_region_id = serializers.IntegerField() wine_region_id = serializers.IntegerField()
class Meta(WineRegion.Meta): class Meta(WineRegionSerializer.Meta):
fields = [ fields = [
'cepage_id', 'cepage_id',
'wine_region_id', 'wine_region_id',