Merge pull request #186 from uw-it-aca/feature/person-resident-code

adds support for accessing resident code
uw-it-aca · Aug 22, 2022 · 7107606 · 7107606
2 parents 8fb1b5e + feabced
commit 7107606
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/uw_sws/models.py b/uw_sws/models.py
@@ -101,6 +101,7 @@ class SwsPerson(models.Model):
     permanent_phone = models.CharField(max_length=64, null=True, blank=True)
     visa_type = models.CharField(max_length=2, null=True, blank=True)
     veteran_code = models.CharField(max_length=2)
+    resident_code = models.SmallIntegerField(null=True)
 
     def is_veteran(self):
         return self.veteran_code != "0"
@@ -130,7 +131,8 @@ def json_data(self):
                 self.permanent_address),
             'permanent_phone': self.permanent_phone,
             'visa_type': self.visa_type,
-            'veteran_code': self.veteran_code
+            'veteran_code': self.veteran_code,
+            'resident_code': self.resident_code
                 }
 
     def __str__(self):
@@ -1151,13 +1153,13 @@ def wont_meet(self):
         return self.meeting_type == SectionMeeting.NON_MEETING
 
     def no_meeting(self):
-        return not(self.meets_monday or
-                   self.meets_tuesday or
-                   self.meets_wednesday or
-                   self.meets_thursday or
-                   self.meets_friday or
-                   self.meets_saturday or
-                   self.meets_sunday)
+        return not (self.meets_monday or
+                    self.meets_tuesday or
+                    self.meets_wednesday or
+                    self.meets_thursday or
+                    self.meets_friday or
+                    self.meets_saturday or
+                    self.meets_sunday)
 
     def json_data(self):
         data = {

diff --git a/uw_sws/person.py b/uw_sws/person.py
@@ -79,5 +79,6 @@ def _process_json_data(person_data):
     person.student_system_key = person_data.get("StudentSystemKey")
     person.uwnetid = person_data.get("UWNetID")
     person.visa_type = person_data.get("VisaType")
+    person.resident_code = person_data.get("Resident")
 
     return person
diff --git a/uw_sws/tests/test_person.py b/uw_sws/tests/test_person.py
@@ -51,6 +51,7 @@ def test_person_resource(self):
                           "/student/v5/term/2013,autumn.json")
         self.assertEquals(data.last_enrolled.quarter, "autumn")
         self.assertEquals(data.last_enrolled.year, 2013)
+        self.assertEquals(data.resident_code, 1)
 
     def test_person_jinter(self):
         data = get_person_by_regid("9136CCB8F66711D5BE060004AC494F31")
@@ -88,6 +89,7 @@ def test_person_jinter(self):
         self.assertEquals(data.permanent_address.postal_code, "400001")
         self.assertEquals(data.permanent_address.state, "Mumbai")
         self.assertEquals(data.permanent_address.zip_code, "")
+        self.assertIsNone(data.resident_code)
 
         data = get_person_by_regid("12345678901234567890123456789012")
         self.assertTrue(data.is_J1())
@@ -115,6 +117,7 @@ def test_person_none(self):
         self.assertIsNone(data.local_address)
         self.assertIsNone(data.permanent_phone)
         self.assertIsNone(data.permanent_address)
+        self.assertIsNone(data.resident_code)
 
     def test_json_datat(self):
         data = get_person_by_regid("9136CCB8F66711D5BE060004AC494FFE")