style: lint code

ispp-2324-ocial · Apr 1, 2024 · 5fe5fc6 · 5fe5fc6
1 parent d4a9d5a
commit 5fe5fc6
Show file tree

Hide file tree

Showing 18 changed files with 224 additions and 84 deletions.
diff --git a/event/migrations/0001_initial.py b/event/migrations/0001_initial.py
@@ -10,35 +10,89 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('user', '0001_initial'),
+        ("user", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Event',
+            name="Event",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.TextField()),
-                ('place', models.TextField()),
-                ('description', models.TextField()),
-                ('date', models.DateField()),
-                ('hour', models.TimeField()),
-                ('capacity', models.PositiveIntegerField(default=0)),
-                ('category', models.TextField(choices=[('Sports', 'SPORTS'), ('Music', 'MUSIC'), ('Markets', 'MARKETS'), ('Relax activities', 'RELAX_ACTIVITIES'), ('Live concert', 'LIVE_CONCERT')], default='Sports')),
-                ('latitude', models.FloatField()),
-                ('longitude', models.FloatField()),
-                ('image', models.ImageField(blank=True, null=True, upload_to='images/')),
-                ('blurhash', models.TextField(blank=True, null=True)),
-                ('ocialClient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='OcialClient', to='user.ocialclient')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.TextField()),
+                ("place", models.TextField()),
+                ("description", models.TextField()),
+                ("date", models.DateField()),
+                ("hour", models.TimeField()),
+                ("capacity", models.PositiveIntegerField(default=0)),
+                (
+                    "category",
+                    models.TextField(
+                        choices=[
+                            ("Sports", "SPORTS"),
+                            ("Music", "MUSIC"),
+                            ("Markets", "MARKETS"),
+                            ("Relax activities", "RELAX_ACTIVITIES"),
+                            ("Live concert", "LIVE_CONCERT"),
+                        ],
+                        default="Sports",
+                    ),
+                ),
+                ("latitude", models.FloatField()),
+                ("longitude", models.FloatField()),
+                (
+                    "image",
+                    models.ImageField(blank=True, null=True, upload_to="images/"),
+                ),
+                ("blurhash", models.TextField(blank=True, null=True)),
+                (
+                    "ocialClient",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="OcialClient",
+                        to="user.ocialclient",
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='Rating',
+            name="Rating",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('score', models.PositiveIntegerField(default=0, validators=[django.core.validators.MaxValueValidator(5), django.core.validators.MinValueValidator(0)])),
-                ('comment', models.TextField(blank=True, null=True)),
-                ('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='Rating', to='event.event')),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "score",
+                    models.PositiveIntegerField(
+                        default=0,
+                        validators=[
+                            django.core.validators.MaxValueValidator(5),
+                            django.core.validators.MinValueValidator(0),
+                        ],
+                    ),
+                ),
+                ("comment", models.TextField(blank=True, null=True)),
+                (
+                    "event",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="Rating",
+                        to="event.event",
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/event/migrations/0002_remove_event_blurhash_remove_event_image.py b/event/migrations/0002_remove_event_blurhash_remove_event_image.py
@@ -6,16 +6,16 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('event', '0001_initial'),
+        ("event", "0001_initial"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='event',
-            name='blurhash',
+            model_name="event",
+            name="blurhash",
         ),
         migrations.RemoveField(
-            model_name='event',
-            name='image',
+            model_name="event",
+            name="image",
         ),
     ]
diff --git a/event/migrations/0003_event_image.py b/event/migrations/0003_event_image.py
@@ -7,14 +7,20 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('images', '0001_initial'),
-        ('event', '0002_remove_event_blurhash_remove_event_image'),
+        ("images", "0001_initial"),
+        ("event", "0002_remove_event_blurhash_remove_event_image"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='event',
-            name='image',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='EventImage', to='images.image'),
+            model_name="event",
+            name="image",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="EventImage",
+                to="images.image",
+            ),
         ),
     ]
diff --git a/event/models.py b/event/models.py
@@ -23,8 +23,13 @@ class Event(models.Model):
     ocialClient = models.ForeignKey(
         OcialClient, related_name="OcialClient", on_delete=models.CASCADE
     )
-    image = models.ForeignKey(Image, related_name="EventImage", on_delete=models.CASCADE, null=True, blank=True)
-
+    image = models.ForeignKey(
+        Image,
+        related_name="EventImage",
+        on_delete=models.CASCADE,
+        null=True,
+        blank=True,
+    )
 
     def __str__(self):
         return "{}: {} | {}, {}".format(

diff --git a/event/serializers.py b/event/serializers.py
@@ -2,6 +2,7 @@
 from .models import Event, Rating, OcialClient
 from images.serializers import ImageSerializer
 
+
 class RatingSerializer(serializers.ModelSerializer):
     class Meta:
         model = Rating
@@ -25,6 +26,7 @@ class EventSerializer(serializers.ModelSerializer):
     ocialClient = OcialClientSerializer()
     imageB64 = serializers.CharField(write_only=True, required=False)
     image = ImageSerializer(read_only=True)
+
     class Meta:
         model = Event
         fields = "__all__"

diff --git a/event/views.py b/event/views.py
@@ -3,7 +3,6 @@
 from drf_spectacular.openapi import OpenApiResponse
 from rest_framework.response import Response
 from rest_framework.views import APIView
-from rest_framework.parsers import MultiPartParser, FormParser, FileUploadParser
 from .serializers import *
 from django.db.models.functions import ACos, Cos, Radians, Sin
 from django.db.models import F
@@ -126,18 +125,23 @@ def post(self, request, *args, **kwargs):
         if eventform.is_valid():
             eventform.save()
             if image:
-                format, imgstr = data.get("image").split(';base64,')
-                ext = format.split('/')[-1]
-                valid_ext = ['jpg', 'jpeg', 'png']
+                format, imgstr = data.get("image").split(";base64,")
+                ext = format.split("/")[-1]
+                valid_ext = ["jpg", "jpeg", "png"]
                 if ext not in valid_ext:
                     return Response(
                         {"error": "Formato de imagen no válido"},
                         status=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     )
-                imagefile = ContentFile(base64.b64decode(imgstr), name=f'event-{eventform.instance.id}.{ext}')
+                imagefile = ContentFile(
+                    base64.b64decode(imgstr),
+                    name=f"event-{eventform.instance.id}.{ext}",
+                )
                 image = ImageModel.objects.create(
                     image=imagefile,
-                    blurhash=blurhash.encode(Image.open(imagefile), x_components=4, y_components=3)
+                    blurhash=blurhash.encode(
+                        Image.open(imagefile), x_components=4, y_components=3
+                    ),
                 )
                 eventform.instance.image = image
                 eventform.instance.save()
@@ -250,18 +254,23 @@ def put(self, request, *args, **kwargs):
             eventUpdate.longitude = data.get("longitude")
             eventUpdate.save()
             if image:
-                format, imgstr = data.get("image").split(';base64,')
-                ext = format.split('/')[-1]
-                valid_ext = ['jpg', 'jpeg', 'png']
+                format, imgstr = data.get("image").split(";base64,")
+                ext = format.split("/")[-1]
+                valid_ext = ["jpg", "jpeg", "png"]
                 if ext not in valid_ext:
                     return Response(
                         {"error": "Formato de imagen no válido"},
                         status=status.HTTP_422_UNPROCESSABLE_ENTITY,
                     )
-                imagefile = ContentFile(base64.b64decode(imgstr), name=f'event-{eventUpdate.instance.id}.{ext}')
+                imagefile = ContentFile(
+                    base64.b64decode(imgstr),
+                    name=f"event-{eventUpdate.instance.id}.{ext}",
+                )
                 image = ImageModel.objects.create(
                     image=imagefile,
-                    blurhash=blurhash.encode(Image.open(imagefile), x_components=4, y_components=3)
+                    blurhash=blurhash.encode(
+                        Image.open(imagefile), x_components=4, y_components=3
+                    ),
                 )
                 eventUpdate.instance.image = image
                 eventUpdate.instance.save()

diff --git a/images/apps.py b/images/apps.py
@@ -2,5 +2,5 @@
 
 
 class ImagesConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'images'
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "images"
diff --git a/images/migrations/0001_initial.py b/images/migrations/0001_initial.py
@@ -7,16 +7,15 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Image',
+            name="Image",
             fields=[
-                ('id', models.AutoField(primary_key=True, serialize=False)),
-                ('image', models.ImageField(upload_to='media/')),
-                ('blurhash', models.TextField()),
+                ("id", models.AutoField(primary_key=True, serialize=False)),
+                ("image", models.ImageField(upload_to="media/")),
+                ("blurhash", models.TextField()),
             ],
         ),
     ]
diff --git a/images/serializers.py b/images/serializers.py
@@ -5,4 +5,4 @@
 class ImageSerializer(serializers.ModelSerializer):
     class Meta:
         model = Image
-        fields = "__all__"
+        fields = "__all__"
diff --git a/images/tests.py b/images/tests.py
@@ -1,3 +1,2 @@
-from django.test import TestCase
 
 # Create your tests here.
diff --git a/images/views.py b/images/views.py
@@ -1,3 +1,2 @@
-from django.shortcuts import render
 
 # Create your views here.
diff --git a/ocial/models.py b/ocial/models.py
@@ -20,4 +20,3 @@ class TypeClient(Enum):
 class AuthProvider(Enum):
     EMAIL = "email"
     GOOGLE = "google"
-
diff --git a/ocial/settings.py b/ocial/settings.py
@@ -55,7 +55,7 @@
     "chat",
     "drf_spectacular",
     "rest_framework.authtoken",
-    "images"
+    "images",
 ]
 
 STATIC_URL = "/static/"
@@ -161,7 +161,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
 
 MEDIA_URL = "/media/"
 

diff --git a/ocial/urls.py b/ocial/urls.py
@@ -41,4 +41,6 @@
     ),
 ]
 
-urlpatterns = urlpatterns + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+urlpatterns = urlpatterns + static(
+    settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
+)
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		from django.test import TestCase

		# Create your tests here.
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		from django.shortcuts import render

		# Create your views here.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ class TypeClient(Enum):
		class AuthProvider(Enum):
		EMAIL = "email"
		GOOGLE = "google"