From 37d4e0fbf505ff56b3e0116c32fd1736c2325ef0 Mon Sep 17 00:00:00 2001
From: Martin <martin.knezevic1@gmail.com>
Date: Thu, 24 Oct 2024 21:23:01 +1100
Subject: [PATCH] fix ethics prereqs (#1201)

* fix ethics by making prereq preprocess pattern recognise it

* update test
---
 backend/data/final_data/conditions.pkl        | Bin 286971 -> 286877 bytes
 .../data/final_data/conditionsProcessed.json  |   2 +-
 backend/data/final_data/conditionsTokens.json |  16 +++-------------
 .../processors/conditions_preprocessing.py    |   2 +-
 .../data/processors/manual_fixes/COMPFixes.py |   8 --------
 .../test_courses_unlocked_when_taken.py       |   2 +-
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/backend/data/final_data/conditions.pkl b/backend/data/final_data/conditions.pkl
index add86bff7e90a9fd7e7df78461ec7f9351b266fc..8ecece05d0fd1ae2d9c782177a7942600d22a8a5 100644
GIT binary patch
delta 4872
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
BsOkU!

delta 4663
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
Cl34=)

diff --git a/backend/data/final_data/conditionsProcessed.json b/backend/data/final_data/conditionsProcessed.json
index a9e9c48ce..2c689aba6 100644
--- a/backend/data/final_data/conditionsProcessed.json
+++ b/backend/data/final_data/conditionsProcessed.json
@@ -3760,7 +3760,7 @@
     },
     "COMP4920": {
         "original": "Prerequisite: Completion of 18 UOC of COMP**** courses<br/><br/>",
-        "processed": "(COMP2511 || COMP2911) && 96UOC && (COMP?1 || COMP?H)"
+        "processed": "18UOC in COMP"
     },
     "COMP4951": {
         "original": "Prerequisite: Enrolled in a CSE BE (Hons) programs, completion of 126 UOC and completion of 3rd year core.<br/><br/>",
diff --git a/backend/data/final_data/conditionsTokens.json b/backend/data/final_data/conditionsTokens.json
index e6d5471e0..4bc178ecb 100644
--- a/backend/data/final_data/conditionsTokens.json
+++ b/backend/data/final_data/conditionsTokens.json
@@ -8465,19 +8465,9 @@
     ],
     "COMP4920": [
         "(",
-        "(",
-        "COMP2511",
-        "||",
-        "COMP2911",
-        ")",
-        "&&",
-        "96UOC",
-        "&&",
-        "(",
-        "COMP?1",
-        "||",
-        "COMP?H",
-        ")",
+        "18UOC",
+        "in",
+        "COMP",
         ")"
     ],
     "COMP4951": [
diff --git a/backend/data/processors/conditions_preprocessing.py b/backend/data/processors/conditions_preprocessing.py
index b3f69fe6b..7827fc56e 100644
--- a/backend/data/processors/conditions_preprocessing.py
+++ b/backend/data/processors/conditions_preprocessing.py
@@ -556,7 +556,7 @@ def uoc_in_business_school(processed: str) -> str:
     return processed
 
 def uoc_in_school(processed: str) -> str:
-    return re.sub(r"(\d+UOC) (in|of|at) ([A-Z]{4}) courses", r"\1 in \3", processed)
+    return re.sub(r"(\d+ *UOC) (in|of|at) ([A-Z]{4})(\*{4})? courses", r"\1 in \3", processed)
 
 def l2_math_courses(processed: str) -> str:
     """Converts L2 Maths courses to L@ MATH"""
diff --git a/backend/data/processors/manual_fixes/COMPFixes.py b/backend/data/processors/manual_fixes/COMPFixes.py
index fa6ac2739..2c1dc189e 100644
--- a/backend/data/processors/manual_fixes/COMPFixes.py
+++ b/backend/data/processors/manual_fixes/COMPFixes.py
@@ -30,7 +30,6 @@ def fix_conditions():
     CONDITIONS["COMP3901"] = COMP_3901_2(CONDITIONS["COMP3901"])
     CONDITIONS["COMP3902"] = COMP_3901_2(CONDITIONS["COMP3902"])
     CONDITIONS["COMP4141"][PROCESSED] = COMP_4141()
-    CONDITIONS["COMP4920"][PROCESSED] = COMP_4920()
     CONDITIONS["COMP4951"] = COMP_4951(CONDITIONS["COMP4951"])
     CONDITIONS["COMP4952"][PROCESSED] = COMP_4952()
     CONDITIONS["COMP4953"][PROCESSED] = COMP_4953()
@@ -127,13 +126,6 @@ def COMP_4141():
     """
     return "MATH1081 && (COMP1927 || COMP2521)"
 
-def COMP_4920():
-    """
-        "original": "Prerequisite: (COMP2511 or COMP2911) and completion of 96 UOC in Computer Science.<br/><br/>",
-        "processed": "(COMP2511 || COMP2911) && 96UOC in Computer Science"
-    """
-    return "(COMP2511 || COMP2911) && 96UOC && (COMP?1 || COMP?H)"
-
 def COMP_4951(conditions):
     """
     "original": "Prerequisite: Enrolled in a CSE BE (Hons) programs, completion of 126 UOC and completion of 3rd year core.<br/><br/>"
diff --git a/backend/server/tests/courses/test_courses_unlocked_when_taken.py b/backend/server/tests/courses/test_courses_unlocked_when_taken.py
index 460a9971b..06716a438 100644
--- a/backend/server/tests/courses/test_courses_unlocked_when_taken.py
+++ b/backend/server/tests/courses/test_courses_unlocked_when_taken.py
@@ -96,5 +96,5 @@ def test_two_courses_completed():
             "COMP9727",
             "MTRN2500",
         ],
-        "indirect_unlock": ["BABS3301", "BEIL0011", "MUSC2117", "TABL2710"]
+        "indirect_unlock": ["BABS3301", "BEIL0011", "COMP4920", "MUSC2117", "TABL2710"]
     }