From 9bcb99dd30f31e7a605ad457372d923071bdca1b Mon Sep 17 00:00:00 2001
From: Corban-Lee Jones <corbz.jones@gmail.com>
Date: Mon, 23 Sep 2024 23:10:48 +0100
Subject: [PATCH] class based view

---
 apps/home/urls.py  |   4 +-
 apps/home/views.py | 121 +++++++++++++++++++++++----------------------
 2 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/apps/home/urls.py b/apps/home/urls.py
index 5476f11..3b12342 100644
--- a/apps/home/urls.py
+++ b/apps/home/urls.py
@@ -3,10 +3,10 @@
 from django.urls import path
 from django.contrib.auth.decorators import login_required
 
-from .views import IndexView, guilds
+from .views import IndexView, GuildsView
 
 urlpatterns = [
     path("", login_required(IndexView.as_view()), name="index"),
 
-    path("user-guilds", guilds, name="user-guilds")
+    path("user-guilds", GuildsView.as_view(), name="user-guilds")
 ]
diff --git a/apps/home/views.py b/apps/home/views.py
index 0f35a43..8763371 100644
--- a/apps/home/views.py
+++ b/apps/home/views.py
@@ -7,7 +7,7 @@ from django.utils import timezone
 from asgiref.sync import sync_to_async
 from django.shortcuts import redirect
 from django.http import JsonResponse, HttpResponse
-from django.views.generic import TemplateView
+from django.views.generic import TemplateView, View
 
 from apps.home.models import r_Server
 from apps.authentication.models import DiscordUser, ServerMember
@@ -21,71 +21,74 @@ class IndexView(TemplateView):
     template_name = "home/index.html"
 
 
-@sync_to_async
-def get_user_access_token(user: DiscordUser) -> str:
-    return user.access_token
+class GuildsView(View):
 
-@sync_to_async
-def is_user_authenticated(user: DiscordUser) -> bool:
-    return user.is_authenticated
+    async def get(self, request, *args, **kwargs):
+        if not await self.is_user_authenticated(request.user):
+            return redirect("/oauth2/login")
 
-async def delete_server(server_id: int):
-    # member will be auto deleted via CASCADE, so no need to handle that
+        access_token = await self.get_user_access_token(request.user)
 
-    try:
-        server = await r_Server.objects.aget(id=server_id)
-        await server.adelete()
-    except r_Server.DoesNotExist:
-        pass
-
-async def setup_server(user: DiscordUser, data: dict) -> dict | None:
-    is_owner = data["owner"]
-    permissions = data["permissions"]
-    admin_perm = 1 << 3
-
-    # Ignore servers where the user isn't an administrator or owner
-    if not ((int(permissions) & admin_perm) == admin_perm or is_owner):
-        await delete_server(data["id"])
-        return
-
-    server = await r_Server.objects.aget_or_create(
-        id=data["id"],
-        name=data["name"],
-        icon_hash=data["icon"]
-    )
- 
-    await ServerMember.objects.aupdate_or_create(
-        user=user,
-        server=server[0],
-        defaults={
-            "permissions": permissions,
-            "is_owner": is_owner
-        }
-    )
-
-    return data
+        async with httpx.AsyncClient() as client:
+            response = await client.get(
+                url=f"{settings.DISCORD_API_URL}/users/@me/guilds",
+                headers={"Authorization": f"Bearer {access_token}"}
+            )
+            guild_data = response.json()
 
 
-async def guilds(request):
-    if not await is_user_authenticated(request.user):
-        return redirect("/oauth2/login")
+        # guilds where the user either administrates or owns
+        cleaned_guild_data = []
 
-    access_token = await get_user_access_token(request.user)
+        for item in guild_data:
+            cleaned_data = await self.setup_server(request.user, item)
+            if cleaned_data:
+                cleaned_guild_data.append(cleaned_data)
 
-    async with httpx.AsyncClient() as client:
-        response = await client.get(
-            url=f"{settings.DISCORD_API_URL}/users/@me/guilds",
-            headers={"Authorization": f"Bearer {access_token}"}
+        return JsonResponse(cleaned_guild_data, safe=False)
+
+
+    @staticmethod
+    @sync_to_async
+    def get_user_access_token(user: DiscordUser) -> str:
+        return user.access_token
+
+    @staticmethod
+    @sync_to_async
+    def is_user_authenticated(user: DiscordUser) -> bool:
+        return user.is_authenticated
+
+    async def setup_server(self, user: DiscordUser, data: dict):
+        is_owner = data["owner"]
+        permissions = data["permissions"]
+        admin_perm = 1 << 3
+
+        # Ignore servers where the user isn't an administrator or owner
+        if not ((int(permissions) & admin_perm) == admin_perm or is_owner):
+            await self.delete_member(user, data["id"])
+            return
+
+        server = await r_Server.objects.aget_or_create(
+            id=data["id"],
+            name=data["name"],
+            icon_hash=data["icon"]
+        )
+    
+        await ServerMember.objects.aupdate_or_create(
+            user=user,
+            server=server[0],
+            defaults={
+                "permissions": permissions,
+                "is_owner": is_owner
+            }
         )
-        guild_data = response.json()
 
-    # guilds where the user either administrates or owns
-    cleaned_guild_data = []
+        return data
 
-    for item in guild_data:
-        cleaned_data = await setup_server(request.user, item)
-        if cleaned_data:
-            cleaned_guild_data.append(cleaned_data)
-
-
-    return JsonResponse(guild_data, safe=False)
\ No newline at end of file
+    @staticmethod
+    async def delete_member(user: DiscordUser, server_id: int):
+        try:
+            member = await ServerMember.objects.aget(user=user, server_id=server_id)
+            await member.adelete()
+        except ServerMember.DoesNotExist:
+            pass