Expanded actions for friends to allow for invitations to games, invitations to tournaments

src/chigame/users/models.py

@@ -7,7 +7,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from chigame.users.managers import UserManager
-
+from chigame.games.models import Match, Tournament
 
 class User(AbstractUser):
     """
@@ -91,7 +91,26 @@ class GroupInvitation(models.Model):
     accepted = models.BooleanField(default=False)
     timestamp = models.DateTimeField(auto_now_add=True)
 
+class GameInvitation(models.Model):
+    """
+    An invitation to join a match of a game
+    """
+    sender = models.ForeignKey(User, on_delete=models.CASCADE, related_name='game_invitations_sent')
+    receiver = models.ForeignKey(User, on_delete=models.CASCADE, related_name='game_invitations_received')
+    match = models.ForeignKey(Match, on_delete=models.CASCADE)
+    accepted = models.BooleanField(default=False)
+    timestamp = models.DateTimeField(auto_now_add=True)
 
+class TournamentInvitation(models.Model):
+    """
+    An invitation to join a tournament
+    """
+    sender = models.ForeignKey(User, on_delete=models.CASCADE, related_name='tournament_invitations_sent')
+    receiver = models.ForeignKey(User, on_delete=models.CASCADE, related_name='tournament_invitations_received')
+    tournament = models.ForeignKey(Tournament, on_delete=models.CASCADE)  
+    accepted = models.BooleanField(default=False)
+    timestamp = models.DateTimeField(auto_now_add=True)
+
 class NotificationQuerySet(models.QuerySet):
     def filter_by_actor(self, actor, **kwargs):
         try:

src/chigame/users/urls.py

@@ -3,6 +3,9 @@
 from chigame.users.views import (
     cancel_friend_invitation,
     send_friend_invitation,
+    remove_friend,
+    invite_to_game,
+    invite_to_tournament,
     user_detail_view,
     user_profile_detail_view,
     user_redirect_view,
@@ -19,5 +22,8 @@
     path("profile/<int:pk>/", view=user_profile_detail_view, name="user-profile"),
     path("add_friend/<int:pk>", view=send_friend_invitation, name="add-friend"),
     path("cancel_friend_invitation/<int:pk>", view=cancel_friend_invitation, name="cancel-friend-invitation"),
+    path("remove_friend/<int:pk>", view=remove_friend, name="remove-friend"),
+    path("invite_to_game/<int:pk>", view=invite_to_game, name="invite-to-game"),
+    path("invite_to_tournament/<int:pk>", view=invite_to_tournament, name="invite-to-tournament"),
     path("user-list/", views.user_list, name="user_list"),
 ]

src/chigame/users/views.py

@@ -8,7 +8,7 @@
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, RedirectView, UpdateView
 
-from .models import FriendInvitation, Notification, UserProfile
+from .models import FriendInvitation, Notification, UserProfile, GameInvitation, TournamentInvitation
 
 User = get_user_model()
 
@@ -120,3 +120,31 @@ def cancel_friend_invitation(request, pk):
     else:
         messages.error(request, "Something went wrong please try again later!")
     return redirect(reverse("users:user-profile", kwargs={"pk": request.user.pk}))
+
+
+@login_required
+def remove_friend(request, pk):
+    sender = User.objects.get(pk=request.user.id)
+    receiver = User.objects.get(pk=pk)
+    sender_profile = sender.profile
+    sender_profile.friends.remove(receiver)
+    messages.success(request, "Friend removed successfully.")
+    return redirect(reverse("users:user-profile", kwargs={"pk": request.user.pk}))
+
+@login_required
+def invite_to_game(request, pk, match_id):
+    sender = User.objects.get(pk=request.user.id)
+    receiver = User.objects.get(pk=pk)
+    match = User.objects.get(pk=match_id)  
+    GameInvitation.objects.create(sender=sender, receiver=receiver, group=group, match=match)
+    messages.success(request, "Invitation to game sent successfully.")
+    return redirect(reverse("users:user-profile", kwargs={"pk": request.user.pk}))
+
+@login_required
+def invite_to_tournament(request, pk, tournament_id):
+    sender = User.objects.get(pk=request.user.id)
+    receiver = User.objects.get(pk=pk)
+    tournament = User.objects.get(pk=tournament_id) 
+    TournamentInvitation.objects.create(sender=sender, receiver=receiver, tournament=tournament)
+    messages.success(request, "Invitation to tournament sent successfully.")
+    return redirect(reverse("users:user-profile", kwargs={"pk": request.user.pk}))