cfl-common 5.3.0__py3-none-any.whl → 8.9.15__py3-none-any.whl

common/tests/utils/student.py

@@ -1,13 +1,10 @@
 from builtins import range
 from typing import Tuple
-from uuid import uuid4
-
-from django.core import mail
+from unittest.mock import patch
 
 from common.helpers.emails import generate_token
-from common.models import Class, Student
-
 from common.helpers.generators import generate_login_id
+from common.models import Class, Student
 
 from . import email
 
@@ -49,7 +46,7 @@ def create_student_with_direct_login(access_code) -> Tuple[Student, str]:
     login_id, hashed_login_id = generate_login_id()
     student = Student.objects.schoolFactory(klass, name, password, hashed_login_id)
 
-    return student, login_id
+    return student, login_id, name, password
 
 
 def create_independent_student_directly(preverified=True):
@@ -62,7 +59,7 @@ def create_independent_student_directly(preverified=True):
     """
     name, username, email, password = generate_independent_student_details()
 
-    student = Student.objects.independentStudentFactory(username, name, email, password)
+    student = Student.objects.independentStudentFactory(name, email, password)
 
     # verify student
     generate_token(student.new_user, preverified=preverified)
@@ -92,11 +89,9 @@ def create_many_school_students(page, number_of_students):
 
 def generate_independent_student_details():
     name = "Independent Student %d" % generate_independent_student_details.next_id
-    username = "Student user %d" % generate_independent_student_details.next_id
-    email_address = (
-        "Student%d@codeforlife.com" % generate_independent_student_details.next_id
-    )
-    password = "Password2"
+    email_address = "student%d@codeforlife.com" % generate_independent_student_details.next_id
+    username = email_address
+    password = "$RFVBGT%^YHNmju7$RFVBGT%^YHNmju7$RFVBGT%^YHNmju7"
 
     generate_independent_student_details.next_id += 1
 
@@ -106,71 +101,23 @@ def generate_independent_student_details():
 generate_independent_student_details.next_id = 1
 
 
-def signup_duplicate_independent_student_fail(
-    page, duplicate_username=None, duplicate_email=None, newsletter=False
-):
+@patch("common.helpers.emails.send_dotdigital_email")
+def create_independent_student(page, mock_send_dotdigital_email):
     page = page.go_to_signup_page()
 
     name, username, email_address, password = generate_independent_student_details()
-
-    if not duplicate_email:
-        duplicate_email = email_address
-
-    if not duplicate_username:
-        duplicate_username = username
-
-    page = page.independent_student_signup(
-        name,
-        duplicate_username,
-        duplicate_email,
-        password=password,
-        confirm_password=password,
-        newsletter=newsletter,
-    )
+    page = page.independent_student_signup(name, email_address, password=password, confirm_password=password)
 
     page = page.return_to_home_page()
 
-    page = email.follow_duplicate_account_link_to_login(
-        page, mail.outbox[0], "independent"
-    )
-
-    return page, name, username, email_address, password
-
+    verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-def create_independent_student(page, newsletter=False):
-    page = page.go_to_signup_page()
-
-    name, username, email_address, password = generate_independent_student_details()
-    page = page.independent_student_signup(
-        name,
-        username,
-        email_address,
-        password=password,
-        confirm_password=password,
-        newsletter=newsletter,
-    )
-
-    page = page.return_to_home_page()
-
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "independent")
-    mail.outbox = []
+    page = email.follow_verify_email_link_to_login(page, verification_url, "independent")
 
     return page, name, username, email_address, password
 
 
-def verify_email(page):
-    assert len(mail.outbox) > 0
-
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "independent")
-    mail.outbox = []
+def verify_email(page, verification_url):
+    page = email.follow_verify_email_link_to_login(page, verification_url, "independent")
 
     return page
-
-
-def submit_independent_student_signup_form(page, password="test"):
-    page = page.go_to_signup_page()
-
-    name, username, email_address, _ = generate_independent_student_details()
-    return page.independent_student_signup(
-        name, username, email_address, password, password, success=False
-    )

common/tests/utils/teacher.py

@@ -1,9 +1,9 @@
 import random
 import sys
+from unittest.mock import patch
 
 from common.helpers.emails import generate_token
 from common.models import Teacher
-from django.core import mail
 
 from . import email
 
@@ -12,11 +12,8 @@ def generate_details(**kwargs):
     random_int = random.randint(1, sys.maxsize)
     first_name = kwargs.get("first_name", "Test")
     last_name = kwargs.get("last_name", f"Teacher {random_int}")
-    email_address = kwargs.get(
-        "email_address",
-        f"testteacher{random_int}@codeforlife.com",
-    )
-    password = kwargs.get("password", "Password2!")
+    email_address = kwargs.get("email_address", f"testteacher{random_int}@codeforlife.com")
+    password = kwargs.get("password", "$RFVBGT%6yhn$RFVBGT%6yhn$RFVBGT%6yhn$RFVBGT%6yhn")
 
     return first_name, last_name, email_address, password
 
@@ -36,7 +33,8 @@ def signup_teacher_directly(preverified=True, **kwargs):
     return email_address, password
 
 
-def signup_duplicate_teacher_fail(page, duplicate_email):
+@patch("portal.views.home.send_dotdigital_email")
+def signup_duplicate_teacher_fail(page, duplicate_email, mock_send_dotdigital_email):
     page = page.go_to_signup_page()
 
     first_name, last_name, email_address, password = generate_details()
@@ -44,52 +42,32 @@ def signup_duplicate_teacher_fail(page, duplicate_email):
 
     page = page.return_to_home_page()
 
-    page = email.follow_duplicate_account_link_to_login(page, mail.outbox[0], "teacher")
-    mail.outbox = []
+    login_link = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["LOGIN_URL"]
+
+    page = email.follow_duplicate_account_link_to_login(page, login_link, "teacher")
 
     return page, email_address, password
 
 
-def signup_teacher(page, newsletter=False):
+@patch("common.helpers.emails.send_dotdigital_email")
+def signup_teacher(page, mock_send_dotdigital_email, newsletter=False):
     page = page.go_to_signup_page()
 
     first_name, last_name, email_address, password = generate_details()
     page = page.signup(
-        first_name,
-        last_name,
-        email_address,
-        password=password,
-        confirm_password=password,
-        newsletter=newsletter,
+        first_name, last_name, email_address, password=password, confirm_password=password, newsletter=newsletter
     )
 
     page = page.return_to_home_page()
 
-    page = email.follow_verify_email_link_to_onboarding(page, mail.outbox[0])
-    mail.outbox = []
+    verification_url = mock_send_dotdigital_email.call_args.kwargs["personalization_values"]["VERIFICATION_LINK"]
 
-    return page, email_address, password
+    page = email.follow_verify_email_link_to_onboarding(page, verification_url)
 
+    return page, email_address, password
 
-def verify_email(page):
-    assert len(mail.outbox) > 0
 
-    page = email.follow_verify_email_link_to_login(page, mail.outbox[0], "teacher")
-    mail.outbox = []
+def verify_email(page, verification_url):
+    page = email.follow_verify_email_link_to_login(page, verification_url, "teacher")
 
     return page
-
-
-def submit_teacher_signup_form(page, password="test"):
-    page = page.go_to_signup_page()
-
-    first_name, last_name, email_address, _ = generate_details()
-    return page.signup(
-        first_name,
-        last_name,
-        email_address,
-        password=password,
-        confirm_password=password,
-        success=False,
-        newsletter=True,
-    )

common/tests/utils/user.py

@@ -7,9 +7,7 @@ def get_superuser():
     try:
         return User.objects.get(username="superuser")
     except User.DoesNotExist:
-        return User.objects.create_superuser(
-            "superuser", "superuser@codeforlife.education", "password"
-        )
+        return User.objects.create_superuser("superuser", "superuser@codeforlife.education", "password")
 
 
 def create_user_directly(active=True, **kwargs):

cfl_common-5.3.0.dist-info/METADATA

@@ -1,20 +0,0 @@
-Metadata-Version: 2.1
-Name: cfl-common
-Version: 5.3.0
-Summary: UNKNOWN
-Home-page: UNKNOWN
-Author: UNKNOWN
-Author-email: UNKNOWN
-License: UNKNOWN
-Platform: UNKNOWN
-Classifier: Programming Language :: Python :: 3
-Classifier: Operating System :: OS Independent
-Requires-Dist: django (==2.2.24)
-Requires-Dist: djangorestframework (==3.12.2)
-Requires-Dist: django-two-factor-auth (==1.13)
-Requires-Dist: django-countries (==6.1.3)
-Requires-Dist: wagtail (==2.11.*)
-
-UNKNOWN
-
-

cfl_common-5.3.0.dist-info/RECORD

@@ -1,48 +0,0 @@
-common/__init__.py,sha256=XlncBOpKp_gekbKH7Y_i6yu1qy5tJc3Y8sn8cDy-Vgk,48
-common/app_settings.py,sha256=bUZ_fdtlfPetbzHdwa5DCTWD62JkfyOJzmFc_wioLyE,1656
-common/apps.py,sha256=49UXZ3bSkFKvIEOL4zM7y1sAhccQJyRtsoOg5XVd_8Y,129
-common/context_processors.py,sha256=X0iuX5qu9kMWa7q8osE9CJ2LgM7pPOYQFGdjm8X3rk0,236
-common/email_messages.py,sha256=md3Po0s3xQ5koBZdtJiYk9lcr2dL0U57hKx-zjZLmGY,7854
-common/models.py,sha256=VGb1j6bz1J4hQIN29zUAPICsbmKfnKkkWlmHNH6KEbI,8641
-common/permissions.py,sha256=KYwnAaGPlWS9xTr6kVWEyqgipIq3zTJNyrErcCin2O8,1871
-common/utils.py,sha256=Nn2Npao9Uqad5Js_IdHwF-ow6wrPNpBLW4AO1LxoEBc,1727
-common/fixtures/aimmo_characters.json,sha256=MHJ5SJ9_48gOzEukku0UTH8bBQR6Tap--4dfAGOsN6o,1365
-common/fixtures/aimmo_characters2.json,sha256=vM8tIcKHb1A7b6gyvrklZKl-hhu0yTmZA8lH8oWrcjk,1284
-common/fixtures/unlock_worksheet3.json,sha256=F6yth5BuhAZpexSVco5n3CZidvFZ1Tye437UHVY8k_Q,1864
-common/fixtures/worksheets.json,sha256=yC50h8DHDCuwgTXJcPKfFC7qjIjSOUtjtUDN1sLQnxc,7699
-common/fixtures/worksheets2.json,sha256=B31mKMcwz6l42MjKYjRNO8cR1ZDEv_SxZvSHxR9PmAE,8139
-common/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-common/helpers/data_migration_loader.py,sha256=05OteSWSuCLt2BRIlRhHCNWVigYjyoiaMw323ZKFZPk,1778
-common/helpers/emails.py,sha256=zsZ8G3TVcjW9M9YQZhV6L4sM_nvCD5a0uOLa8zDvbrI,7483
-common/helpers/generators.py,sha256=wJ90XBe5zN-JXEPSpnQhCG0sdpBLEBUj1MG2K_GOWPk,1505
-common/migrations/0001_initial.py,sha256=Y2kt2xmdCbrmDXCgqmhXeacicNg26Zj7L7SANSsgAAI,9664
-common/migrations/0002_emailverification.py,sha256=_tbAHuICs2y5Rdahry98GQ5plBh46SQ-0nZGrfTQAlY,2156
-common/migrations/0003_aimmocharacter.py,sha256=ZS_-sJCVUnFdhDjyH75P5bryg5QKHPDfe-SXXK7k9KM,922
-common/migrations/0004_add_aimmocharacters.py,sha256=543WKEphsvdKo8Z7f8wPgZHGxRPWMdo288O5_7edawo,430
-common/migrations/0005_add_worksheets.py,sha256=dM4Z2A3xDrjADml9zPWVP1YsVNXrbG3jmZQBGvOu1RQ,480
-common/migrations/0006_update_aimmo_character_image_path.py,sha256=De1d02dAYE2KT8uW1qPi0NmWp45_zXVNH7kjWg3f2ko,431
-common/migrations/0007_add_pdf_names_to_first_two_worksheets.py,sha256=W1wmCPQd1NGjFlwxPTVJBrUqdq_kWSZMXa8og_wIDAY,513
-common/migrations/0008_unlock_worksheet_3.py,sha256=nBkODMtQNPnsxrY0wTE1g1icYBqyahhtKt8MPx4_Pyc,414
-common/migrations/0009_add_blocked_time_to_teacher_and_student.py,sha256=hdff316HkAVCB0EW61qbR2lxwkxSTsD7OBK66PLBUUQ,599
-common/migrations/0010_remove_teacher_title.py,sha256=dMX-wgD-nzRx2AmrvuLMtb1X7TIv1gZ9icacFgI1LNc,396
-common/migrations/0011_student_login_id.py,sha256=9aeEowaiCltBTp0WCJcXlk3mfAq-5kmJguT6Sjs5m04,400
-common/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-common/templates/common/freshdesk_widget.html,sha256=gc4BCbyh-ADCd0TkLYnT4X8FgOcJL_Bum-PSFXv3Vog,336
-common/templates/common/onetrust_cookies_consent_notice.html,sha256=CtCTESe0_BOxyU8Y-56qLoEeQhaG554oy03N8A6NQnI,1069
-common/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-common/tests/test_migration_aimmo_characters.py,sha256=Z8BkpGuAl7Kj56sXSIhgApVMbfZK4CFeYD3wm72s2kY,1093
-common/tests/test_migration_blocked_time.py,sha256=a5gDDyn0x7TmEieId04scIXSritei5_qN1CX4Bx5eo0,652
-common/tests/test_migration_remove_teacher_title.py,sha256=BTc_XQvT08Ryhry08Y4ZLiGRAFTXzcSpgv62z66zlH4,536
-common/tests/test_migration_worksheets.py,sha256=JqaGR2uGZ20YEPRCoM8-fLu3sTe6LDx3dCvKHYzoFtk,1775
-common/tests/test_models.py,sha256=ZpjLU0Zk_h8XaLuxE5y03-QLsT21n9RMbMjUVncWusU,2981
-common/tests/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-common/tests/utils/classes.py,sha256=LppAbCofWdpK_A42T4dQRKTQ6Y5BooWnd-AnGUQaz0U,1100
-common/tests/utils/email.py,sha256=CeuDl1w6RbA_-DnrwcTXhCL2D_JzbGB2poLA9eLoneE,2958
-common/tests/utils/organisation.py,sha256=OY5WY2ThnpRUU3zfADuIv6ommE2R-ZJ_OJBc-w50nmA,1173
-common/tests/utils/student.py,sha256=zK_b1HTXeVPanJvAu1NcMgO4h8-fZaLrIrBSl6plPYc,4962
-common/tests/utils/teacher.py,sha256=UfXf8uVTtgfYfr4fypfvJ1Esom0y4RR99uEhqzq-HmQ,2747
-common/tests/utils/user.py,sha256=Utl3gNykKRWryCoK9cJf9BTPthU7xz_azRD8cmvV38g,941
-cfl_common-5.3.0.dist-info/METADATA,sha256=PZ6nnvwSIRggk6jEy0Ardb8eS5pKYEEKnbl7dqanHug,471
-cfl_common-5.3.0.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-cfl_common-5.3.0.dist-info/top_level.txt,sha256=LOtYx8KZTmnxM_zLK4rwrcI3PRc40Ihwp5rgaQ-ceaI,7
-cfl_common-5.3.0.dist-info/RECORD,,

common/email_messages.py

@@ -1,218 +0,0 @@
-from django.urls import reverse
-
-
-def emailSubjectPrefix():
-    return "Code for Life"
-
-
-def emailBodySignOff(request):
-    return (
-        f"\n\nThanks,\n\nThe Code for Life team.\n"
-        f"{request.build_absolute_uri(reverse('home'))}"
-    )
-
-
-def emailVerificationNeededEmail(request, token):
-    return {
-        "subject": f"{emailSubjectPrefix()}: Email address verification needed",
-        "message": (
-            f"Please go to "
-            f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': token}))} "
-            f"to verify your email address."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def emailChangeVerificationEmail(request, token):
-    return {
-        "subject": f"{emailSubjectPrefix()}: Email address verification needed",
-        "message": (
-            f"You are changing your email, please go to "
-            f"{request.build_absolute_uri(reverse('verify_email', kwargs={'token': token}))} "
-            f"to verify your new email address. If you are not part of Code for Life "
-            f"then please ignore this email."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def emailChangeNotificationEmail(request):
-    return {
-        "subject": f"{emailSubjectPrefix()}: Email address changed",
-        "message": (
-            f"Someone has tried to change the email address of your account. If this "
-            f"was not you, please get in contact with us."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def emailChangeDuplicateNotificationEmail(request, email):
-    return {
-        "subject": f"{emailSubjectPrefix()}: Duplicate account error",
-        "message": (
-            f"A user is already registered with this email address: {email}.\n"
-            f"Please change your email address to something else."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def userAlreadyRegisteredEmail(request, email, is_independent_student=False):
-    if is_independent_student:
-        login_url = reverse("independent_student_login")
-    else:
-        login_url = reverse("teacher_login")
-
-    return {
-        "subject": f"{emailSubjectPrefix()}: Duplicate account error",
-        "message": (
-            f"A user is already registered with this email address: {email}.\n"
-            f"If you've already registered, please login: "
-            f"{request.build_absolute_uri(login_url)}.\n"
-            f"Otherwise please register with a different email address."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def indepStudentUsernameAlreadyExistsEmail(request, username):
-    return {
-        "subject": f"{emailSubjectPrefix()}: Username already taken",
-        "message": f"A user is already registered with this username: {username}.\n"
-        f"If you've already registered, please login: "
-        f"{request.build_absolute_uri(reverse('independent_student_login'))}.\n"
-        f"Otherwise please register with a different username."
-        f"{emailBodySignOff(request)}",
-    }
-
-
-def joinRequestPendingEmail(request, pendingAddress):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request pending",
-        "message": (
-            f"Someone with the email address '{pendingAddress}' has asked to join your "
-            f"school or club, please go to "
-            f"{request.build_absolute_uri(reverse('dashboard'))} to view the pending "
-            f"join request."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def joinRequestSentEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request sent",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' has been sent. "
-            f"Someone will either accept or deny your request soon."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def joinRequestAcceptedEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request accepted",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' has been accepted."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def joinRequestDeniedEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request denied",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' has been denied. "
-            f"If you think this was in error you should speak to the administrator of "
-            f"that school or club."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def kickedEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: You were removed from your school or club",
-        "message": (
-            f"You have been removed from the school or club '{schoolName}'. "
-            f"If you think this was an error, please contact the administrator of that "
-            f"school or club."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def adminGivenEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: You have been made a school or club administrator",
-        "message": (
-            f"Administrator control of the school or club '{schoolName}' has been "
-            f"given to you. Go to {request.build_absolute_uri(reverse('dashboard'))} "
-            f"to start managing your school or club."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def adminRevokedEmail(request, schoolName):
-    return {
-        "subject": f"{emailSubjectPrefix()}: You are no longer a school or club administrator",
-        "message": (
-            f"Your administrator control of the school or club '{schoolName}' has been "
-            f"revoked. If you think this is an error, please contact one of the other "
-            f"administrators in your school or club."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def studentJoinRequestSentEmail(request, schoolName, accessCode):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request sent",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' in class "
-            f"{accessCode} has been sent to that class's teacher, who will either "
-            f"accept or deny your request."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def studentJoinRequestNotifyEmail(request, username, email, accessCode):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request by student {username}",
-        "message": (
-            f"There is a request waiting from student with username '{username}' and "
-            f"email {email} to join your class {accessCode}. Go to "
-            f"{request.build_absolute_uri(reverse('dashboard'))} to review the request."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def studentJoinRequestRejectedEmail(request, schoolName, accessCode):
-    return {
-        "subject": f"{emailSubjectPrefix()}: School or club join request rejected",
-        "message": (
-            f"Your request to join the school or club '{schoolName}' in class "
-            f"{accessCode} has been rejected. Speak to your teacher if you think this "
-            f"is an error."
-            f"{emailBodySignOff(request)}"
-        ),
-    }
-
-
-def inviteTeacherEmail(request):
-    return {
-        "subject": f"{emailSubjectPrefix()}: You've been invited to join Code for Life",
-        "message": (
-            f"A colleague at your school or code club has invited you to become part of "
-            f"Code for Life.\n\nPlease register your details to get started.\n\n"
-            f"{request.build_absolute_uri(reverse('register'))}"
-            f"{emailBodySignOff(request)}"
-        ),
-    }

common/fixtures/unlock_worksheet3.json

@@ -1,20 +0,0 @@
-[
-  {
-    "model": "aimmo.worksheet",
-    "pk": 3,
-    "fields": {
-      "name": "Ancient",
-      "description": "You are now familiar with your equipment and have managed to unlock the gateway to the first time checkpoint. You find yourself in a strange place, full of familiar structures in the form of ruins. After a few minutes, you hear steps and realise you\u2019re not alone! No time to move around aimlessly now, or you might run into someone! Use your navigating system to scan your surroundings and move only towards the artefacts you want to pick up. Be stealthy!",
-      "short_description": "You find yourself in a strange place, full of familiar structures in the form of ruins.",
-      "image_path": "images/worksheets/ancient.jpg",
-      "active_image_path": "images/worksheets/ancient_active.png",
-      "era": 2,
-      "thumbnail_text": "",
-      "thumbnail_image_path": "images/worksheets/lock.png",
-      "teacher_pdf_name": "Kurono_teacher_guide_3",
-      "student_pdf_name": "Kurono_challenge_3",
-      "sort_order": 300,
-      "starter_code": "#-----------------------------------------------------------------\r\n# Worksheet 3 challenges:\r\n#     - scan surroundings for artefacts\r\n#     - move towards the nearest artefact\r\n#     - pick up the artefact\r\n#\r\n# Previous subroutines: \r\n#     - MoveAction(DIRECTION)\r\n#     - world_state.get_cell(LOCATION) -> Cell\r\n#\r\n# New subroutines:\r\n#     - world_state.scan_nearby(LOCATION) -> List(Artefact)\r\n#     - MoveTowardsAction(ARTEFACT)\r\n#     - PickupAction()\r\n#-----------------------------------------------------------------\r\n\r\ndef next_turn(world_state, avatar_state):\r\n    # Your code goes here\r\n\r\n    # Scan your surroundings\r\n    \r\n    # Change this to Move action to move the avatar\r\n    action = WaitAction()\r\n    return action"
-    }
-  }
-]

common/fixtures/worksheets.json

@@ -1,98 +0,0 @@
-[
-  {
-    "model": "aimmo.worksheet",
-    "pk": 1,
-    "fields": {
-      "name": "Present Day I: The Museum",
-      "description": "While working at the Scriptsonian museum for class credit, you have accidentally activated the mysterious Kurono time machine! The museum\u2019s valuable artefacts are scattered across the shelves, the floor, the whole spacetime continuum. It\u2019s going to take more than just a backpack to collect them all. You need to use the Kurono time machine to get them back \u2013 but before jumping in you need to learn how to use its navigation system. This challenge shows you how to move around the map so you don\u2019t run into problems in the future\u2026or past.",
-      "short_description": "While working at the Scriptsonian museum for class credit, you have accidentally activated the mysterious Kurono time machine!",
-      "image_path": "images/worksheets/future.jpg",
-      "active_image_path": "images/worksheets/future_active.png",
-      "era": 1,
-      "thumbnail_text": "",
-      "thumbnail_image_path": "images/worksheets/lock.png",
-      "sort_order": 100,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  },
-  {
-    "model": "aimmo.worksheet",
-    "pk": 2,
-    "fields": {
-      "name": "Present Day II",
-      "description": "Now that you know how to navigate, it\u2019s time to clean up the evidence before leaving this timeline!  Some of the artefacts escaped the vortex and ended up all over the museum - if each of you picks ten of them up, you should be done in time to embark in your journey. But beware! The blue artefacts will need to be separated from the red ones, as they have opposing magnetic fields. Can you tell which one is what type?",
-      "short_description": "Now that you know how to navigate, it\u2019s time to clean up the evidence before leaving this timeline!",
-      "image_path": "images/worksheets/future.jpg",
-      "active_image_path": "images/worksheets/future2_active.png",
-      "era": 1,
-      "thumbnail_text": "",
-      "thumbnail_image_path": "images/worksheets/lock.png",
-      "sort_order": 200,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  },
-  {
-    "model": "aimmo.worksheet",
-    "pk": 3,
-    "fields": {
-      "name": "Ancient",
-      "description": "You are now familiar with your equipment and have managed to unlock the gateway to the first time checkpoint. You find yourself in a strange place, full of familiar structures in the form of ruins. After a few minutes, you hear steps and realise you\u2019re not alone! No time to move around aimlessly now, or you might run into someone! Use your navigating system to scan your surroundings and move only towards the artefacts you want to pick up. Be stealthy!",
-      "short_description": "You find yourself in a strange place, full of familiar structures in the form of ruins.",
-      "image_path": "images/worksheets/ancient.jpg",
-      "active_image_path": "images/worksheets/ancient_active.png",
-      "era": 2,
-      "thumbnail_text": "Coming Soon",
-      "thumbnail_image_path": "",
-      "sort_order": 300,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  },
-  {
-    "model": "aimmo.worksheet",
-    "pk": 4,
-    "fields": {
-      "name": "21st Century",
-      "description": "After successfully collecting all the missing artefacts from the first time checkpoint, you arrive at what looks like the 21st century. You recognise some cars parked here and there, old-fashioned roads and houses like the ones your history teacher told you about. On the bright side, you seem to be alone and safe to walk around... for now. A more recent timeline doesn\u2019t make artefacts easier to find, though. Or at least not the right ones. In this timeline there seems to be an amount of falsified objects that resemble the ones you\u2019re looking for, but aren\u2019t quite genuine. These will have no value in the museum. Your navigation system will be able to tell you whether an object is genuine or not, but it\u2019s up to you to decide which ones to bring back!",
-      "short_description": "After successfully collecting all the missing artefacts from the first time checkpoint, you arrive at what looks like the 21st century.",
-      "image_path": "images/worksheets/modern.jpg",
-      "active_image_path": "images/worksheets/modern_active.png",
-      "era": 3,
-      "thumbnail_text": "Coming Soon",
-      "thumbnail_image_path": "",
-      "sort_order": 400,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  },
-  {
-    "model": "aimmo.worksheet",
-    "pk": 5,
-    "fields": {
-      "name": "Prehistoric",
-      "description": "Oh no! Looks like the time machine has taken you even further back in time. You find yourself in a place that looks very\u2026 wild. You can hear the occasional distant roaring, added to the buzzing of what sound like  gigantic  insects. Vegetation is so abundant around you that you can barely move. It might be a good idea to use your navigation system to scan all around you before even trying! And don\u2019t forget to keep track of the portal that\u2019ll send you back to your original timeline - just in case something with sharp teeth starts running towards you.",
-      "short_description": "Oh no! Looks like the time machine has taken you even further back in time. You find yourself in a place that looks very\u2026 wild.",
-      "image_path": "images/worksheets/prehistory.jpg",
-      "active_image_path": "images/worksheets/prehistory_active.png",
-      "era": 4,
-      "thumbnail_text": "Coming Soon",
-      "thumbnail_image_path": "",
-      "sort_order": 500,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  },
-  {
-    "model": "aimmo.worksheet",
-    "pk": 6,
-    "fields": {
-      "name": "Back to the Future",
-      "description": "You\u2019ve made it! Well, almost. You\u2019re back to your original time, but something seems to be off. The museum is still there, with all the chaos you still need to tidy up, but the environment isn\u2019t quite right. The electronic containers and shelves seem slightly different, and when the AI interlocutor speaks, you don\u2019t recognise the language. It looks like you\u2019ve changed something in the past that affected events in your present! If you manage to extract the metadata from the recovered artefacts, you should be able to find out which timelines they were found in. You can input this text into the Kurono machine to get things back to normal.",
-      "short_description": "You\u2019ve made it! Well, almost. You\u2019re back to your original time, but something seems to be off.",
-      "image_path": "images/worksheets/broken_future.jpg",
-      "active_image_path": "images/worksheets/broken_future_active.png",
-      "era": 5,
-      "thumbnail_text": "Coming Soon",
-      "thumbnail_image_path": "",
-      "sort_order": 600,
-      "starter_code": "def next_turn(world_state, avatar_state):\r\n    new_dir = direction.NORTH\r\n    # Your code goes here\r\n    action = MoveAction(new_dir)\r\n    return action"
-    }
-  }
-]