profiles: rearranged models

This commit is contained in:
AdrienLSH 2024-04-16 13:24:34 +02:00
parent 26fa52b136
commit 0f9a4d1690
11 changed files with 48 additions and 33 deletions

View File

@ -2,7 +2,7 @@ from rest_framework import serializers
from django.utils.translation import gettext as _
from profiles.models.ProfileModel import ProfileModel
from profiles.models import ProfileModel
from .models import ChatChannelModel, ChatMessageModel

View File

@ -1,12 +1,9 @@
from django.contrib import admin
from .models.BlockModel import BlockModel
from .models.FriendModel import FriendModel
# from .models.FriendRequestModel import FriendRequestModel
from .models.ProfileModel import ProfileModel
from .models import ProfileModel, FriendModel, FriendRequestModel, BlockModel
# Register your models here.
admin.site.register(ProfileModel)
admin.site.register(BlockModel)
admin.site.register(FriendModel)
# admin.site.register(AskFriendModel)
admin.site.register(FriendRequestModel)

View File

@ -7,7 +7,6 @@ from django.db.models.signals import post_save, pre_delete
from django.dispatch import receiver
from games.consumers import game_manager
from . import FriendModel
def upload_to(instance, filename: str):
@ -28,21 +27,38 @@ class ProfileModel(Model):
def get_friends(self) -> list[ProfileModel]:
friends: list[ProfileModel] = []
for friendship in FriendModel.FriendModel.objects.filter(Q(friend1=self) | Q(friend2=self)):
for friendship in FriendModel.objects.filter(Q(friend1=self) | Q(friend2=self)):
friends.append(friendship.friend1 if friendship.friend1 != self else friendship.friend2)
return friends
def is_friend(self, friend):
return friend in self.get_friends()
return FriendModel.objects.filter(
(Q(friend1=self) & Q(friend2=friend)) |
(Q(friend2=self) & Q(friend1=friend))
).exists()
def delete_friend(self, friend):
print(friend)
FriendModel.FriendModel.objects.get(
FriendModel.objects.get(
(Q(friend1=self) & Q(friend2=friend)) |
(Q(friend2=self) & Q(friend1=friend))
).delete()
def is_friend_requested_by(self, profile):
return self.get_received_friend_request_from(profile) is None
def get_received_friend_request_from(self, profile):
return FriendRequestModel.objects.filter(author=profile, target=self).first()
def is_friend_requesting(self, profile):
return FriendRequestModel.objects.filter(author=self, target=profile).exists()
def get_sent_friend_requests(self) -> list[ProfileModel]:
return FriendRequestModel.objects.filter(author=self)
def get_received_friend_requests(self) -> list[ProfileModel]:
return FriendRequestModel.objects.filter(target=self)
@receiver(pre_delete, sender=ProfileModel)
def delete_profile_picture(sender, instance, **kwargs):
@ -55,3 +71,22 @@ def on_user_created(sender, instance, created, **kwargs):
if created:
profile: ProfileModel = ProfileModel.objects.create(pk=instance.pk, user=instance)
profile.save()
class FriendModel(Model):
friend1 = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='friend1')
friend2 = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='friend2')
class FriendRequestModel(Model):
author = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='author')
target = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='target')
def accept(self):
FriendModel(friend1=self.author, friend2=self.target).save()
self.delete()
class BlockModel(Model):
blocker = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='blocker')
blocked = ForeignKey(ProfileModel, on_delete=CASCADE, related_name='blocked')

View File

@ -1,7 +0,0 @@
from django.db import models
from django.contrib.auth.models import User
class BlockModel(models.Model):
blocker = models.ForeignKey(User, on_delete=models.CASCADE, related_name='blocker')
blocked = models.ForeignKey(User, on_delete=models.CASCADE, related_name='blocked')

View File

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

View File

@ -3,7 +3,7 @@ from django.utils.translation import gettext as _
from rest_framework import serializers
from ..models.ProfileModel import ProfileModel
from ..models import ProfileModel
class ProfileSerializer(serializers.ModelSerializer):

View File

@ -7,8 +7,7 @@ from rest_framework.request import Request
from django.contrib.auth.models import User
from django.utils.translation import gettext as _
from ..models.BlockModel import BlockModel
from ..models.ProfileModel import ProfileModel
from ..models import BlockModel, ProfileModel
from ..serializers.ProfileSerializer import ProfileSerializer

View File

@ -7,8 +7,7 @@ from django.utils.translation import gettext as _
from django.db.models import Q
from django.shortcuts import get_object_or_404
from ..models.FriendModel import FriendModel
from ..models.ProfileModel import ProfileModel
from ..models import ProfileModel, FriendModel
from ..serializers.ProfileSerializer import ProfileSerializer

View File

@ -4,7 +4,7 @@ from rest_framework.response import Response
from rest_framework.authentication import SessionAuthentication
from ..serializers.ProfileSerializer import ProfileSerializer
from ..models.ProfileModel import ProfileModel
from ..models import ProfileModel
class MyProfileViewSet(viewsets.ModelViewSet):

View File

@ -6,7 +6,7 @@ from rest_framework import viewsets
from rest_framework.response import Response
from ..serializers.ProfileSerializer import ProfileSerializer
from ..models.ProfileModel import ProfileModel
from ..models import ProfileModel
class ProfileViewSet(viewsets.ModelViewSet):