add functionality to check_term

SocialFinanceDigitalLabs · Oct 31, 2024 · 844510b · 844510b
1 parent 1cda17a
commit 844510b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/liiatools/common/checks.py b/liiatools/common/checks.py
@@ -78,12 +78,21 @@ def check_term(filename):
     :return: A tern within the string
     :raises ValueError: If no term is found
     """
-    match = re.search(
+    match_short = re.search(
         f"{Term.OCT.name}|{Term.JAN.name}|{Term.MAY.name}",
         filename,
         re.IGNORECASE,
     )
-    if match:
-        return Term[match.group(0).upper()].value
+    if match_short:
+        return Term[match_short.group(0).upper()].value
+
+    match_long = re.search(
+        f"{Term.OCT.value}|{Term.JAN.value}|{Term.MAY.value}",
+        filename,
+        re.IGNORECASE,
+    )
+
+    if match_long:
+        return match_long.group(0).title()
 
     raise ValueError
diff --git a/liiatools/common/reference/_authorities.yml b/liiatools/common/reference/_authorities.yml
@@ -32,4 +32,5 @@ data_codes:
     Waltham Forest: 'WAL'
     Wandsworth: 'WAN'
     Westminster: 'WES'
-    Gloucester City Council: "GCC"
+    Gloucester City Council: "GCC"
+    Cheshire West and Chester: "CWC"
diff --git a/tests/common/test_checks.py b/tests/common/test_checks.py
@@ -34,6 +34,10 @@ def test_check_term():
     assert check_term(r"jan_16/2015_16/addresses.csv") == Term.JAN.value
     assert check_term(r"MAY_16/2015_16/addresses.csv") == Term.MAY.value
 
+    assert check_term(r"autumn_15/2015_16/addresses.csv") == Term.OCT.value
+    assert check_term(r"Spring_16/2015_16/addresses.csv") == Term.JAN.value
+    assert check_term(r"SUMMER_16/2015_16/addresses.csv") == Term.MAY.value
+
 
 class TestCheckTerm(unittest.TestCase):
     def test_check_term(self):