add model test

uw-it-aca · Oct 18, 2019 · 4ebba29 · 4ebba29
1 parent b6cdce7
commit 4ebba29
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/uw_hrp/models.py b/uw_hrp/models.py
@@ -260,20 +260,20 @@ def to_json(self):
                 'is_active': self.is_active,
                 'is_current_faculty': self.is_current_faculty,
                 'workday_person_type': self.workday_person_type,
-                'href': self.worker_href}
+                'href': self.href}
 
     def __str__(self):
         return json.dumps(self.to_json())
 
     def __init__(self, *args, **kwargs):
         data = kwargs.get("data")
         if data is None:
-            return super(Worker, self).__init__(*args, **kwargs)
+            return super(WorkerRef, self).__init__(*args, **kwargs)
         self.netid = data.get("NetID")
         self.regid = data.get("RegID")
         self.employee_id = data.get("EmployeeID")
         self.employee_status = data.get("EmployeeStatus")
         self.is_active = data.get("IsActive")
         self.is_current_faculty = data.get("IsCurrentFaculty")
         self.workday_person_type = data.get("WorkdayPersonType")
-        self.worker_href = data.get("Href")
+        self.href = data.get("Href")
diff --git a/uw_hrp/tests/test_models.py b/uw_hrp/tests/test_models.py
@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta, timezone
 from uw_hrp.models import (
     EmploymentStatus, JobProfile, SupervisoryOrganization,
-    Worker, WorkerPosition, parse_date)
+    Worker, WorkerPosition, parse_date, WorkerRef)
 from uw_hrp.util import fdao_hrp_override
 
 
@@ -337,3 +337,31 @@ def test_worker(self):
         self.assertTrue(worker.employee_status.is_terminated)
         self.assertFalse(worker.employee_status.is_active)
         self.assertIsNotNone(str(worker))
+
+    def test_workerref(self):
+        regid = '10000000000000000000000000000005'
+        wr = WorkerRef(netid="test", regid=regid)
+        self.assertIsNotNone(wr)
+        print(wr)
+        wr = WorkerRef(
+            data={
+                'Href': '/hrp/v2/worker/{}.json'.format(regid), 
+                'EmployeeID': '000000005',
+                'EmployeeStatus': 'Active',
+                'IsActive': True,
+                'NetID': 'faculty',
+                'RegID': '10000000000000000000000000000005',
+                'IsCurrentFaculty': True,
+                'WorkdayPersonType': 'Employee'})
+        self.assertFalse(wr.is_terminated())
+        self.assertEqual(
+            wr.to_json(),
+            {'employee_id': '000000005',
+             'employee_status': 'Active',
+             'is_active': True,
+             'is_current_faculty': True,
+             'netid': 'faculty',
+             'regid': '10000000000000000000000000000005',
+             'workday_person_type': 'Employee',
+             'href': '/hrp/v2/worker/10000000000000000000000000000005.json'})
+        self.assertIsNotNone(str(wr))
diff --git a/uw_hrp/tests/test_worker.py b/uw_hrp/tests/test_worker.py
@@ -111,16 +111,5 @@ def test_worker_search(self):
         worker_refs = worker_search(changed_since=2019)
         self.assertEqual(len(worker_refs), 2)
         self.assertEqual(worker_refs[0].netid, "faculty")
-        self.assertEqual(
-            worker_refs[0].to_json(),
-            {'employee_id': '000000005',
-             'employee_status': 'Active',
-             'is_active': True,
-             'is_current_faculty': True,
-             'netid': 'faculty',
-             'regid': '10000000000000000000000000000005',
-             'workday_person_type': 'Employee',
-             'href': '/hrp/v2/worker/10000000000000000000000000000005.json'})
-        self.assertIsNotNone(str(worker_refs[0]))
         self.assertTrue(worker_refs[1].is_terminated())
         self.assertEqual(worker_refs[1].netid, "chair")