From 46f5eb69bbf3b9ad741b6cc7140a2b889aa55752 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 14:36:29 +0000
Subject: [PATCH 01/30] fix scoring for custom levels

---
 .../custom_level_scoring_solution_file.xml    |  7 ++++
 game/end_to_end_tests/game_page.py            |  6 ++++
 game/end_to_end_tests/test_level_win.py       | 35 +++++++++++++++++++
 game/views/level.py                           |  1 +
 4 files changed, 49 insertions(+)
 create mode 100644 game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml

diff --git a/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml b/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml
new file mode 100644
index 000000000..ecf5481f4
--- /dev/null
+++ b/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml
@@ -0,0 +1,7 @@
+<xml>
+    <block type="start" deletable="false" x="230" y="130">
+        <next>
+            <block type="move_forwards"></block>
+        </next>
+    </block>
+</xml>
\ No newline at end of file
diff --git a/game/end_to_end_tests/game_page.py b/game/end_to_end_tests/game_page.py
index e76a7d7d8..747212790 100644
--- a/game/end_to_end_tests/game_page.py
+++ b/game/end_to_end_tests/game_page.py
@@ -134,6 +134,12 @@ def run_retry_program(self):
         self.browser.find_element(By.ID, "try_again_button").click()
         time.sleep(1)
         return self
+    
+    def run_custom_level_program(self):
+        self.run_program()
+        modal_content = self.browser.find_element(By.ID, "modal-content").text
+        assert_that(modal_content, not(contains_string("Algorithm score:")))
+        return self
 
     def run_crashing_program(self):
         return self._run_failing_program("What went wrong")
diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index ec10d9391..d6df27746 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -1,7 +1,10 @@
 from game.end_to_end_tests.base_game_test import BaseGameTest
+from game.models import Level
 
 
 class TestLevelWin(BaseGameTest):
+    custom_level = None
+
     def test_deliver_everywhere(self):
         self.deliver_everywhere_test(level=16)
 
@@ -10,3 +13,35 @@ def test_try_again_if_not_full_score(self):
             level=19, workspace_file="complete_level_not_with_full_score"
         )
         self.complete_and_check_level(19, page)
+
+    def test_custom_level_scoring(self):
+        user_profile = self.login_once()
+        TestLevelWin.custom_level.owner = user_profile
+        TestLevelWin.custom_level.save()
+        workspace_id = self.use_workspace("custom_level_scoring_solution_file", user_profile)
+        self.go_to_custom_level(TestLevelWin.custom_level).load_solution(workspace_id).run_custom_level_program()
+
+    @classmethod
+    def setUpClass(cls):
+        BaseGameTest.setUpClass()
+
+        TestLevelWin.custom_level = Level(
+            name="Custom level",
+            anonymous=False,
+            blocklyEnabled=True,
+            character=van,
+            cows='[]',
+            default=False,
+            destinations="[[3,4]]",
+            direct_drive=True,
+            fuel_gauge=False,
+            max_fuel=50,
+            model_solution="[1]",
+            origin='{"coordinate":[3,5],"direction":"S"}',
+            path='[{"coordinate":[3,5],"connectedNodes":[1]},{"coordinate":[3,4],' '"connectedNodes":[0]}]',
+            pythonEnabled=False,
+            theme=grass,
+            threads=1,
+            traffic_lights="[]",
+        )
+
diff --git a/game/views/level.py b/game/views/level.py
index d6808f99a..29287f821 100644
--- a/game/views/level.py
+++ b/game/views/level.py
@@ -38,6 +38,7 @@ def play_custom_level_from_editor(request, levelId):
 
 def play_custom_level(request, levelId, from_editor=False):
     level = cached_custom_level(levelId)
+    level.disable_algorithm_score = True
     if level.default:
         raise Http404
 

From 260b9623858ad0e2140ef205f78f4842b6b7b793 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 14:42:48 +0000
Subject: [PATCH 02/30] debug test

---
 game/end_to_end_tests/test_level_win.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index d6df27746..bc2d14cdd 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -1,6 +1,7 @@
 from game.end_to_end_tests.base_game_test import BaseGameTest
 from game.models import Level
 
+from game.character import get_character
 
 class TestLevelWin(BaseGameTest):
     custom_level = None
@@ -29,7 +30,7 @@ def setUpClass(cls):
             name="Custom level",
             anonymous=False,
             blocklyEnabled=True,
-            character=van,
+            character=get_character("Van"),
             cows='[]',
             default=False,
             destinations="[[3,4]]",

From 5f9d16da57f30deb80d6f0dae348126160462088 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 14:49:37 +0000
Subject: [PATCH 03/30] debug test

---
 game/end_to_end_tests/test_level_win.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index bc2d14cdd..380755fef 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -2,6 +2,7 @@
 from game.models import Level
 
 from game.character import get_character
+from game.theme import get_theme
 
 class TestLevelWin(BaseGameTest):
     custom_level = None
@@ -41,7 +42,7 @@ def setUpClass(cls):
             origin='{"coordinate":[3,5],"direction":"S"}',
             path='[{"coordinate":[3,5],"connectedNodes":[1]},{"coordinate":[3,4],' '"connectedNodes":[0]}]',
             pythonEnabled=False,
-            theme=grass,
+            theme=get_theme(name="grass"),
             threads=1,
             traffic_lights="[]",
         )

From 914feb87fdf04c608c36ce97245063d33275baec Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 15:02:39 +0000
Subject: [PATCH 04/30] debug test

---
 game/end_to_end_tests/game_page.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/end_to_end_tests/game_page.py b/game/end_to_end_tests/game_page.py
index 747212790..3706f1b3c 100644
--- a/game/end_to_end_tests/game_page.py
+++ b/game/end_to_end_tests/game_page.py
@@ -136,7 +136,7 @@ def run_retry_program(self):
         return self
     
     def run_custom_level_program(self):
-        self.run_program()
+        self.run_program("close_button")
         modal_content = self.browser.find_element(By.ID, "modal-content").text
         assert_that(modal_content, not(contains_string("Algorithm score:")))
         return self

From 7beb67cd238b23519b2bab62201655b2ae12df7e Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 15:21:15 +0000
Subject: [PATCH 05/30] debug test

---
 game/end_to_end_tests/test_level_win.py | 12 ++++++------
 game/tests/test_level_editor.py         | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index 380755fef..4ec2d8502 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -16,12 +16,12 @@ def test_try_again_if_not_full_score(self):
         )
         self.complete_and_check_level(19, page)
 
-    def test_custom_level_scoring(self):
-        user_profile = self.login_once()
-        TestLevelWin.custom_level.owner = user_profile
-        TestLevelWin.custom_level.save()
-        workspace_id = self.use_workspace("custom_level_scoring_solution_file", user_profile)
-        self.go_to_custom_level(TestLevelWin.custom_level).load_solution(workspace_id).run_custom_level_program()
+    # def test_custom_level_scoring(self):
+    #     user_profile = self.login_once()
+    #     TestLevelWin.custom_level.owner = user_profile
+    #     TestLevelWin.custom_level.save()
+    #     workspace_id = self.use_workspace("custom_level_scoring_solution_file", user_profile)
+    #     self.go_to_custom_level(TestLevelWin.custom_level).load_solution(workspace_id).run_custom_level_program()
 
     @classmethod
     def setUpClass(cls):
diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index a4c538ff6..0ed33ee8a 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -392,6 +392,20 @@ def test_level_loading_with_multiple_houses(self):
         assert response.status_code == 200
         assert response_data["level"]["destinations"] == "[[3,4], [3,3]]"
 
+    def test_custom_level_scoring(self):
+        email1, password1 = signup_teacher_directly()
+
+        teacher1 = Teacher.objects.get(new_user__email=email1)
+
+        self.login(email1, password1)
+        level = create_save_level_with_multiple_houses(teacher1)
+        url = reverse("load_level_for_editor", kwargs={"levelID": level.id})
+        response = self.client.get(url)
+        response_data = response.json()
+
+        assert response.status_code == 200
+        assert response_data["level"]["disable_algorithm_score"] == True
+
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts
         email1, password1 = signup_teacher_directly()

From 218c47a0b40dc3cbfc0fcb03a88695cdd62191a9 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 15:39:42 +0000
Subject: [PATCH 06/30] debug test

---
 game/tests/test_level_editor.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 0ed33ee8a..dfe38ab2a 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -399,7 +399,8 @@ def test_custom_level_scoring(self):
 
         self.login(email1, password1)
         level = create_save_level_with_multiple_houses(teacher1)
-        url = reverse("load_level_for_editor", kwargs={"levelID": level.id})
+        url = reverse("play_custom_level", kwargs={"levelId": level.id})
+
         response = self.client.get(url)
         response_data = response.json()
 

From c7897ed965966e987f359231ba47b7183fb12a80 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 16:07:51 +0000
Subject: [PATCH 07/30] debug test

---
 game/tests/test_level_editor.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index dfe38ab2a..d78e0d024 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -402,10 +402,10 @@ def test_custom_level_scoring(self):
         url = reverse("play_custom_level", kwargs={"levelId": level.id})
 
         response = self.client.get(url)
-        response_data = response.json()
+        # response_data = response.json()
 
         assert response.status_code == 200
-        assert response_data["level"]["disable_algorithm_score"] == True
+        # assert response_data["level"]["disable_algorithm_score"] == True
 
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts

From 8ff5851d39b462dc229009b14fa971bab9b7bf5d Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 16:15:07 +0000
Subject: [PATCH 08/30] debug test

---
 game/tests/test_level_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index d78e0d024..cd023d616 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -402,7 +402,7 @@ def test_custom_level_scoring(self):
         url = reverse("play_custom_level", kwargs={"levelId": level.id})
 
         response = self.client.get(url)
-        # response_data = response.json()
+        response_data = response.json()
 
         assert response.status_code == 200
         # assert response_data["level"]["disable_algorithm_score"] == True

From 216e8b7f957fbb1580e893211929aa821caf3ef3 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Thu, 23 May 2024 16:51:41 +0000
Subject: [PATCH 09/30] debug test

---
 game/templates/game/game.html   | 3 ++-
 game/tests/test_level_editor.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/game/templates/game/game.html b/game/templates/game/game.html
index c4e8df780..eb724e318 100644
--- a/game/templates/game/game.html
+++ b/game/templates/game/game.html
@@ -15,7 +15,8 @@
 	data-cows="{{level.cows|trim}}"
 	data-episode="{{level.episode.id|trim}}"
 	data-level-id="{{level.id|default_if_none:''|trim}}"
-        data-level-name="{{level.name|trim}}"
+  data-level-name="{{level.name|trim}}"
+  data-disable-algorithm-score="{{level.disable_algorithm_score|booltojs}}"
   >
     var ANONYMOUS = {{level.anonymous|booltojs}}
     var PATH = $('#data').data('path')
diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index cd023d616..f8eac7b14 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -402,7 +402,7 @@ def test_custom_level_scoring(self):
         url = reverse("play_custom_level", kwargs={"levelId": level.id})
 
         response = self.client.get(url)
-        response_data = response.json()
+        response_data = response.getElementById("data")
 
         assert response.status_code == 200
         # assert response_data["level"]["disable_algorithm_score"] == True

From 2bd70de6cf8f7e88db49f6207865a6bc66daac4f Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 10:19:11 +0000
Subject: [PATCH 10/30] debug test

---
 game/tests/test_level_editor.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index f8eac7b14..8332c0990 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -402,9 +402,11 @@ def test_custom_level_scoring(self):
         url = reverse("play_custom_level", kwargs={"levelId": level.id})
 
         response = self.client.get(url)
-        response_data = response.getElementById("data")
+        response_text = response.content
+        print(response_text)
 
         assert response.status_code == 200
+        assert_that(type(response_text), str)
         # assert response_data["level"]["disable_algorithm_score"] == True
 
     def test_level_of_anonymised_teacher_is_hidden(self):

From 7db1d81c53a9a20ad98cdffb49b11c3cb643d14b Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 10:34:07 +0000
Subject: [PATCH 11/30] debug test

---
 game/tests/test_level_editor.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 8332c0990..87f1eb5ed 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -403,10 +403,9 @@ def test_custom_level_scoring(self):
 
         response = self.client.get(url)
         response_text = response.content
-        print(response_text)
 
         assert response.status_code == 200
-        assert_that(type(response_text), str)
+        assert type(response_text) == str
         # assert response_data["level"]["disable_algorithm_score"] == True
 
     def test_level_of_anonymised_teacher_is_hidden(self):

From 164a6c624677d174ea32b673d86916e8067dfd33 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 10:42:01 +0000
Subject: [PATCH 12/30] debug test

---
 game/templates/game/game.html   | 1 -
 game/tests/test_level_editor.py | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/game/templates/game/game.html b/game/templates/game/game.html
index eb724e318..3dd17ae15 100644
--- a/game/templates/game/game.html
+++ b/game/templates/game/game.html
@@ -16,7 +16,6 @@
 	data-episode="{{level.episode.id|trim}}"
 	data-level-id="{{level.id|default_if_none:''|trim}}"
   data-level-name="{{level.name|trim}}"
-  data-disable-algorithm-score="{{level.disable_algorithm_score|booltojs}}"
   >
     var ANONYMOUS = {{level.anonymous|booltojs}}
     var PATH = $('#data').data('path')
diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 87f1eb5ed..39b0240b6 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -402,11 +402,11 @@ def test_custom_level_scoring(self):
         url = reverse("play_custom_level", kwargs={"levelId": level.id})
 
         response = self.client.get(url)
-        response_text = response.content
+        decoded_response = response.content.decode("utf-8")
+        disabled_algorithm_score = decoded_response.find("var DISABLE_ALGORITHM_SCORE = true")
 
         assert response.status_code == 200
-        assert type(response_text) == str
-        # assert response_data["level"]["disable_algorithm_score"] == True
+        assert disabled_algorithm_score > 0
 
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts

From 2f3c6ee9def01062c34afb9289e7245cb3150d94 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 10:51:17 +0000
Subject: [PATCH 13/30] tidy code

---
 .../custom_level_scoring_solution_file.xml    |  7 ----
 game/end_to_end_tests/game_page.py            |  6 ----
 game/end_to_end_tests/test_level_win.py       | 36 -------------------
 3 files changed, 49 deletions(-)
 delete mode 100644 game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml

diff --git a/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml b/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml
deleted file mode 100644
index ecf5481f4..000000000
--- a/game/end_to_end_tests/data/blockly_solutions/custom_level_scoring_solution_file.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<xml>
-    <block type="start" deletable="false" x="230" y="130">
-        <next>
-            <block type="move_forwards"></block>
-        </next>
-    </block>
-</xml>
\ No newline at end of file
diff --git a/game/end_to_end_tests/game_page.py b/game/end_to_end_tests/game_page.py
index 3706f1b3c..e76a7d7d8 100644
--- a/game/end_to_end_tests/game_page.py
+++ b/game/end_to_end_tests/game_page.py
@@ -134,12 +134,6 @@ def run_retry_program(self):
         self.browser.find_element(By.ID, "try_again_button").click()
         time.sleep(1)
         return self
-    
-    def run_custom_level_program(self):
-        self.run_program("close_button")
-        modal_content = self.browser.find_element(By.ID, "modal-content").text
-        assert_that(modal_content, not(contains_string("Algorithm score:")))
-        return self
 
     def run_crashing_program(self):
         return self._run_failing_program("What went wrong")
diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index 4ec2d8502..9f227d8f1 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -1,11 +1,6 @@
 from game.end_to_end_tests.base_game_test import BaseGameTest
-from game.models import Level
-
-from game.character import get_character
-from game.theme import get_theme
 
 class TestLevelWin(BaseGameTest):
-    custom_level = None
 
     def test_deliver_everywhere(self):
         self.deliver_everywhere_test(level=16)
@@ -16,34 +11,3 @@ def test_try_again_if_not_full_score(self):
         )
         self.complete_and_check_level(19, page)
 
-    # def test_custom_level_scoring(self):
-    #     user_profile = self.login_once()
-    #     TestLevelWin.custom_level.owner = user_profile
-    #     TestLevelWin.custom_level.save()
-    #     workspace_id = self.use_workspace("custom_level_scoring_solution_file", user_profile)
-    #     self.go_to_custom_level(TestLevelWin.custom_level).load_solution(workspace_id).run_custom_level_program()
-
-    @classmethod
-    def setUpClass(cls):
-        BaseGameTest.setUpClass()
-
-        TestLevelWin.custom_level = Level(
-            name="Custom level",
-            anonymous=False,
-            blocklyEnabled=True,
-            character=get_character("Van"),
-            cows='[]',
-            default=False,
-            destinations="[[3,4]]",
-            direct_drive=True,
-            fuel_gauge=False,
-            max_fuel=50,
-            model_solution="[1]",
-            origin='{"coordinate":[3,5],"direction":"S"}',
-            path='[{"coordinate":[3,5],"connectedNodes":[1]},{"coordinate":[3,4],' '"connectedNodes":[0]}]',
-            pythonEnabled=False,
-            theme=get_theme(name="grass"),
-            threads=1,
-            traffic_lights="[]",
-        )
-

From c6093c869936516026c30edb02a112f12dc5697c Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 10:57:22 +0000
Subject: [PATCH 14/30] tidy code pt 2

---
 game/end_to_end_tests/test_level_win.py |  3 +--
 game/templates/game/game.html           | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/game/end_to_end_tests/test_level_win.py b/game/end_to_end_tests/test_level_win.py
index 9f227d8f1..ec10d9391 100644
--- a/game/end_to_end_tests/test_level_win.py
+++ b/game/end_to_end_tests/test_level_win.py
@@ -1,7 +1,7 @@
 from game.end_to_end_tests.base_game_test import BaseGameTest
 
-class TestLevelWin(BaseGameTest):
 
+class TestLevelWin(BaseGameTest):
     def test_deliver_everywhere(self):
         self.deliver_everywhere_test(level=16)
 
@@ -10,4 +10,3 @@ def test_try_again_if_not_full_score(self):
             level=19, workspace_file="complete_level_not_with_full_score"
         )
         self.complete_and_check_level(19, page)
-
diff --git a/game/templates/game/game.html b/game/templates/game/game.html
index 3dd17ae15..ace7b34d0 100644
--- a/game/templates/game/game.html
+++ b/game/templates/game/game.html
@@ -7,15 +7,15 @@
 
 {% block scripts %}
 {{block.super}}
-<script defer id="data"
-	data-path="{{level.path|trim}}"
-	data-origin="{{level.origin|trim}}"
-	data-destinations="{{level.destinations|trim}}"
-	data-traffic-lights="{{level.traffic_lights|trim}}"
-	data-cows="{{level.cows|trim}}"
-	data-episode="{{level.episode.id|trim}}"
-	data-level-id="{{level.id|default_if_none:''|trim}}"
-  data-level-name="{{level.name|trim}}"
+  <script defer id="data"
+    data-path="{{level.path|trim}}"
+    data-origin="{{level.origin|trim}}"
+    data-destinations="{{level.destinations|trim}}"
+    data-traffic-lights="{{level.traffic_lights|trim}}"
+    data-cows="{{level.cows|trim}}"
+    data-episode="{{level.episode.id|trim}}"
+    data-level-id="{{level.id|default_if_none:''|trim}}"
+    data-level-name="{{level.name|trim}}"
   >
     var ANONYMOUS = {{level.anonymous|booltojs}}
     var PATH = $('#data').data('path')

From 3d9ce5342687d813c3ffe6889430000e8a81961f Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 12:24:01 +0000
Subject: [PATCH 15/30] address PR comments

---
 game/level_management.py        | 1 +
 game/tests/test_level_editor.py | 8 +++-----
 game/views/level_editor.py      | 2 ++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/game/level_management.py b/game/level_management.py
index ca73220dc..de412cb64 100644
--- a/game/level_management.py
+++ b/game/level_management.py
@@ -165,6 +165,7 @@ def save_level(level, data):
     level.pythonViewEnabled = data.get("pythonViewEnabled", False)
     level.theme = get_theme_by_pk(pk=data["theme"])
     level.character = get_character_by_pk(pk=data["character"])
+    level.disable_algorithm_score = data["disable_algorithm_score"]
     level.save()
 
     set_decor(level, data["decor"])
diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 39b0240b6..a8886e124 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -399,14 +399,12 @@ def test_custom_level_scoring(self):
 
         self.login(email1, password1)
         level = create_save_level_with_multiple_houses(teacher1)
-        url = reverse("play_custom_level", kwargs={"levelId": level.id})
-
+        url = reverse("save_level_for_editor", kwargs={"levelId": level.id})
         response = self.client.get(url)
-        decoded_response = response.content.decode("utf-8")
-        disabled_algorithm_score = decoded_response.find("var DISABLE_ALGORITHM_SCORE = true")
+        response_data = response.json()
 
         assert response.status_code == 200
-        assert disabled_algorithm_score > 0
+        assert response_data["level"]["disable_algorithm_score"] == True
 
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts
diff --git a/game/views/level_editor.py b/game/views/level_editor.py
index 5e2918ef7..347914dcf 100644
--- a/game/views/level_editor.py
+++ b/game/views/level_editor.py
@@ -208,6 +208,8 @@ def load_level_for_editor(request, levelID):
 def save_level_for_editor(request, levelId=None):
     """Processes a request on creation of the map in the level editor"""
     data = json.loads(request.POST["data"])
+    data["disable_algorithm_score"] = True
+    
     if ("character" not in data) or (not data["character"]):
         # Set a default, to deal with issue #1158 "Cannot save custom level"
         data["character"] = 1

From 2af162088457667d542154931ebc0737876bc358 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 12:27:17 +0000
Subject: [PATCH 16/30] debug test

---
 game/level_management.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/level_management.py b/game/level_management.py
index de412cb64..cb61a8f6f 100644
--- a/game/level_management.py
+++ b/game/level_management.py
@@ -165,7 +165,7 @@ def save_level(level, data):
     level.pythonViewEnabled = data.get("pythonViewEnabled", False)
     level.theme = get_theme_by_pk(pk=data["theme"])
     level.character = get_character_by_pk(pk=data["character"])
-    level.disable_algorithm_score = data["disable_algorithm_score"]
+    level.disable_algorithm_score = data.get("disable_algorithm_score", False)
     level.save()
 
     set_decor(level, data["decor"])

From 40ccf8d1d200b7a2b250e4cb9e79df000005c148 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 12:32:47 +0000
Subject: [PATCH 17/30] debug test

---
 game/tests/test_level_editor.py | 2 +-
 game/views/level_editor.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index a8886e124..4fa617282 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -400,7 +400,7 @@ def test_custom_level_scoring(self):
         self.login(email1, password1)
         level = create_save_level_with_multiple_houses(teacher1)
         url = reverse("save_level_for_editor", kwargs={"levelId": level.id})
-        response = self.client.get(url)
+        response = self.client.post(url)
         response_data = response.json()
 
         assert response.status_code == 200
diff --git a/game/views/level_editor.py b/game/views/level_editor.py
index 347914dcf..09a644a25 100644
--- a/game/views/level_editor.py
+++ b/game/views/level_editor.py
@@ -209,7 +209,7 @@ def save_level_for_editor(request, levelId=None):
     """Processes a request on creation of the map in the level editor"""
     data = json.loads(request.POST["data"])
     data["disable_algorithm_score"] = True
-    
+
     if ("character" not in data) or (not data["character"]):
         # Set a default, to deal with issue #1158 "Cannot save custom level"
         data["character"] = 1
@@ -271,7 +271,7 @@ def save_level_for_editor(request, levelId=None):
 
             level.save()
         response = {"id": level.id}
-        return HttpResponse(json.dumps(response), content_type="application/javascript")
+        return HttpResponse(json.dumps(response), content_type="application/json")
     else:
         return HttpResponseUnauthorized()
 

From 790f08ac721ae0bc137bee4d3fa22def5e06614f Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 12:45:56 +0000
Subject: [PATCH 18/30] try patching

---
 game/tests/test_level_editor.py |  7 +++--
 game/tests/utils/level.py       | 48 +++++++++++++++++----------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 4fa617282..d7786537b 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -1,4 +1,5 @@
 import json
+from unittest.mock import patch
 
 from common.models import Teacher
 from common.tests.utils.classes import create_class_directly
@@ -13,7 +14,7 @@
 from hamcrest import assert_that, equal_to
 
 from game.models import Level
-from game.tests.utils.level import create_save_level, create_save_level_with_multiple_houses
+from game.tests.utils.level import create_save_level, create_save_level_with_multiple_houses, multiple_house_data
 from game.tests.utils.teacher import add_teacher_to_school, create_school
 
 
@@ -392,7 +393,9 @@ def test_level_loading_with_multiple_houses(self):
         assert response.status_code == 200
         assert response_data["level"]["destinations"] == "[[3,4], [3,3]]"
 
-    def test_custom_level_scoring(self):
+    @patch("views.level_editor.json.loads")
+    def test_custom_level_scoring(self, mock_json_loader):
+        mock_json_loader.return_value = multiple_house_data
         email1, password1 = signup_teacher_directly()
 
         teacher1 = Teacher.objects.get(new_user__email=email1)
diff --git a/game/tests/utils/level.py b/game/tests/utils/level.py
index cb06fd4e0..dfe7dbb38 100644
--- a/game/tests/utils/level.py
+++ b/game/tests/utils/level.py
@@ -2,6 +2,29 @@
 from game.models import Level
 
 
+multiple_house_data = {
+    "origin": '{"coordinate":[3,5],"direction":"S"}',
+    "pythonEnabled": False,
+    "decor": [],
+    "blocklyEnabled": True,
+    "blocks": [
+        {"type": "move_forwards"},
+        {"type": "turn_left"},
+        {"type": "turn_right"},
+    ],
+    "max_fuel": "50",
+    "pythonViewEnabled": False,
+    "character": "3",
+    "name": "2",
+    "theme": 1,
+    "anonymous": False,
+    "cows": "[]",
+    "path": '[{"coordinate":[3,5],"connectedNodes":[1]},{"coordinate":[3,4],"connectedNodes":[0,2]}, {"coordinate": [3,3], "connectedNodes":[1]}]',
+    "traffic_lights": "[]",
+    "destinations": "[[3,4], [3,3]]",
+}
+
+
 def create_save_level(teacher_or_student, level_name="1", shared_with=None):
     data = {
         "origin": '{"coordinate":[3,5],"direction":"S"}',
@@ -37,30 +60,9 @@ def create_save_level(teacher_or_student, level_name="1", shared_with=None):
     return level
 
 def create_save_level_with_multiple_houses(teacher_or_student, level_name="2", shared_with=None):
-    data = {
-        "origin": '{"coordinate":[3,5],"direction":"S"}',
-        "pythonEnabled": False,
-        "decor": [],
-        "blocklyEnabled": True,
-        "blocks": [
-            {"type": "move_forwards"},
-            {"type": "turn_left"},
-            {"type": "turn_right"},
-        ],
-        "max_fuel": "50",
-        "pythonViewEnabled": False,
-        "character": "3",
-        "name": level_name,
-        "theme": 1,
-        "anonymous": False,
-        "cows": "[]",
-        "path": '[{"coordinate":[3,5],"connectedNodes":[1]},{"coordinate":[3,4],"connectedNodes":[0,2]}, {"coordinate": [3,3], "connectedNodes":[1]}]',
-        "traffic_lights": "[]",
-        "destinations": "[[3,4], [3,3]]",
-    }
-    level = Level(default=False, anonymous=data["anonymous"])
+    level = Level(default=False, anonymous=multiple_house_data["anonymous"])
     level.owner = teacher_or_student.user
-    level_management.save_level(level, data)
+    level_management.save_level(level, multiple_house_data)
     level.save()
 
     if shared_with is not None:

From f0709dff44a64d12d17ced13a288abe03df0246d Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 12:55:21 +0000
Subject: [PATCH 19/30] debug test

---
 game/tests/test_level_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index d7786537b..43db61483 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -393,7 +393,7 @@ def test_level_loading_with_multiple_houses(self):
         assert response.status_code == 200
         assert response_data["level"]["destinations"] == "[[3,4], [3,3]]"
 
-    @patch("views.level_editor.json.loads")
+    @patch("game.views.level_editor.json.loads")
     def test_custom_level_scoring(self, mock_json_loader):
         mock_json_loader.return_value = multiple_house_data
         email1, password1 = signup_teacher_directly()

From d89bbfda3aeb75a902166d7cbdc552a375fc7bca Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 14:16:21 +0000
Subject: [PATCH 20/30] address PR comments, fix test

---
 game/tests/test_level_editor.py | 16 +++++++++-------
 game/views/level.py             |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 43db61483..8d8ad8e86 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -393,21 +393,23 @@ def test_level_loading_with_multiple_houses(self):
         assert response.status_code == 200
         assert response_data["level"]["destinations"] == "[[3,4], [3,3]]"
 
-    @patch("game.views.level_editor.json.loads")
-    def test_custom_level_scoring(self, mock_json_loader):
-        mock_json_loader.return_value = multiple_house_data
+    @patch("game.level_management.save_level")
+    def test_custom_level_scoring(self, mock_save_level):
         email1, password1 = signup_teacher_directly()
 
         teacher1 = Teacher.objects.get(new_user__email=email1)
 
         self.login(email1, password1)
+
         level = create_save_level_with_multiple_houses(teacher1)
-        url = reverse("save_level_for_editor", kwargs={"levelId": level.id})
-        response = self.client.post(url)
-        response_data = response.json()
+
+        save_url = reverse("save_level_for_editor", kwargs={"levelId": level.id})
+        response = self.client.post(save_url, {"data": json.dumps(multiple_house_data)})
+
+        disable_algorithm_score = mock_save_level.call_args.args[1]["disable_algorithm_score"]
 
         assert response.status_code == 200
-        assert response_data["level"]["disable_algorithm_score"] == True
+        assert disable_algorithm_score == True
 
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts
diff --git a/game/views/level.py b/game/views/level.py
index 29287f821..d6808f99a 100644
--- a/game/views/level.py
+++ b/game/views/level.py
@@ -38,7 +38,6 @@ def play_custom_level_from_editor(request, levelId):
 
 def play_custom_level(request, levelId, from_editor=False):
     level = cached_custom_level(levelId)
-    level.disable_algorithm_score = True
     if level.default:
         raise Http404
 

From cc22888d9479a33bd7f36e72bfe5e91a8e656dd1 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 14:17:24 +0000
Subject: [PATCH 21/30] add back line

---
 game/views/level.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game/views/level.py b/game/views/level.py
index d6808f99a..29287f821 100644
--- a/game/views/level.py
+++ b/game/views/level.py
@@ -38,6 +38,7 @@ def play_custom_level_from_editor(request, levelId):
 
 def play_custom_level(request, levelId, from_editor=False):
     level = cached_custom_level(levelId)
+    level.disable_algorithm_score = True
     if level.default:
         raise Http404
 

From d824b92d6bf850dc9ae1f00d1c92518a2f74b230 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Fri, 24 May 2024 16:16:59 +0000
Subject: [PATCH 22/30] add migration, remove redundant line

---
 ...092_disable_algo_score_in_custom_levels.py | 28 +++++++++++++++++++
 game/views/level.py                           |  1 -
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 game/migrations/0092_disable_algo_score_in_custom_levels.py

diff --git a/game/migrations/0092_disable_algo_score_in_custom_levels.py b/game/migrations/0092_disable_algo_score_in_custom_levels.py
new file mode 100644
index 000000000..678f5da25
--- /dev/null
+++ b/game/migrations/0092_disable_algo_score_in_custom_levels.py
@@ -0,0 +1,28 @@
+from django.apps.registry import Apps
+from django.db import migrations
+
+def disable_algo_score_for_existing_custom_levels(apps: Apps, *args):
+    Level = apps.get_model("game", "Level")
+
+    Level.objects.filter(
+        default=False
+    ).update(disable_algorithm_score=True)
+
+def enable_algo_score_for_existing_custom_levels(apps: Apps, *args):
+    Level = apps.get_model("game", "Level")
+
+    Level.objects.filter(
+        default=False
+    ).update(disable_algorithm_score=False)
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("game", "0091_disable_algo_score_if_no_model_solution")
+    ]
+
+    operations = [
+        migrations.RunPython(
+            disable_algo_score_for_existing_custom_levels, 
+            reverse_code=enable_algo_score_for_existing_custom_levels
+        )
+    ]
\ No newline at end of file
diff --git a/game/views/level.py b/game/views/level.py
index 29287f821..d6808f99a 100644
--- a/game/views/level.py
+++ b/game/views/level.py
@@ -38,7 +38,6 @@ def play_custom_level_from_editor(request, levelId):
 
 def play_custom_level(request, levelId, from_editor=False):
     level = cached_custom_level(levelId)
-    level.disable_algorithm_score = True
     if level.default:
         raise Http404
 

From a53e87f633cda6888e7f6e68ce175ed3855c8530 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 08:14:24 +0000
Subject: [PATCH 23/30] address PR comments

---
 game/tests/test_level_editor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/tests/test_level_editor.py b/game/tests/test_level_editor.py
index 8d8ad8e86..a934fdeaf 100644
--- a/game/tests/test_level_editor.py
+++ b/game/tests/test_level_editor.py
@@ -409,7 +409,7 @@ def test_custom_level_scoring(self, mock_save_level):
         disable_algorithm_score = mock_save_level.call_args.args[1]["disable_algorithm_score"]
 
         assert response.status_code == 200
-        assert disable_algorithm_score == True
+        assert disable_algorithm_score
 
     def test_level_of_anonymised_teacher_is_hidden(self):
         # Create 2 teacher accounts

From 6634dafb21d1bf8afa1d1ecea66ec3e26e68a6f2 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 13:10:04 +0000
Subject: [PATCH 24/30] add property

---
 game/static/game/js/level_editor.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/game/static/game/js/level_editor.js b/game/static/game/js/level_editor.js
index c5fed2189..ac992800c 100644
--- a/game/static/game/js/level_editor.js
+++ b/game/static/game/js/level_editor.js
@@ -2284,6 +2284,7 @@ ocargo.LevelEditor = function(levelId) {
         // Other data
         state.theme = currentTheme.id;
         state.character = $('#character_select').val();
+        state.disableAlgorithmScore = true;
 
         return state;
     }

From 0080f52725717093cab98a686b33a01fe23a9cc8 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 13:12:59 +0000
Subject: [PATCH 25/30] fix typo

---
 game/static/game/js/level_editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/static/game/js/level_editor.js b/game/static/game/js/level_editor.js
index ac992800c..96b0f7739 100644
--- a/game/static/game/js/level_editor.js
+++ b/game/static/game/js/level_editor.js
@@ -2284,7 +2284,7 @@ ocargo.LevelEditor = function(levelId) {
         // Other data
         state.theme = currentTheme.id;
         state.character = $('#character_select').val();
-        state.disableAlgorithmScore = true;
+        state.disable_algorithm_score = true;
 
         return state;
     }

From 347c22439bddff62696d930c52a3fbd15b03c9b9 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 13:44:23 +0000
Subject: [PATCH 26/30] add log lines

---
 game/static/game/js/level_editor/owned_levels.js | 8 ++++++++
 game/static/game/js/saving.js                    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/game/static/game/js/level_editor/owned_levels.js b/game/static/game/js/level_editor/owned_levels.js
index 079c9e915..fbb9eabb4 100644
--- a/game/static/game/js/level_editor/owned_levels.js
+++ b/game/static/game/js/level_editor/owned_levels.js
@@ -42,12 +42,20 @@ ocargo.OwnedLevels.prototype.save = function(level, id, finishedCallback) {
     this.saving.saveLevel(level, id, false, function(newId) {
         delete level.name;
 
+        console.log(JSON.stringify(this.saveState));
+
         this.saveState.saved(level, newId);
 
+        console.log("saved")
+
         this.update();
 
+        console.log("updated")
+
         if (finishedCallback) {
+            console.log("callback starting")
             finishedCallback();
+            console.log("callback done")
         }
         window.location.replace("/rapidrouter/level_editor/" + newId +"/");
     }.bind(this), handleError.bind(this));
diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index 0d18927a0..8704c78b0 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -209,6 +209,7 @@ ocargo.Saving.prototype.deleteLevel = function (id, callback, errorCallback) {
 };
 
 ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, errorCallback) {
+    console.log(JSON.stringify(level));
     csrftoken = Cookies.get('csrftoken');
     level.anonymous = anonymous;
     $.ajax({

From b0c5fade64ee5667884a1e95c1aed39754e869f1 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 14:30:01 +0000
Subject: [PATCH 27/30] debug test

---
 game/static/game/js/saving.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index 8704c78b0..26b3db5de 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -215,7 +215,6 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
     $.ajax({
         url: (id ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
         type: 'POST',
-        dataType: 'json',
         data: {data: JSON.stringify(level)},
         beforeSend: function (xhr, settings) {
             if (!csrfSafeMethod(settings.type) && !this.crossDomain) {

From fa5305e78b6f58669ba6c2a53e9605b3aecf2541 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 15:02:46 +0000
Subject: [PATCH 28/30] debug test

---
 game/static/game/js/saving.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index 26b3db5de..92d6e0831 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -212,7 +212,7 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
     console.log(JSON.stringify(level));
     csrftoken = Cookies.get('csrftoken');
     level.anonymous = anonymous;
-    $.ajax({
+    let testResult = $.ajax({
         url: (id ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
         type: 'POST',
         data: {data: JSON.stringify(level)},
@@ -228,6 +228,7 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
             errorCallback(xhr.status + ": " + errmsg + " " + err + " " + xhr.responseText);
         }
     });
+    console.log(testResult);
     delete level.anonymous;
 };
 

From 855fc305da9abc7d7cb85b2f3a388fe47474a5d5 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Tue, 28 May 2024 15:34:37 +0000
Subject: [PATCH 29/30] test change to ajax url

---
 game/static/game/js/saving.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index 92d6e0831..a761c8c57 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -210,11 +210,14 @@ ocargo.Saving.prototype.deleteLevel = function (id, callback, errorCallback) {
 
 ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, errorCallback) {
     console.log(JSON.stringify(level));
+    let url = (id && id > 0) ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor();
+    console.log(url);
     csrftoken = Cookies.get('csrftoken');
     level.anonymous = anonymous;
     let testResult = $.ajax({
-        url: (id ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
+        url: ((id && id > 0) ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
         type: 'POST',
+        dataType: 'json',
         data: {data: JSON.stringify(level)},
         beforeSend: function (xhr, settings) {
             if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
@@ -228,7 +231,7 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
             errorCallback(xhr.status + ": " + errmsg + " " + err + " " + xhr.responseText);
         }
     });
-    console.log(testResult);
+    console.log(testResult.data);
     delete level.anonymous;
 };
 

From 9f2fa7f25165b92c931af33313da03fd4f5767e8 Mon Sep 17 00:00:00 2001
From: Eve Martin <eve.martin@ocado.com>
Date: Wed, 29 May 2024 08:41:24 +0000
Subject: [PATCH 30/30] revert changes used for testing

---
 game/static/game/js/level_editor/owned_levels.js | 8 --------
 game/static/game/js/saving.js                    | 8 ++------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/game/static/game/js/level_editor/owned_levels.js b/game/static/game/js/level_editor/owned_levels.js
index fbb9eabb4..079c9e915 100644
--- a/game/static/game/js/level_editor/owned_levels.js
+++ b/game/static/game/js/level_editor/owned_levels.js
@@ -42,20 +42,12 @@ ocargo.OwnedLevels.prototype.save = function(level, id, finishedCallback) {
     this.saving.saveLevel(level, id, false, function(newId) {
         delete level.name;
 
-        console.log(JSON.stringify(this.saveState));
-
         this.saveState.saved(level, newId);
 
-        console.log("saved")
-
         this.update();
 
-        console.log("updated")
-
         if (finishedCallback) {
-            console.log("callback starting")
             finishedCallback();
-            console.log("callback done")
         }
         window.location.replace("/rapidrouter/level_editor/" + newId +"/");
     }.bind(this), handleError.bind(this));
diff --git a/game/static/game/js/saving.js b/game/static/game/js/saving.js
index a761c8c57..0d18927a0 100644
--- a/game/static/game/js/saving.js
+++ b/game/static/game/js/saving.js
@@ -209,13 +209,10 @@ ocargo.Saving.prototype.deleteLevel = function (id, callback, errorCallback) {
 };
 
 ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, errorCallback) {
-    console.log(JSON.stringify(level));
-    let url = (id && id > 0) ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor();
-    console.log(url);
     csrftoken = Cookies.get('csrftoken');
     level.anonymous = anonymous;
-    let testResult = $.ajax({
-        url: ((id && id > 0) ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
+    $.ajax({
+        url: (id ? Urls.save_level_for_editor(id) : Urls.save_level_for_editor()),
         type: 'POST',
         dataType: 'json',
         data: {data: JSON.stringify(level)},
@@ -231,7 +228,6 @@ ocargo.Saving.prototype.saveLevel = function (level, id, anonymous, callback, er
             errorCallback(xhr.status + ": " + errmsg + " " + err + " " + xhr.responseText);
         }
     });
-    console.log(testResult.data);
     delete level.anonymous;
 };