Merge conflicts

cfl_common/MANIFEST.in

@@ -1,3 +1,2 @@
-include common/fixtures/*.json
 graft common/templates
 graft common/static

cfl_common/common/csp_config.py

@@ -15,8 +15,6 @@
     "https://www.google-analytics.com/",
     "https://pyodide-cdn2.iodide.io/v0.15.0/full/",
     "https://crowdin.com/",
-    f"wss://{MODULE_NAME}-aimmo.codeforlife.education/",
-    f"https://{MODULE_NAME}-aimmo.codeforlife.education/",
 )
 CSP_FONT_SRC = ("'self'", "https://fonts.gstatic.com/", "https://fonts.googleapis.com/", "https://use.typekit.net/")
 CSP_SCRIPT_SRC = (

cfl_common/common/migrations/0005_add_worksheets.py

@@ -1,12 +1,8 @@
-from common.helpers.data_migration_loader import load_data_from_file
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ("common", "0004_add_aimmocharacters"),
-        ("aimmo", "0020_add_info_to_worksheet"),
-    ]
+    dependencies = [("common", "0004_add_aimmocharacters")]
 
     operations = [migrations.RunPython(migrations.RunPython.noop, reverse_code=migrations.RunPython.noop)]

cfl_common/common/migrations/0007_add_pdf_names_to_first_two_worksheets.py

@@ -1,12 +1,8 @@
-from common.helpers.data_migration_loader import load_data_from_file
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ("common", "0006_update_aimmo_character_image_path"),
-        ("aimmo", "0021_add_pdf_names_to_worksheet"),
-    ]
+    dependencies = [("common", "0006_update_aimmo_character_image_path")]
 
     operations = [migrations.RunPython(migrations.RunPython.noop, reverse_code=migrations.RunPython.noop)]

cfl_common/common/migrations/0053_clean_class_data.py

@@ -0,0 +1,24 @@
+from datetime import date
+
+from django.apps.registry import Apps
+from django.db import migrations, models
+
+def clean_early_class_data(apps: Apps, *args):
+    Class = apps.get_model("common", "Class")
+
+    Class.objects.filter(
+        creation_time__date__lt = date(2021, 10, 15)
+    ).update(creation_time = None)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("common", "0052_add_cse_fields")
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=clean_early_class_data,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]

cfl_common/common/migrations/0054_delete_aimmo_models.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.25 on 2024-07-31 00:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0053_clean_class_data'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='AimmoCharacter',
+        ),
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='aimmo_badges',
+        ),
+    ]

cfl_common/common/models.py

@@ -16,14 +16,6 @@ class UserProfile(models.Model):
     developer = models.BooleanField(default=False)
     is_verified = models.BooleanField(default=False)
 
-    # Holds the user's earned kurono badges. This information has to be on the
-    # UserProfile as the Avatar objects are deleted every time the Game gets
-    # deleted.
-    # This is a string showing which badges in which worksheets have been
-    # earned. The format is "X:Y" where X is the worksheet ID and Y is the
-    # badge ID. This repeats for all badges and each pair is comma-separated.
-    aimmo_badges = models.CharField(max_length=200, null=True, blank=True)
-
     # TODO: Make not nullable once data has been transferred
     first_name = models.CharField(max_length=200, null=True, blank=True)
     _first_name = models.BinaryField(null=True, blank=True)
@@ -387,23 +379,6 @@ def stripStudentName(name):
     return re.sub("[ \t]+", " ", name.strip())
 
 
-class AimmoCharacterManager(models.Manager):
-    def sorted(self):
-        return self.get_queryset().order_by("sort_order")
-
-
-class AimmoCharacter(models.Model):
-    name = models.CharField(max_length=255)
-    description = models.TextField()
-    image_path = models.CharField(max_length=255)
-    sort_order = models.IntegerField()
-    alt = models.CharField(max_length=255, null=True)
-    objects = AimmoCharacterManager()
-
-    def __str__(self) -> str:
-        return self.name
-
-
 # -----------------------------------------------------------------------
 # Below are models used for data tracking and maintenance
 # -----------------------------------------------------------------------

example_project/portal_test_settings.py

@@ -83,7 +83,6 @@
 SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]
 
 INSTALLED_APPS = [
-    "aimmo",
     "game",
     "pipeline",
     "portal",

example_project/settings.py

@@ -39,7 +39,6 @@
 SILENCED_SYSTEM_CHECKS = ["captcha.recaptcha_test_key_error"]
 
 INSTALLED_APPS = [
-    "aimmo",
     "game",
     "pipeline",
     "portal",

example_project/urls.py

@@ -1,4 +1,3 @@
-from aimmo import urls as aimmo_urls
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.urls import path
@@ -12,5 +11,4 @@
     url(r"^", include(portal_urls)),
     path("administration/", admin.site.urls),
     url(r"^rapidrouter/", include(game_urls)),
-    url(r"^kurono/", include(aimmo_urls)),
 ]

portal/__init__.py

@@ -1 +1 @@
-__version__ = "6.46.0"
+__version__ = "7.0.0"