dm1sh/komap_backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add game list done filter

Browse Source
This commit is contained in:
TUTOR03 2020-11-29 02:23:53 +05:00
parent 91802c9ce1
commit 8a778be4d2
4 changed files with 72 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/Ugra_hackaton/settings.py
View File

@ -125,15 +125,15 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/3.1/topics/i18n/ # https://docs.djangoproject.com/en/3.1/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'ru-RU'
TIME_ZONE = 'UTC' TIME_ZONE = 'Asia/Yekaterinburg'
USE_I18N = True USE_I18N = True
USE_L10N = True USE_L10N = True
USE_TZ = True USE_TZ = False
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)

6
backend/back/models.py
View File

@ -38,7 +38,7 @@ class CheckPoint(models.Model):
address = models.CharField(max_length = 200, blank = True, null = True) address = models.CharField(max_length = 200, blank = True, null = True)
class Team(models.Model): class Team(models.Model):
game = models.ForeignKey(Game, on_delete= models.CASCADE, blank = False, null = False) game = models.ForeignKey(Game, on_delete= models.CASCADE,related_name = 'teams', blank = False, null = False)
active = models.BooleanField(default = False) active = models.BooleanField(default = False)
finished = models.BooleanField(default = False) finished = models.BooleanField(default = False)
start = models.DateTimeField(blank = True, null = True) start = models.DateTimeField(blank = True, null = True)
@ -53,6 +53,10 @@ class Gamer(models.Model):
profile = models.ForeignKey(Profile, on_delete = models.CASCADE, blank = False, null = False) profile = models.ForeignKey(Profile, on_delete = models.CASCADE, blank = False, null = False)
team = models.ForeignKey(Team, on_delete = models.CASCADE, related_name = 'gamers', blank = False, null = False) team = models.ForeignKey(Team, on_delete = models.CASCADE, related_name = 'gamers', blank = False, null = False)
# class CurrentCheckPoint(models.Model):
# team = models.ForeignKey(Team, on_delete = models.CASCADE, blank = False, null = False)
# check_point = models.ForeignKey()
@receiver(post_save, sender = User) @receiver(post_save, sender = User)
def create_profile(sender, instance, created, **kwargs): def create_profile(sender, instance, created, **kwargs):
if(created): if(created):

3
backend/back/urls.py
View File

@ -3,9 +3,10 @@ from rest_framework.authtoken.views import obtain_auth_token
from . import views from . import views
urlpatterns = [ urlpatterns = [
path('games', views.ListGamesAPIView.as_view(), name = 'ListGames'), path('games/<visited>', views.ListGamesAPIView.as_view(), name = 'ListGames'),
path('game/<slug>', views.SingleGameAPIView, name = 'SingleGame'), path('game/<slug>', views.SingleGameAPIView, name = 'SingleGame'),
path('game/<slug>/take_part',views.GameTakePartAPIView, name = 'GameTakePartAPIView'), path('game/<slug>/take_part',views.GameTakePartAPIView, name = 'GameTakePartAPIView'),
path('game/<slug>/start', views.StartGameAPIView, name = 'StartGame'),
path('game/<slug>/join_team/<token>',views.JoinTeamAPIView, name = 'JoinTeam'), path('game/<slug>/join_team/<token>',views.JoinTeamAPIView, name = 'JoinTeam'),
path('register', views.UserRegisterAPIView, name = 'UserRegister'), path('register', views.UserRegisterAPIView, name = 'UserRegister'),
path('login', obtain_auth_token, name = 'UserLogin'), path('login', obtain_auth_token, name = 'UserLogin'),

88
backend/back/views.py
View File

@ -16,6 +16,7 @@ from django.contrib.auth.password_validation import validate_password
from django_filters.rest_framework import DjangoFilterBackend from django_filters.rest_framework import DjangoFilterBackend
from rest_framework.filters import OrderingFilter, SearchFilter from rest_framework.filters import OrderingFilter, SearchFilter
from .models import Game, Team, Gamer, Profile, InvitationToken from .models import Game, Team, Gamer, Profile, InvitationToken
from django.utils import timezone
from hashlib import sha1 from hashlib import sha1
import six import six
import threading import threading
@ -24,15 +25,16 @@ class EmailTokenGenerator(PasswordResetTokenGenerator):
def _make_hash_value(self, user, timestamp): def _make_hash_value(self, user, timestamp):
return(six.text_type(user.pk) + six.text_type(timestamp) + six.text_type(user.is_active)) return(six.text_type(user.pk) + six.text_type(timestamp) + six.text_type(user.is_active))
# class InviteTokenGenerator(PasswordResetTokenGenerator):
# def make_token(self, user,):
# return self._make_token_with_timestamp(user, self._num_seconds(self._now()))
# def _make_hash_value(self, user, timestamp):
# return(six.text_type(user.pk) + six.text_type(timestamp) + six.text_type(user.is_active))
email_token_gen = EmailTokenGenerator() email_token_gen = EmailTokenGenerator()
password_token_gen = PasswordResetTokenGenerator() password_token_gen = PasswordResetTokenGenerator()
def list_to_queryset(model_list):
if len(model_list) > 0:
return model_list[0].__class__.objects.filter(
pk__in=[obj.pk for obj in model_list])
else:
return []
class ListGamesAPIView(generics.ListAPIView): class ListGamesAPIView(generics.ListAPIView):
serializer_class = GameListSerializer serializer_class = GameListSerializer
permission_classes = [permissions.IsAuthenticated] permission_classes = [permissions.IsAuthenticated]
@ -42,7 +44,15 @@ class ListGamesAPIView(generics.ListAPIView):
search_fields = ['name', 'description'] search_fields = ['name', 'description']
def get_queryset(self): def get_queryset(self):
return Game.objects.filter(active = True) profile = Profile.objects.get(user = self.request.user)
if(self.kwargs['visited'] == '0'):
data = list(map(lambda team_i: team_i.game,filter(lambda ob:not Gamer.objects.filter(profile = profile, team = ob).exists(), Team.objects.all())))
else:
data = list(map(lambda team_i: team_i.game,filter(lambda ob:Gamer.objects.filter(profile = profile, team = ob).exists(), Team.objects.all())))
if(len(data)!=0):
return list_to_queryset(data)
else:
return Game.objects.none()
@api_view(['GET']) @api_view(['GET'])
@permission_classes([permissions.IsAuthenticated]) @permission_classes([permissions.IsAuthenticated])
@ -63,19 +73,22 @@ def SingleGameAPIView(request, slug):
gamers = data['gamers'] gamers = data['gamers']
can_start = False can_start = False
invite_token = '' invite_token = ''
if(team.captain == profile and (not game.co_op or len(gamers) == game.max_gamers)): if(not team.active):
can_start = True if(team.captain == profile and (not game.co_op or len(gamers) == game.max_gamers) and not team.finished):
if(team.captain == profile): can_start = True
invite = InvitationToken.objects.filter(team = team) if(team.captain == profile and len(gamers) != game.max_gamers and not team.finished):
if(invite.exists()): invite = InvitationToken.objects.filter(team = team)
invite = invite.first() if(invite.exists()):
invite_token = invite.token invite = invite.first()
invite_token = invite.token
else:
pass
return Response({'ok':True, 'can_take_part':False, 'can_start':can_start, 'invite_token':invite_token, **data}, status = status.HTTP_200_OK) return Response({'ok':True, 'can_take_part':False, 'can_start':can_start, 'invite_token':invite_token, **data}, status = status.HTTP_200_OK)
else: else:
serializer = GameListSerializer(game) serializer = GameListSerializer(game)
data = serializer.data data = serializer.data
return Response({'ok':True, 'can_take_part':True, **serializer.data}, status = status.HTTP_200_OK) return Response({'ok':True, 'can_take_part':True, **serializer.data}, status = status.HTTP_200_OK)
return Response({'ok':False, 'error':'Game does not exist'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Game does not exist'}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST']) @api_view(['POST'])
@permission_classes([permissions.IsAuthenticated]) @permission_classes([permissions.IsAuthenticated])
@ -84,7 +97,7 @@ def GameTakePartAPIView(request, slug):
if(game.exists()): if(game.exists()):
game = game.first() game = game.first()
profile = Profile.objects.get(user = request.user) profile = Profile.objects.get(user = request.user)
teams = Team.objects.filter(game = game, captain = profile) teams = Team.objects.filter(game = game)
team = [] team = []
for team_i in teams: for team_i in teams:
if(Gamer.objects.filter(profile = profile, team = team_i).exists()): if(Gamer.objects.filter(profile = profile, team = team_i).exists()):
@ -97,8 +110,8 @@ def GameTakePartAPIView(request, slug):
InvitationToken.objects.create(team = team, token = invite_token) InvitationToken.objects.create(team = team, token = invite_token)
gamer = Gamer.objects.create(team = team, profile = profile) gamer = Gamer.objects.create(team = team, profile = profile)
return Response({'ok':True}, status = status.HTTP_200_OK) return Response({'ok':True}, status = status.HTTP_200_OK)
return Response({'ok':False, 'error':'You alredy take part in this game'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'You alredy take part in this game'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'Game does not exist'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Game does not exist'}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST']) @api_view(['POST'])
@permission_classes([permissions.IsAuthenticated]) @permission_classes([permissions.IsAuthenticated])
@ -115,9 +128,32 @@ def JoinTeamAPIView(request, slug, token):
if(len(gamers) < team.game.max_gamers): if(len(gamers) < team.game.max_gamers):
Gamer.objects.create(team = team, profile = profile) Gamer.objects.create(team = team, profile = profile)
return Response({'ok':True},status = status.HTTP_200_OK) return Response({'ok':True},status = status.HTTP_200_OK)
return Response({'ok':False, 'error':'Game finished or team is full'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Game finished or team is full'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'Invalid invite link'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Invalid invite link'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'Game does not exist'},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Game does not exist'}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST'])
@permission_classes([permissions.IsAuthenticated])
def StartGameAPIView(request,slug):
game = Game.objects.filter(slug = slug)
if(game.exists()):
game = game.first()
profile = Profile.objects.get(user = request.user)
teams = Team.objects.filter(game = game, captain = profile)
team = []
for team_i in teams:
if(Gamer.objects.filter(profile = profile, team = team_i).exists()):
team = team_i
break
if(team):
if(team.captain == profile and not team.finished and not team.active):
team.is_active = True
team.start = timezone.now()
team.save()
return Response({'ok':True}, status = status.HTTP_200_OK)
return Response({'ok':False, 'error':'You are not a captain or game finished or game in progress'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'You do not take part in game'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'Game does not exist'}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST']) @api_view(['POST'])
@permission_classes([~permissions.IsAuthenticated]) @permission_classes([~permissions.IsAuthenticated])
@ -130,7 +166,7 @@ def UserRegisterAPIView(request):
try: try:
validate_password(data['password']) validate_password(data['password'])
except Exception as errors: except Exception as errors:
return Response({'ok':False, 'error':errors} ,status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':errors}, status = status.HTTP_400_BAD_REQUEST)
user = User.objects.create(username = data['username'], email = data['email'], is_active = False) user = User.objects.create(username = data['username'], email = data['email'], is_active = False)
user.set_password(data['password']) user.set_password(data['password'])
user.save() user.save()
@ -145,7 +181,7 @@ def UserRegisterAPIView(request):
message_task = threading.Thread(target = async_email_send, args=( mail_subject, message, [data['email']] )) message_task = threading.Thread(target = async_email_send, args=( mail_subject, message, [data['email']] ))
message_task.start() message_task.start()
return Response({'ok':True}, status = status.HTTP_200_OK) return Response({'ok':True}, status = status.HTTP_200_OK)
return Response({'ok':False, 'error':serializer.errors},status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':serializer.errors}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST']) @api_view(['POST'])
@permission_classes([permissions.AllowAny]) @permission_classes([permissions.AllowAny])
@ -192,7 +228,7 @@ def UserResetPasswordAPIView(request, uidb64, token):
try: try:
validate_password(data['password']) validate_password(data['password'])
except Exception as errors: except Exception as errors:
return Response({'ok':False, 'error':errors} ,status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':errors}, status = status.HTTP_400_BAD_REQUEST)
uid = force_text(urlsafe_base64_decode(uidb64)) uid = force_text(urlsafe_base64_decode(uidb64))
user = User.objects.filter(id = uid) user = User.objects.filter(id = uid)
if(user.exists()): if(user.exists()):
@ -201,8 +237,8 @@ def UserResetPasswordAPIView(request, uidb64, token):
user.set_password(data['password']) user.set_password(data['password'])
user.save() user.save()
return Response({'ok':True}, status = status.HTTP_200_OK) return Response({'ok':True}, status = status.HTTP_200_OK)
return Response({'ok':False, 'error':'Invalid password reset link'} ,status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'Invalid password reset link'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':'User does not exist'} ,status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':'User does not exist'}, status = status.HTTP_400_BAD_REQUEST)
return Response({'ok':False, 'error':serializer.errors}, status = status.HTTP_400_BAD_REQUEST) return Response({'ok':False, 'error':serializer.errors}, status = status.HTTP_400_BAD_REQUEST)
@api_view(['POST']) @api_view(['POST'])