Fixed linting in project

Author: DylanCa

yaus/settings.py

@@ -38,9 +38,8 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "rest_framework",
-    'drf_yasg',
-
-    "yaus"
+    "drf_yasg",
+    "yaus",
 ]
 
 MIDDLEWARE = [
@@ -127,10 +126,10 @@
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 REST_FRAMEWORK = {
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
-    'PAGE_SIZE': 10,
-    'DEFAULT_RENDERER_CLASSES': [
-        'rest_framework.renderers.JSONRenderer',
-        'rest_framework.renderers.BrowsableAPIRenderer',
-    ]
+    "DEFAULT_PAGINATION_CLASS": "rest_framework.pagination.PageNumberPagination",
+    "PAGE_SIZE": 10,
+    "DEFAULT_RENDERER_CLASSES": [
+        "rest_framework.renderers.JSONRenderer",
+        "rest_framework.renderers.BrowsableAPIRenderer",
+    ],
 }

yaus/shortener/models/shortlink.py

@@ -10,8 +10,8 @@
 
 class ShortLink(models.Model):
     original_url = models.CharField(max_length=512)
-    passcode = models.CharField(max_length=64, blank=True, default='')
-    salt = models.CharField(max_length=64, blank=True, default='')
+    passcode = models.CharField(max_length=64, blank=True, default="")
+    salt = models.CharField(max_length=64, blank=True, default="")
     redirect_string = models.CharField(max_length=8)
     usage_count = models.IntegerField(default=0)
 

yaus/shortener/serializers/serializers.py

@@ -5,10 +5,10 @@
 class UserSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = User
-        fields = ['url', 'username', 'email', 'groups']
+        fields = ["url", "username", "email", "groups"]
 
 
 class GroupSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Group
-        fields = ['url', 'name']
+        fields = ["url", "name"]

yaus/shortener/serializers/shortlink_serializer.py

@@ -12,8 +12,15 @@ class ShortLinkSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ShortLink
-        fields = ['id', 'original_url', 'passcode', 'redirect_string', 'owner', 'usage_count']
-        read_only_fields = ['id', 'redirect_string', 'usage_count']
+        fields = [
+            "id",
+            "original_url",
+            "passcode",
+            "redirect_string",
+            "owner",
+            "usage_count",
+        ]
+        read_only_fields = ["id", "redirect_string", "usage_count"]
 
     def validate(self, attrs):
         user = self.context["request"].user
@@ -24,7 +31,7 @@ def validate(self, attrs):
 
     def create(self, validated_data):
         shortlink = ShortLink(**validated_data)
-        if validated_data.get('passcode'):
+        if validated_data.get("passcode"):
             shortlink.encode_fields()
         shortlink.redirect_string = Utils.generate_redirect_string()
         shortlink.save()

yaus/shortener/views/redirect_viewset.py

@@ -15,27 +15,29 @@ class RedirectViewSet(GenericViewSet):
         method="GET",
         manual_parameters=[
             openapi.Parameter(
-                'passcode',
+                "passcode",
                 openapi.IN_QUERY,
                 type=openapi.TYPE_STRING,
             )
         ],
     )
-    @api_view(['GET'])
+    @api_view(["GET"])
     @renderer_classes([JSONRenderer])
     def redirect_to(self, redirect_string):
         shortlink = ShortLink.objects.filter(redirect_string=redirect_string).first()
         if shortlink is None:
             return Response({}, status=status.HTTP_404_NOT_FOUND)
 
-        if shortlink.passcode is '':
+        if shortlink.passcode is "":
             shortlink.increase_usage_count()
-            return Response({'url': shortlink.original_url}, status=status.HTTP_200_OK)
+            return Response({"url": shortlink.original_url}, status=status.HTTP_200_OK)
 
-        passcode = self.query_params.get('passcode')
+        passcode = self.query_params.get("passcode")
         if shortlink.passcode and passcode is None:
-            return Response({'error': 'No passcode provided'}, status=status.HTTP_400_BAD_REQUEST)
+            return Response(
+                {"error": "No passcode provided"}, status=status.HTTP_400_BAD_REQUEST
+            )
 
         original_url = shortlink.decode_url(passcode)
         shortlink.increase_usage_count()
-        return Response({'url': original_url}, status=status.HTTP_200_OK)
+        return Response({"url": original_url}, status=status.HTTP_200_OK)

yaus/shortener/views/shortlink_viewset.py

@@ -1,15 +1,24 @@
 from rest_framework import viewsets
-from rest_framework.mixins import CreateModelMixin, RetrieveModelMixin, ListModelMixin, DestroyModelMixin
+from rest_framework.mixins import (
+    CreateModelMixin,
+    RetrieveModelMixin,
+    ListModelMixin,
+    DestroyModelMixin,
+)
 
 from yaus.shortener.models.shortlink import ShortLink
 from yaus.shortener.serializers.shortlink_serializer import ShortLinkSerializer
 
 
-class ShortlinkViewSet(viewsets.GenericViewSet, CreateModelMixin, ListModelMixin, DestroyModelMixin):
+class ShortlinkViewSet(
+    viewsets.GenericViewSet, CreateModelMixin, ListModelMixin, DestroyModelMixin
+):
     queryset = ShortLink.objects.all()
     serializer_class = ShortLinkSerializer
 
     def get_queryset(self):
         if self.request.user.is_authenticated:
-            return ShortLink.objects.filter(owner=self.request.user, deleted_at__isnull=True).order_by("id")
+            return ShortLink.objects.filter(
+                owner=self.request.user, deleted_at__isnull=True
+            ).order_by("id")
         return []

yaus/shortener/views/views.py

@@ -7,7 +7,8 @@ class UserViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows users to be viewed or edited.
     """
-    queryset = User.objects.all().order_by('-date_joined')
+
+    queryset = User.objects.all().order_by("-date_joined")
     serializer_class = UserSerializer
     permission_classes = [permissions.AllowAny]
 
@@ -19,6 +20,7 @@ class GroupViewSet(viewsets.ModelViewSet):
     """
     API endpoint that allows groups to be viewed or edited.
     """
-    queryset = Group.objects.all().order_by('name')
+
+    queryset = Group.objects.all().order_by("name")
     serializer_class = GroupSerializer
     permission_classes = [permissions.IsAuthenticated]

yaus/urls.py

@@ -8,26 +8,34 @@
 schema_view = get_schema_view(
     openapi.Info(
         title="Snippets API",
-        default_version='v1',
+        default_version="v1",
         description="Test description",
         terms_of_service="https://www.google.com/policies/terms/",
         contact=openapi.Contact(email="[email protected]"),
         license=openapi.License(name="BSD License"),
     ),
     public=True,
-    permission_classes=([permissions.AllowAny,]),
+    permission_classes=(
+        [
+            permissions.AllowAny,
+        ]
+    ),
 )
 
 
 router = routers.DefaultRouter()
-router.register(r'users', views.UserViewSet)
-router.register(r'shortener', views.ShortlinkViewSet)
+router.register(r"users", views.UserViewSet)
+router.register(r"shortener", views.ShortlinkViewSet)
 
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    path('', include(router.urls)),
-    path('api-auth/', include('rest_framework.urls', namespace='rest_framework')),
-    path('r/<slug:redirect_string>', views.RedirectViewSet.redirect_to)
-]
+    path(
+        "swagger/",
+        schema_view.with_ui("swagger", cache_timeout=0),
+        name="schema-swagger-ui",
+    ),
+    path("", include(router.urls)),
+    path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
+    path("r/<slug:redirect_string>", views.RedirectViewSet.redirect_to),
+]