profiles: friends reworked

profiles/models/FriendModel.py

@@ -1,7 +1,8 @@
-from django.contrib.auth.models import User
 from django.db import models
 
+from . import ProfileModel
+
 
 class FriendModel(models.Model):
-    friend1 = models.ForeignKey(User, on_delete=models.CASCADE, related_name='friend1')
-    friend2 = models.ForeignKey(User, on_delete=models.CASCADE, related_name='friend2')
+    friend1 = models.ForeignKey(ProfileModel.ProfileModel, on_delete=models.CASCADE, related_name='friend1')
+    friend2 = models.ForeignKey(ProfileModel.ProfileModel, on_delete=models.CASCADE, related_name='friend2')

profiles/models/ProfileModel.py

@@ -1,21 +1,22 @@
+from __future__ import annotations
 from os.path import splitext
 
 from django.contrib.auth.models import User
-from django.db import models
+from django.db.models import Q, Model, CASCADE, ForeignKey, ImageField
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch import receiver
 
 from games.consumers import game_manager
-from ..models.FriendModel import FriendModel
+from . import FriendModel
 
 
 def upload_to(instance, filename: str):
     return f"./profiles/static/avatars/{instance.pk}{splitext(filename)[1]}"
 
 
-class ProfileModel(models.Model):
-    user = models.ForeignKey(User, on_delete=models.CASCADE)
-    avatar = models.ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif")
+class ProfileModel(Model):
+    user = ForeignKey(User, on_delete=CASCADE)
+    avatar = ImageField(upload_to=upload_to, default="./profiles/static/avatars/default.avif")
 
     def get_game(self) -> int:
         for game in game_manager._game_list:
@@ -24,20 +25,23 @@ class ProfileModel(models.Model):
                     return game.game_id
         return None
 
-    def getFriends(self):
-        friends = []
+    def get_friends(self) -> list[ProfileModel]:
+        friends: list[ProfileModel] = []
 
-        for friendship in FriendModel.objects.filter(models.Q(friend1=self.user) | models.Q(friend2=self.user)):
-            friends.append(friendship.friend1 if friendship.friend1 != self.user else friendship.friend2)
+        for friendship in FriendModel.FriendModel.objects.filter(Q(friend1=self) | Q(friend2=self)):
+            friends.append(friendship.friend1 if friendship.friend1 != self else friendship.friend2)
 
         return friends
 
-    def isFriend(self, user):
-        return user in self.getFriends()
+    def is_friend(self, friend):
+        return friend in self.get_friends()
 
-    def deleteFriend(self, user):
-        for friendship in FriendModel.objects.filter(models.Q(friend1=self.user) | models.Q(friend2=self.user)):
-            friendship.delete()
+    def delete_friend(self, friend):
+        print(friend)
+        FriendModel.FriendModel.objects.get(
+            (Q(friend1=self) & Q(friend2=friend)) |
+            (Q(friend2=self) & Q(friend1=friend))
+        ).delete()
 
 
 @receiver(pre_delete, sender=ProfileModel)