From bad63330c575c9d575a83ead84971bc34e59ee43 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 26 Aug 2022 08:56:32 +0300 Subject: [PATCH] fixes --- battleship/views.py | 14 +------------- battleship_back/urls.py | 1 - 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/battleship/views.py b/battleship/views.py index ce87eaf..c8fe5f3 100644 --- a/battleship/views.py +++ b/battleship/views.py @@ -74,7 +74,7 @@ def check_opponent(request): token = data['token'] player = Player.objects.get(game_id=game_id, token=token) player2 = Player.objects.filter(game_id=game_id, number=(1 - player.number)).first() - if player2 is None: + if player2.token is None: return JsonResponse({"attend": False, "ready": False}) return JsonResponse({"attend": True, "ready": player2.field != ' ' * 100}) @@ -143,15 +143,3 @@ def check_field_correct(request): return JsonResponse({ 'correct': correct }) - - -def get_field(request): - if request.method == 'OPTIONS': - return JsonResponse({}) - data = json.loads(request.body.decode('utf-8')) - player = Player.objects.get(game_id=data['gam_id'], token=data['token']).one() - cells = list(player.field) - cells = [cells[x * 10: (x + 1) * 10] for x in range(0, 10)] - return JsonResponse({ - 'field': cells - }) diff --git a/battleship_back/urls.py b/battleship_back/urls.py index fc0bc19..1dbf070 100644 --- a/battleship_back/urls.py +++ b/battleship_back/urls.py @@ -27,5 +27,4 @@ urlpatterns = [ path('api/place_ships', views.place_ships), path('api/shoot', views.shoot), path('api/check_field_correct', views.check_field_correct), - path('api/get_field', views.get_field) ]