migrate

battleship/migrations/0003_auto_20220826_1242.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.15 on 2022-08-26 12:42
+
+import battleship.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('battleship', '0002_game_winner'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='player',
+            name='unique_player_attend_token',
+        ),
+        migrations.RemoveField(
+            model_name='player',
+            name='attend_token',
+        ),
+        migrations.AlterField(
+            model_name='player',
+            name='token',
+            field=models.CharField(default=battleship.models.generate_token, max_length=30),
+        ),
+    ]

battleship/models.py

@@ -21,11 +21,9 @@ class Player(models.Model):
     game = models.ForeignKey(Game, on_delete=models.CASCADE)
     field = models.CharField(max_length=100, default=' ' * 100)
     number = models.IntegerField()
-    attend_token = models.CharField(max_length=30, default=generate_token)
+    token = models.CharField(max_length=30, default=generate_token)
-    token = models.CharField(max_length=30, null=True, blank=True)
 
     class Meta:
         constraints = [
             models.UniqueConstraint(fields=['token'], name='unique_player_token'),
-            models.UniqueConstraint(fields=['attend_token'], name='unique_player_attend_token')
         ]

battleship/views.py

@@ -21,7 +21,8 @@ def new_game(request):
     )
     player2 = Player.objects.create(
         game=game,
-        number=1
+        number=1,
+        token=generate_token()
     )
     return JsonResponse({
         'game_id': game.id,
@@ -76,7 +77,10 @@ def check_opponent(request):
     player2 = Player.objects.filter(game_id=game_id, number=(1 - player.number)).first()
     if player2.token is None:
         return JsonResponse({"attend": False, "ready": False})
-    return JsonResponse({"attend": True, "ready": player2.field != ' ' * 100})
+    print(player2.field)
+    value = {"attend": True, "ready": 'o' in player2.field}
+    print(value)
+    return JsonResponse(value)
 
 
 @csrf_exempt