Merge branch 'main' into rollback-to-f3a044c

Author: ghanthk

guessquest/games/admin.py

@@ -1,3 +1,9 @@
 from django.contrib import admin
+from .models import TriviaQuestion
 
 # Register your models here.
+@admin.register(TriviaQuestion)
+class TriviaQuestionAdmin(admin.ModelAdmin):
+    list_display = ('question_text', 'difficulty')    # whatever fields you have
+    search_fields = ('question_text', 'difficulty')
+

guessquest/games/management/__init__.py

@@ -0,0 +1,45 @@
+import time, requests
+from django.core.management.base import BaseCommand
+from ...models import TriviaQuestion 
+
+API_URL   = "https://opentdb.com/api.php"
+TOTAL     = 4516
+BATCH_SIZE= 50
+
+class Command(BaseCommand):
+    help = "Fetch all trivia questions in 50‑question batches"
+
+    def handle(self, *args, **opts):
+        no_new_rounds = 0
+        while TriviaQuestion.objects.count() < TOTAL and no_new_rounds < 5:
+            resp = requests.get(API_URL, params={
+                "amount": BATCH_SIZE,
+                "type":   "multiple",
+                "encode": "base64"   # avoid HTML entities
+            })
+            data = resp.json().get("results", [])
+            new = 0
+
+            for item in data:
+                # decode base64 fields
+                import base64
+                def d(s): return base64.b64decode(s).decode()
+                qtxt = d(item["question"])
+                if not TriviaQuestion.objects.filter(question_text=qtxt).exists():
+                    TriviaQuestion.objects.create(
+                        question_text               = qtxt,
+                        correct_answer     = d(item["correct_answer"]),
+                        incorrect_answers  = [d(x) for x in item["incorrect_answers"]],
+                    )
+                    new += 1
+
+            total = TriviaQuestion.objects.count()
+            self.stdout.write(f"+{new} → {total}/{TOTAL}")
+            no_new_rounds = no_new_rounds + 1 if new == 0 else 0
+            time.sleep(1)
+
+        self.stdout.write(
+            self.style.SUCCESS("Done!") 
+            if total >= TOTAL else 
+            self.style.WARNING(f"Stopped at {total}/{TOTAL}")
+        )

guessquest/games/management/commands/__init__.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-04-13 18:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0002_rename_user_temperaturegamesession_player_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='temperaturegamesession',
+            old_name='total_score',
+            new_name='score',
+        ),
+    ]

guessquest/games/management/commands/fetch_all_trivia.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-04-13 18:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0003_rename_total_score_temperaturegamesession_score'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='temperaturequestion',
+            name='user_guess',
+            field=models.FloatField(blank=True, null=True),
+        ),
+    ]

guessquest/games/migrations/0003_rename_total_score_temperaturegamesession_score.py

@@ -0,0 +1,61 @@
+# Generated by Django 4.2.20 on 2025-04-18 23:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0004_alter_temperaturequestion_user_guess'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TriviaQuestion',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='WeatherLeaderBoard',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('score', models.IntegerField()),
+                ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='games.player')),
+            ],
+            options={
+                'ordering': ['-score', 'player_id'],
+                'abstract': False,
+            },
+            managers=[
+                ('top_players', django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='TriviaLeaderBoard',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('score', models.IntegerField()),
+                ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='games.player')),
+            ],
+            options={
+                'ordering': ['-score', 'player_id'],
+                'abstract': False,
+            },
+            managers=[
+                ('top_players', django.db.models.manager.Manager()),
+            ],
+        ),
+        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')),
+            ],
+        ),
+    ]

guessquest/games/migrations/0004_alter_temperaturequestion_user_guess.py

@@ -0,0 +1,46 @@
+# Generated by Django 4.2.20 on 2025-04-19 00:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0005_triviaquestion_weatherleaderboard_trivialeaderboard_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='correct_answer',
+            field=models.CharField(blank=True, max_length=50, null=True),
+        ),
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='difficulty',
+            field=models.CharField(choices=[('easy', 'Easy'), ('medium', 'Medium'), ('hard', 'Hard')], default='easy', max_length=10),
+        ),
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='game',
+            field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.CASCADE, to='games.triviagamesession'),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='incorrect_answers',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='question_text',
+            field=models.TextField(default=''),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='triviaquestion',
+            name='question_type',
+            field=models.CharField(blank=True, choices=[('multiple', 'Multiple Choice'), ('boolean', 'Boolean')], max_length=10, null=True),
+        ),
+    ]

guessquest/games/migrations/0005_triviaquestion_weatherleaderboard_trivialeaderboard_and_more.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.20 on 2025-04-19 00:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0006_triviaquestion_correct_answer_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='triviaquestion',
+            name='game',
+        ),
+    ]

guessquest/games/migrations/0006_triviaquestion_correct_answer_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.20 on 2025-04-21 19:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('games', '0007_remove_triviaquestion_game'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weatherleaderboard',
+            name='player',
+        ),
+        migrations.RenameField(
+            model_name='player',
+            old_name='high_score',
+            new_name='trivia_high_score',
+        ),
+        migrations.RemoveField(
+            model_name='temperaturegamesession',
+            name='time_created',
+        ),
+        migrations.RemoveField(
+            model_name='temperaturequestion',
+            name='time_created',
+        ),
+        migrations.RemoveField(
+            model_name='temperaturequestion',
+            name='time_limit',
+        ),
+        migrations.AddField(
+            model_name='player',
+            name='weather_high_score',
+            field=models.FloatField(default=0),
+        ),
+        migrations.DeleteModel(
+            name='TriviaLeaderBoard',
+        ),
+        migrations.DeleteModel(
+            name='WeatherLeaderBoard',
+        ),
+    ]