Trivia Tests

guessquest/games/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.1 on 2025-03-16 18:16
+# Generated by Django 4.2.20 on 2025-04-27 21:45
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -17,29 +17,54 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('username', models.CharField(max_length=15)),
-                ('high_score', models.FloatField(default=0)),
+                ('weather_high_score', models.FloatField(default=0)),
+                ('trivia_high_score', models.FloatField(default=0)),
             ],
         ),
         migrations.CreateModel(
             name='TemperatureGameSession',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('total_score', models.IntegerField(default=0)),
+                ('score', models.IntegerField(default=0)),
                 ('questions_left', models.IntegerField(default=5)),
-                ('time_created', models.DateTimeField(auto_now_add=True)),
-                ('game_status', models.CharField(choices=[('active,', 'Active'), ('completed', 'Completed')], default='active', max_length=10)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='games.player')),
+                ('game_status', models.CharField(choices=[('active', 'Active'), ('completed', 'Completed')], default='active', max_length=10)),
+                ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='games.player')),
             ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='TriviaQuestion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('question_text', models.TextField()),
+                ('difficulty', models.CharField(choices=[('easy', 'Easy'), ('medium', 'Medium'), ('hard', 'Hard')], default='easy', max_length=10)),
+                ('question_type', models.CharField(blank=True, choices=[('multiple', 'Multiple Choice'), ('boolean', 'Boolean')], max_length=10, null=True)),
+                ('correct_answer', models.CharField(blank=True, max_length=50, null=True)),
+                ('incorrect_answers', models.JSONField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TriviaGameSession',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('score', models.IntegerField(default=0)),
+                ('questions_left', models.IntegerField(default=5)),
+                ('game_status', models.CharField(choices=[('active', 'Active'), ('completed', 'Completed')], default='active', max_length=10)),
+                ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='games.player')),
+            ],
+            options={
+                'abstract': False,
+            },
         ),
         migrations.CreateModel(
             name='TemperatureQuestion',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('city', models.CharField(max_length=50)),
-                ('user_guess', models.FloatField()),
+                ('user_guess', models.FloatField(blank=True, null=True)),
                 ('actual_temperature', models.FloatField()),
-                ('time_created', models.DateTimeField(auto_now_add=True)),
-                ('time_limit', models.IntegerField(default=30)),
                 ('game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='games.temperaturegamesession')),
             ],
         ),

guessquest/games/models.py

@@ -1,7 +1,5 @@
 from django.db import models
 from . import weather_services
-#TODO LEADERBOARD
-
 
 class Player(models.Model):
     username = models.CharField(max_length=15)
@@ -37,11 +35,22 @@ def update_score(self, points):
     def end_game(self):
         self.game_status = "completed"
         self.save()
-    def create_question(self) :
+    def decrement_question_count(self) :
         self.questions_left -= 1
+        if self.questions_left == 0:
+            self.game_status = "completed"
+        self.save()
+    def create_question(self) :
+        self.decrement_question_count()
         self.save()
     def no_questions_left(self):
         return self.questions_left == 0
+    def game_over(self):
+        if self.game_status == 'completed' or self.no_questions_left():
+            self.end_game()
+            return True
+        return False
+
 
 class TemperatureGameSession(BaseGameSession):
     def create_question(self) :
@@ -76,6 +85,7 @@ def end_game(self):
         super().end_game()
         self.player.update_trivia_high_score(self.score)
         self.delete()
+
 class TriviaQuestion(models.Model):
     DIFFICULTY_CHOICES = [('easy', 'Easy'), ('medium', 'Medium'), ('hard', 'Hard')]
     QUESTION_TYPE = [('multiple', 'Multiple Choice'), ('boolean', 'Boolean')]