Merge branch 'master' into feat--add-language-dropdown

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v5.16.25 (2024-05-07)
+
+### Fix
+
+* Bump up version ([`9dce52f`](https://github.com/ocadotechnology/rapid-router/commit/9dce52f46400a465679f06d30a3ad1623b171a54))
+
 ## v5.16.24 (2024-04-19)
 
 ### Fix

README.md

@@ -9,9 +9,9 @@ of the Code for Life website, all copyright, trademarks, and other
 intellectual property rights in and relating to Code for Life (including all
 content of the Code for Life website, the Rapid Router application, the
 Kurono application, related software (including any drawn and/or animated
-avatars, whether or not such avatars have any modifications) and any other
-games, applications or any other content that we make available from time to
-time) are owned by Ocado Innovation Limited.
+avatars, whether such avatars have any modifications) and any other games,
+applications or any other content that we make available from time to time) are
+owned by Ocado Innovation Limited.
 
 The source code of the Code for Life portal, the Rapid Router application
 and the Kurono/aimmo application are [licensed under the GNU Affero General

example_project/rapid_router_test_settings.py

@@ -41,6 +41,7 @@
         "NAME": os.path.join(
             os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
         ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
     }
 }
 

example_project/settings.py

@@ -28,6 +28,7 @@
         "NAME": os.path.join(
             os.path.abspath(os.path.dirname(__file__)), "db.sqlite3"
         ),  # Or path to database file if using sqlite3.
+        "ATOMIC_REQUESTS": True,
     }
 }
 

game/__init__.py

@@ -1 +1 @@
-__version__ = "5.16.24"
+__version__ = "5.16.25"

game/level_management.py

@@ -3,14 +3,10 @@
 from builtins import str
 from itertools import chain
 
-from common.helpers.emails import NOTIFICATION_EMAIL, send_email
+from common.mail import campaign_ids, send_dotdigital_email
 
 from game.character import get_character_by_pk
 from game.decor import get_decor_element
-from game.messages import (
-    level_creation_email_subject,
-    level_creation_email_text_content,
-)
 from game.theme import get_theme_by_pk
 from .models import Block, LevelBlock, LevelDecor
 
@@ -191,16 +187,14 @@ def email_new_custom_level(
     teacher_email, moderate_url, level_url, home_url, student_name, class_name
 ):
     # email teacher when a new custom level is created by a pupil, so it can be moderated ASAP
-    send_email(
-        NOTIFICATION_EMAIL,
+
+    send_dotdigital_email(
+        campaign_ids["level_creation"],
         [teacher_email],
-        level_creation_email_subject(),
-        level_creation_email_text_content().format(
-            moderate_url=moderate_url,
-            level_url=level_url,
-            student_name=student_name,
-            class_name=class_name,
-            home_url=home_url,
-        ),
-        level_creation_email_subject(),
+        personalization_values={
+            "STUDENT_NAME": student_name,
+            "CLASS_NAME": class_name,
+            "LEVEL_URL": level_url,
+            "MODERATE_URL": moderate_url
+        }
     )

game/messages.py

@@ -1,17 +1,6 @@
 from builtins import str
 
 
-def level_creation_email_subject():
-    return "Custom level to moderate"
-
-
-def level_creation_email_text_content():
-    return (
-        "Your student {student_name} from your class {class_name} has created this level: {level_url}. "
-        "If you want to moderate it, you can do it on the moderation board: {moderate_url}."
-    )
-
-
 def youtube_link(url, border):
     return (
         "<div class='popup_video'>"