Merge pull request #376 from uw-it-aca/task/appuser-query

update get_appuser_by_uwnetid method to return a minimal set of attri…

compass/clients/mock_person_client.py

@@ -11,4 +11,15 @@ def get_adviser_caseload(self, uwnetid):
         return self.get_persons_by_adviser_netid(uwnetid)
 
     def get_appuser_by_uwnetid(self, uwnetid):
-        return self.get_person_by_uwnetid(uwnetid)
+        return self.get_person_by_uwnetid(
+            uwnetid,
+            include_employee=False,
+            include_student=False,
+            include_student_transcripts=False,
+            include_student_transfers=False,
+            include_student_sports=False,
+            include_student_advisers=False,
+            include_student_majors=False,
+            include_student_pending_majors=False,
+            include_student_holds=False,
+            include_student_degrees=False)

compass/clients/person_client.py

@@ -108,14 +108,34 @@ def get_adviser_caseload(self, uwnetid):
         return sorted(persons.values(), key=lambda p: p.surname)
 
     def get_appuser_by_uwnetid(self, uwnetid):
+        """
+        Returns a cached "thin" person model for use with AppUser.
+        """
         cache_key = f'appuser_{uwnetid}'
 
         person_data = cache.get(cache_key)
         if person_data is not None:
             return Person().from_dict(person_data)
 
-        expires = getattr(settings, 'APPUSER_PERSON_EXPIRES', 60 * 60 * 24)
-        person = self.get_person_by_uwnetid(
-            uwnetid, include_employee=False, include_student=False)
-        cache.set(cache_key, person.to_dict(), timeout=expires)
+        sqla_person = self.DB.session.query(self.DB.Person).filter(
+            or_(self.DB.Person.uwnetid == uwnetid,
+                self.DB.Person.prior_uwnetids.any(uwnetid))
+        ).one_or_none()
+
+        if sqla_person is None:
+            raise PersonNotFoundException()
+
+        person = Person()
+        person.uwnetid = sqla_person.uwnetid
+        person.uwregid = sqla_person.uwregid
+        person.prior_uwnetids = sqla_person.prior_uwnetids
+        person.prior_uwregids = sqla_person.prior_uwregids
+        person.system_key = sqla_person.system_key
+        person.display_name = sqla_person.display_name
+
+        cache.set(
+            cache_key,
+            person.to_dict(),
+            timeout=getattr(settings, 'APPUSER_PERSON_EXPIRES', 60 * 60 * 24)
+        )
         return person

compass/fixtures/mock_pds_data/students/javerage2_9136CCB8F66711D5BE060004AC494FFE_1033334_532353230.json

@@ -52,6 +52,7 @@
         "prior_uwregids": [],
         "pronouns": "He/him/his",
         "surname": "Adviser",
+        "system_key": null,
         "uwnetid": "jadviser",
         "uwregid": "5136CCB9F66711D5BE060004AC494FF0",
         "whitepages_publish": false
@@ -379,6 +380,7 @@
     "visa_type": "F1"
   },
   "surname": "Average",
+  "system_key": "532353230",
   "uwnetid": "javerage",
   "uwregid": "9136CCB8F66711D5BE060004AC494FFE",
   "whitepages_publish": true

compass/models.py

@@ -24,8 +24,7 @@ def upsert_appuser(self, uwnetid):
         needed.
         """
         # request the current person object for the user
-        person = CompassPersonClient().get_person_by_uwnetid(
-            uwnetid, include_employee=False, include_student=False)
+        person = CompassPersonClient().get_appuser_by_uwnetid(uwnetid)
         # check the AppUser table to see if they have an existing entry
         user = None
         for netid in person.prior_uwnetids + [person.uwnetid]:

compass/tests/views/api/test_visit.py

@@ -71,7 +71,7 @@ def test_valid_student(self):
 
     @patch('compass.views.api.visit.Visit')
     @patch('compass.views.api.visit.VisitType')
-    @patch('compass.views.api.visit.UWPersonClient')
+    @patch('compass.views.api.visit.CompassPersonClient')
     @patch('compass.views.api.visit.Student')
     @patch('compass.views.api.visit.AccessGroup')
     def test_post(self, mock_access_group_cls,

compass/views/api/visit.py

@@ -5,7 +5,7 @@
 from compass.views.api import BaseAPIView, TokenAPIView
 from compass.models import Visit, Student, AccessGroup, VisitType
 from compass.serializers import VisitReadSerializer, VisitTypeSerializer
-from uw_person_client import UWPersonClient
+from compass.clients import CompassPersonClient
 from rest_framework.response import Response
 from rest_framework import status
 from dateutil import parser
@@ -51,18 +51,12 @@ def _valid_student(self, netid):
             raise ValueError('Missing Student NetID')
 
         try:
-            person = UWPersonClient().get_person_by_uwnetid(
-                netid, include_employee=False, include_student=True,
-                include_student_transcripts=False,
-                include_student_transfers=False, include_student_sports=False,
-                include_student_advisers=False, include_student_majors=False,
-                include_student_pending_majors=False,
-                include_student_holds=False, include_student_degrees=False)
+            person = CompassPersonClient().get_appuser_by_uwnetid(netid)
         except Exception as ex:
             raise ValueError(f'IC Visit Error: {netid}: {ex}')
 
-        syskey = person.student.system_key
-        student, created = Student.objects.get_or_create(system_key=syskey)
+        student, created = Student.objects.get_or_create(
+            system_key=person.system_key)
         return student
 
     def _valid_visit_type(self, name, access_group):