Merge c8f27a8 into 3133693

uw-it-aca · Jun 18, 2019 · 3fb525e · 3fb525e
2 parents 3133693 + c8f27a8
commit 3fb525e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/uw_hrp/models.py b/uw_hrp/models.py
@@ -112,6 +112,8 @@ class WorkerPosition(models.Model):
     end_date = models.DateTimeField(null=True, default=None)
     ecs_job_cla_code_desc = models.CharField(max_length=96,
                                              null=True, default=None)
+    payroll_unit_code = models.CharField(max_length=8,
+                                         null=True, default=None)
     is_future_date = models.BooleanField(default=False)
     is_primary = models.BooleanField(default=False)
     location = models.CharField(max_length=96, null=True, default=None)
@@ -134,6 +136,7 @@ def to_json(self):
                 'is_future_date': self.is_future_date,
                 'is_primary': self.is_primary,
                 'location': self.location,
+                'payroll_unit_code': self.payroll_unit_code,
                 'pos_type': self.pos_type,
                 'pos_time_type_id': self.pos_time_type_id,
                 'title': self.title,
@@ -164,6 +167,7 @@ def __init__(self, *args, **kwargs):
 
         self.ecs_job_cla_code_desc = \
             data.get("EcsJobClassificationCodeDescription")
+        self.payroll_unit_code = data.get("PayrollUnitCode")
         self.is_future_date = data.get("IsFutureDate")
         self.is_primary = data.get("IsPrimaryPosition")
         if data.get("Location") is not None:

diff --git a/uw_hrp/tests/test_models.py b/uw_hrp/tests/test_models.py
@@ -9,6 +9,9 @@
 @fdao_hrp_override
 class WorkerTest(TestCase):
 
+    def setup(self):
+        self.maxDiff = None
+
     def test_parse_date(self):
         self.assertIsNotNone(parse_date("2017-09-16T07:00:00.000Z"))
 
@@ -128,6 +131,7 @@ def test_worker_position(self):
                 'is_future_date': False,
                 "is_primary": True,
                 "location": "Seattle Campus",
+                "payroll_unit_code": "00702",
                 "pos_type": "Regular",
                 "pos_time_type_id": "Full_time",
                 "title": "Program Operations Specialist (E S 8)",
@@ -299,6 +303,7 @@ def test_worker(self):
              'is_primary': True,
              'job_profile': {'description': None, 'job_code': None},
              'location': 'Bothell Campus',
+             'payroll_unit_code': '00356',
              'pos_time_type_id': 'Full_time',
              'pos_type': 'Regular',
              'start_date': '2015-12-21 00:00:00+00:00',

diff --git a/uw_hrp/tests/test_worker.py b/uw_hrp/tests/test_worker.py
@@ -9,6 +9,9 @@
 @fdao_hrp_override
 class WorkerTest(TestCase):
 
+    def setup(self):
+        self.maxDiff = None
+
     def test_get_worker_by_netid(self):
         self.assertRaises(DataFailureException,
                           get_worker_by_netid,
@@ -41,6 +44,7 @@ def test_get_worker_by_netid(self):
                  'is_future_date': False,
                  "is_primary": True,
                  "location": "Seattle Campus",
+                 "payroll_unit_code": "00753",
                  "pos_type": "Unpaid_Academic",
                  "pos_time_type_id": "Part_time",
                  "title": "Clinical Associate Professor",
@@ -62,6 +66,7 @@ def test_get_worker_by_netid(self):
              'is_future_date': False,
              "is_primary": True,
              "location": "Seattle Campus",
+             'payroll_unit_code': '00753',
              "pos_type": "Unpaid_Academic",
              "pos_time_type_id": "Part_time",
              "title": "Clinical Associate Professor",