Merge pull request #34 from uw-it-aca/main

main back to qa
uw-it-aca · May 4, 2023 · 8a58e30 · 8a58e30
2 parents 993ee77 + 476c6bc
commit 8a58e30
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -44,7 +44,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 
@@ -82,7 +82,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: 3.8
 

diff --git a/uw_hrp/models.py b/uw_hrp/models.py
@@ -35,11 +35,14 @@ def get_emp_program_job_class(job_classification_summaries):
 
 
 def get_org_code_name(organization_name):
-    if organization_name and ": " in organization_name:
+    org_code = ""
+    org_name = organization_name
+    if ": " in organization_name:
         (org_code, org_name) = organization_name.split(": ", 1)
-        if " (" in org_name:
-            org_name = org_name.split(" (", 1)[0]
-        return org_code.strip(), org_name.strip()
+
+    if " (" in org_name:
+        org_name = org_name.split(" (", 1)[0]
+    return org_code.strip(), org_name.strip()
 
 
 class EmploymentStatus(models.Model):
@@ -180,7 +183,7 @@ def __init__(self, *args, **kwargs):
         self.end_date = parse_date(data.get("PositionVacateDate"))
         self.start_date = parse_date(data.get("StartDate"))
 
-        if (data.get("SupervisoryOrganization") is not None and
+        if (data.get("SupervisoryOrganization") and
                 data["SupervisoryOrganization"].get("Name") is not None):
             self.org_code, self.org_name = get_org_code_name(
                 data["SupervisoryOrganization"]["Name"])

diff --git a/uw_hrp/tests/test_models.py b/uw_hrp/tests/test_models.py
@@ -45,6 +45,11 @@ def test_get_org_code_name(self):
         self.assertEqual(code, "CAS")
         self.assertEqual(name, "Chemistry: Theberge JM Student")
 
+        # exceptional case
+        code, name = get_org_code_name("School of Law (Lawson, Tamara F)")
+        self.assertEqual(code, "")
+        self.assertEqual(name, "School of Law")
+
     def test_employment_status(self):
         emp_status0 = EmploymentStatus(status="Active", is_active=True)
         self.assertIsNotNone(emp_status0)