diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py index b5a8bd95..02ba0be7 100644 --- a/apps/location/transfer_data.py +++ b/apps/location/transfer_data.py @@ -145,18 +145,18 @@ def transfer_addresses(): def transfer_wine_region(): queryset = transfer_models.WineLocations.objects.filter(type='WineRegion') - serialized_data = location_serializers.WineRegion( + serialized_data = location_serializers.WineRegionSerializer( data=list(queryset.values()), many=True) if serialized_data.is_valid(): serialized_data.save() else: - pprint(f"WineStandardClassificationSerializer errors: {serialized_data.errors}") + pprint(f"WineRegionSerializer errors: {serialized_data.errors}") def transfer_wine_sub_region(): queryset = transfer_models.WineLocations.objects.filter(type='WineSubRegion') - serialized_data = location_serializers.WineSubRegion( + serialized_data = location_serializers.WineSubRegionSerializer( data=list(queryset.values()), many=True) if serialized_data.is_valid(): @@ -167,7 +167,7 @@ def transfer_wine_sub_region(): def transfer_wine_village(): queryset = transfer_models.WineLocations.objects.filter(type='Village') - serialized_data = location_serializers.WineVillage( + serialized_data = location_serializers.WineVillageSerializer( data=list(queryset.values()), many=True) if serialized_data.is_valid(): @@ -734,7 +734,7 @@ data_types = { # transfer_countries, # transfer_regions, # transfer_cities, - transfer_addresses, + # transfer_addresses, transfer_wine_region, transfer_wine_sub_region, transfer_wine_village, diff --git a/apps/product/models.py b/apps/product/models.py index 6923d6dd..e4454168 100644 --- a/apps/product/models.py +++ b/apps/product/models.py @@ -219,8 +219,8 @@ class Product(GalleryModelMixin, TranslatedFieldsMixin, BaseAttributes, awards = generic.GenericRelation(to='main.Award', related_query_name='product') serial_number = models.CharField(max_length=255, - default=None, null=True, - verbose_name=_('Serial number')) + default=None, null=True, + verbose_name=_('Serial number')) objects = ProductManager.from_queryset(ProductQuerySet)() diff --git a/apps/transfer/serializers/location.py b/apps/transfer/serializers/location.py index 92556970..7303fb61 100644 --- a/apps/transfer/serializers/location.py +++ b/apps/transfer/serializers/location.py @@ -275,7 +275,7 @@ class AddressSerializer(serializers.ModelSerializer): return data -class WineRegion(TransferSerializerMixin): +class WineRegionSerializer(TransferSerializerMixin): id = serializers.IntegerField() name = serializers.CharField() @@ -303,7 +303,8 @@ class WineRegion(TransferSerializerMixin): return attrs -class WineSubRegion(WineRegion): + +class WineSubRegionSerializer(WineRegionSerializer): id = serializers.IntegerField() name = serializers.CharField() @@ -330,7 +331,7 @@ class WineSubRegion(WineRegion): return qs.first() -class WineVillage(TransferSerializerMixin): +class WineVillageSerializer(TransferSerializerMixin): id = serializers.IntegerField() name = serializers.CharField() @@ -479,7 +480,7 @@ class CepageWineRegionSerializer(TransferSerializerMixin): queryset=Cepages.objects.all()) wine_region_id = serializers.IntegerField() - class Meta(WineRegion.Meta): + class Meta(WineRegionSerializer.Meta): fields = [ 'cepage_id', 'wine_region_id',