fix: исправлено по pep8

Author: levinadev

backend/cats/apps.py

@@ -2,5 +2,5 @@
 
 
 class CatsConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'cats'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "cats"

backend/cats/migrations/0001_initial.py

@@ -16,34 +16,83 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='Achievement',
+            name="Achievement",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=64)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=64)),
             ],
         ),
         migrations.CreateModel(
-            name='AchievementCat',
+            name="AchievementCat",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('achievement', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cats.achievement')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "achievement",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="cats.achievement",
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='Cat',
+            name="Cat",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=16)),
-                ('color', models.CharField(max_length=16)),
-                ('birth_year', models.IntegerField()),
-                ('image', models.ImageField(default=None, null=True, upload_to='cats/images/')),
-                ('achievements', models.ManyToManyField(through='cats.AchievementCat', to='cats.Achievement')),
-                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='cats', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=16)),
+                ("color", models.CharField(max_length=16)),
+                ("birth_year", models.IntegerField()),
+                (
+                    "image",
+                    models.ImageField(
+                        default=None, null=True, upload_to="cats/images/"
+                    ),
+                ),
+                (
+                    "achievements",
+                    models.ManyToManyField(
+                        through="cats.AchievementCat", to="cats.Achievement"
+                    ),
+                ),
+                (
+                    "owner",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="cats",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
         migrations.AddField(
-            model_name='achievementcat',
-            name='cat',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cats.cat'),
+            model_name="achievementcat",
+            name="cat",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="cats.cat"
+            ),
         ),
     ]

backend/cats/models.py

@@ -16,15 +16,13 @@ class Cat(models.Model):
     color = models.CharField(max_length=16)
     birth_year = models.IntegerField()
     owner = models.ForeignKey(
-        User, related_name='cats',
-        on_delete=models.CASCADE
+        User, related_name="cats", on_delete=models.CASCADE
+    )
+    achievements = models.ManyToManyField(
+        Achievement, through="AchievementCat"
     )
-    achievements = models.ManyToManyField(Achievement,
-                                          through='AchievementCat')
     image = models.ImageField(
-        upload_to='cats/images/',
-        null=True,
-        default=None
+        upload_to="cats/images/", null=True, default=None
     )
 
     def __str__(self):
@@ -36,4 +34,4 @@ class AchievementCat(models.Model):
     cat = models.ForeignKey(Cat, on_delete=models.CASCADE)
 
     def __str__(self):
-        return f'{self.achievement} {self.cat}'
+        return f"{self.achievement} {self.cat}"

backend/cats/serializers.py

@@ -16,25 +16,25 @@ def to_internal_value(self, data):
         try:
             data = webcolors.hex_to_name(data)
         except ValueError:
-            raise serializers.ValidationError('Для этого цвета нет имени')
+            raise serializers.ValidationError("Для этого цвета нет имени")
         return data
 
 
 class AchievementSerializer(serializers.ModelSerializer):
-    achievement_name = serializers.CharField(source='name')
+    achievement_name = serializers.CharField(source="name")
 
     class Meta:
         model = Achievement
-        fields = ('id', 'achievement_name')
+        fields = ("id", "achievement_name")
 
 
 class Base64ImageField(serializers.ImageField):
     def to_internal_value(self, data):
-        if isinstance(data, str) and data.startswith('data:image'):
-            format, imgstr = data.split(';base64,')
-            ext = format.split('/')[-1]
+        if isinstance(data, str) and data.startswith("data:image"):
+            format, imgstr = data.split(";base64,")
+            ext = format.split("/")[-1]
 
-            data = ContentFile(base64.b64decode(imgstr), name='temp.' + ext)
+            data = ContentFile(base64.b64decode(imgstr), name="temp." + ext)
 
         return super().to_internal_value(data)
 
@@ -45,17 +45,24 @@ class CatSerializer(serializers.ModelSerializer):
     age = serializers.SerializerMethodField()
     image = Base64ImageField(required=False, allow_null=True)
     image_url = serializers.SerializerMethodField(
-        'get_image_url',
+        "get_image_url",
         read_only=True,
     )
 
     class Meta:
         model = Cat
         fields = (
-            'id', 'name', 'color', 'birth_year', 'achievements',
-            'owner', 'age', 'image', 'image_url'
+            "id",
+            "name",
+            "color",
+            "birth_year",
+            "achievements",
+            "owner",
+            "age",
+            "image",
+            "image_url",
         )
-        read_only_fields = ('owner',)
+        read_only_fields = ("owner",)
 
     def get_image_url(self, obj):
         if obj.image:
@@ -66,10 +73,10 @@ def get_age(self, obj):
         return dt.datetime.now().year - obj.birth_year
 
     def create(self, validated_data):
-        if 'achievements' not in self.initial_data:
+        if "achievements" not in self.initial_data:
             cat = Cat.objects.create(**validated_data)
             return cat
-        achievements = validated_data.pop('achievements')
+        achievements = validated_data.pop("achievements")
         cat = Cat.objects.create(**validated_data)
         for achievement in achievements:
             current_achievement, status = Achievement.objects.get_or_create(
@@ -81,18 +88,18 @@ def create(self, validated_data):
         return cat
 
     def update(self, instance, validated_data):
-        instance.name = validated_data.get('name', instance.name)
-        instance.color = validated_data.get('color', instance.color)
+        instance.name = validated_data.get("name", instance.name)
+        instance.color = validated_data.get("color", instance.color)
         instance.birth_year = validated_data.get(
-            'birth_year', instance.birth_year
+            "birth_year", instance.birth_year
         )
-        instance.image = validated_data.get('image', instance.image)
+        instance.image = validated_data.get("image", instance.image)
 
-        if 'achievements' not in validated_data:
+        if "achievements" not in validated_data:
             instance.save()
             return instance
 
-        achievements_data = validated_data.pop('achievements')
+        achievements_data = validated_data.pop("achievements")
         lst = []
         for achievement in achievements_data:
             current_achievement, status = Achievement.objects.get_or_create(

backend/cats/tests.py

@@ -8,11 +8,11 @@
 class CatsAPITestCase(TestCase):
     def setUp(self):
         User = get_user_model()
-        self.user = User.objects.create_user(username='auth_user')
+        self.user = User.objects.create_user(username="auth_user")
         self.client = APIClient()
         self.client.force_authenticate(user=self.user)
 
     def test_list_exists(self):
         """Проверка доступности списка задач."""
-        response = self.client.get('/api/cats/')
+        response = self.client.get("/api/cats/")
         self.assertEqual(response.status_code, HTTPStatus.OK)

backend/kittygram_backend/asgi.py

@@ -11,6 +11,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kittygram_backend.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kittygram_backend.settings")
 
 application = get_asgi_application()