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

ishiii-s · 2023-11-13T21:54:22Z

This PR involves removing friends, inviting them to games, and inviting them to tournaments. These functionalities would only be accessible if a user is logged in. Next steps would be to create functionality to accept/decline these requests, and incorporate the notification framework.

…emanet

AndrewM131 · 2023-11-14T21:02:18Z

When I try to run your code using "python3 manage.py runserver", I get the following error "ImportError: cannot import name 'Group' from partially initialized module 'chigame.users.models' (most likely due to a circular import) (/root/chigame/src/chigame/users/models.py)"
From what I understand, this is when "Circular imports can occur when two or more modules mutually depend on each other." You'll have to fix this in order for the code to be properly reviewed, and this may also be the cause of failing the checks.

AndrewM131

Make sure you address the circular import issue, and pass the checks.

AndrewM131 · 2023-11-14T21:09:49Z

src/chigame/users/views.py

+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)  


when defining match, I think you defined it incorrectly, and it should be Match.objects instead of User.objects, as the User model doesn't have a match_id

AndrewM131 · 2023-11-14T21:10:21Z

src/chigame/users/views.py

+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) 


Same thing here where it should be Tournament.obkects instead of User.objects , as the User model doesn't have a tournament_id

AndrewM131 · 2023-11-14T21:18:23Z

src/chigame/users/views.py

+    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)


When did you define group in the function? Currently it isn't defined, and may be why you aren't passing the checks.

ishiii-s · 2023-11-30T02:42:23Z

Reviewed change requests and modified code in views.py accordingly to properly define match and tournament. Also made changes to imports in models.py to account for circular dependencies.

AndrewM131

I left a few comments, but overall the invitation to game and invitation to tournaments work perfectly, it's really awesome.
One comment:
-When a tournament has ended, it shouldn't give the option to join or withdraw the tournament

AndrewM131 · 2023-12-03T04:18:23Z

src/chigame/users/views.py

-            actor=invitation, receiver=other_user, type=Notification.FRIEND_REQUEST
+            actor=invitation,
+            receiver=other_user,
+            type=Notification.FRIEND_REQUEST,


I like that you made the style cleaner and more readable

AndrewM131 · 2023-12-03T04:28:28Z

src/chigame/api/tests/factories.py

    description = Faker("text")
    rules = Faker("text")
    draw_rules = Faker("text")
+    num_winner = Faker("pyint", min_value=1, max_value=1000)


When creating a new tournament, the website view field is called "Num winner," you should have a better name for it so it's a bit clearer what you're asking when creating the tournament. It's a good name for coding, but it should be changed for the user view on the website.

I don't think these are changes handled by us. The only files we changed are src/chigame/urls.py, src/chigame/models.py, and src/chigame/views.py.

AndrewM131 · 2023-12-03T04:29:44Z

src/chigame/games/models.py

    max_players = models.PositiveIntegerField()
    description = models.TextField()  # not limited to 255 characters
    rules = models.TextField()  # not limited to 255 characters
    draw_rules = models.TextField()  # not limited to 255 characters
+    num_winner = models.PositiveIntegerField(default=1)  # number of possible winners for the tournament


Good style that it has a default of 1 for better user usability

AndrewM131 · 2023-12-03T04:30:36Z

src/chigame/games/models.py

+        else:  # the tournament has ended
+            return "tournament ended"
+
+    def clean(self):  # restriction


Good error checking!

ishiii-s · 2023-12-03T20:07:13Z

Update: Rishabh removed "remove friend" functionality due to that now being addressed in a separate PR/Issue. Merge conflicts have been resolved and checks have passed.

AndrewM131

Clarification was given over slack that num winner and the buttons for join and withdraw are not incorporated in this PR and deals with tournaments. The code LGTM!

elizabethli31

Nice addition for invitations, but there are some errors in the views and urls. Please test with a match and tournament instance

elizabethli31 · 2023-12-06T01:06:35Z

src/chigame/users/urls.py

@@ -31,8 +32,10 @@
    path("add_friend/<int:pk>", view=send_friend_invitation, name="add-friend"),
    path("remove_friend/<int:pk>", view=remove_friend, name="remove-friend"),
    path("cancel_friend_invitation/<int:pk>", view=cancel_friend_invitation, name="cancel-friend-invitation"),
+    path("invite_to_game/<int:pk>", view=invite_to_game, name="invite-to-game"),


I don't think these urls are correct because they don't have the pk for the match which is needed for the view

elizabethli31 · 2023-12-06T01:07:28Z

src/chigame/users/views.py

@@ -185,6 +185,25 @@ def cancel_friend_invitation(request, 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)


Everything should be in a try statement because there is no error handling for if the receiver or match don't exist. Same goes for tournament

henrietta-k · 2023-12-06T21:58:13Z

Update: got rid of GameInvitation but kept TournamentInvitation. Tested it and the URL works as expected.

elizabethli31

A few minor changes, but generally looks good!

elizabethli31 · 2023-12-07T06:05:34Z

src/chigame/users/views.py

@@ -185,6 +185,18 @@ def cancel_friend_invitation(request, pk):


 @login_required
+def invite_to_tournament(request, pk, tournament_pk):
+    try:
+        sender = get_object_or_404(User, pk=request.user.id)


Need to do one more check where sender and receiver are not the same. You shouldn't be able to send an invite to yourself.

elizabethli31 · 2023-12-07T06:07:37Z

src/chigame/users/views.py

+        sender = get_object_or_404(User, pk=request.user.id)
+        receiver = get_object_or_404(User, pk=pk)
+        tournament = get_object_or_404(Tournament, pk=tournament_pk)
+        TournamentInvitation.objects.create(sender=sender, receiver=receiver, tournament=tournament)


Along with the check on user id, the invitation object should only be created if that check succeeds.

ishiii-s added 3 commits November 12, 2023 20:28

Update urls.py for remove, tournament, and game paths

cd62f2f

Wrote invitation classes for match and tournament

c75d6aa

Wrote functions to remove friend, invite to game, and invite to tourn…

aa4bf56

…emanet

ishiii-s added the x/user-profiles-friending label Nov 13, 2023

ishiii-s added this to the 2023/Sprint 2 milestone Nov 13, 2023

ishiii-s requested review from elizabethli31 and AndrewM131 November 13, 2023 21:54

ishiii-s assigned ishiii-s and henrietta-k Nov 13, 2023

AndrewM131 linked an issue Nov 13, 2023 that may be closed by this pull request

Actions for friends -> invite to game and tournaments #194

Open

AndrewM131 requested changes Nov 14, 2023

View reviewed changes

ishiii-s added 2 commits November 29, 2023 20:36

Update Tournament and Match definitions in views.py

1b4bf2d

Update models.py to deal with circular dependencies

68266dc

ishiii-s requested a review from AndrewM131 November 30, 2023 02:40

ishiii-s added 3 commits November 30, 2023 16:14

Merge branch 'dev' into users/friends-actions

c484edb

Update models.py to try to fix circular imports

b485e33

Attempt to fix error for invalid model reference

a45bf4b

24raniwalar self-assigned this Dec 3, 2023

24raniwalar added 3 commits December 2, 2023 20:32

Remove remove friend functionality

418205c

Forgot to remove url

bb34f6e

Needed to migrate

f7bc774

AndrewM131 requested changes Dec 3, 2023

View reviewed changes

ishiii-s and others added 3 commits December 3, 2023 14:08

Merge branch 'dev' into users/friends-actions

26278aa

Fix resulting errors from resolve merge conflicts urls.py

a4b7378

Merge branch 'dev' into users/friends-actions

56fe98c

AndrewM131 self-requested a review December 5, 2023 06:14

AndrewM131 approved these changes Dec 5, 2023

View reviewed changes

ishiii-s changed the title ~~Expanded actions for friends to allow for removing friends, invitations to games, invitations to tournaments~~ Expanded actions for friends to allow for invitations to games, invitations to tournaments Dec 5, 2023

Henrietta Ko added 5 commits December 5, 2023 17:31

fixed merge conflicts

6fa6bfa

fixed linting issues

6b34dec

fixed pytest issues

5cedea3

fixed merge

2469b37

fixed lint

a330f31

elizabethli31 requested changes Dec 6, 2023

View reviewed changes

Henrietta Ko added 4 commits December 5, 2023 19:22

added try/except and pk to url

60c3102

Merge branch 'dev' into users/friends-actions

b6dc528

fixed pk

5e0476e

working tournament invite now

55ead9c

henrietta-k force-pushed the users/friends-actions branch from c3e2906 to 55ead9c Compare December 6, 2023 21:56

henrietta-k requested a review from elizabethli31 December 6, 2023 21:57

Henrietta Ko added 2 commits December 6, 2023 16:00

Merge branch 'dev' into users/friends-actions

a1e9f5e

fixed accidentally modified url path

5849ec5

elizabethli31 requested changes Dec 7, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

ishiii-s commented Nov 13, 2023

AndrewM131 commented Nov 14, 2023

AndrewM131 left a comment

AndrewM131 Nov 14, 2023

AndrewM131 Nov 14, 2023

AndrewM131 Nov 14, 2023

ishiii-s commented Nov 30, 2023

AndrewM131 left a comment •

edited

AndrewM131 Dec 3, 2023

AndrewM131 Dec 3, 2023

ishiii-s Dec 5, 2023

AndrewM131 Dec 3, 2023

AndrewM131 Dec 3, 2023

ishiii-s commented Dec 3, 2023 •

edited

AndrewM131 left a comment

elizabethli31 left a comment

elizabethli31 Dec 6, 2023

elizabethli31 Dec 6, 2023

henrietta-k commented Dec 6, 2023 •

edited

elizabethli31 left a comment

elizabethli31 Dec 7, 2023

elizabethli31 Dec 7, 2023

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

Are you sure you want to change the base?

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

Conversation

ishiii-s commented Nov 13, 2023

AndrewM131 commented Nov 14, 2023

AndrewM131 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishiii-s commented Nov 30, 2023

AndrewM131 left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ishiii-s commented Dec 3, 2023 • edited

AndrewM131 left a comment

Choose a reason for hiding this comment

elizabethli31 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

henrietta-k commented Dec 6, 2023 • edited

elizabethli31 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

AndrewM131 left a comment •

edited

ishiii-s commented Dec 3, 2023 •

edited

henrietta-k commented Dec 6, 2023 •

edited