Merge pull request #355 from uw-it-aca/develop

Develop
uw-it-aca · Jan 6, 2024 · 133509b · 133509b
2 parents 9ba5f26 + a7e1d15
commit 133509b
Show file tree

Hide file tree

Showing 58 changed files with 130 additions and 70 deletions.
diff --git a/compass/admin.py b/compass/admin.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/apps.py b/compass/apps.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/cache.py b/compass/cache.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/clients/__init__.py b/compass/clients/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/clients/mock_person_client.py b/compass/clients/mock_person_client.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -9,3 +9,6 @@ class MockedCompassPersonClient(MockedUWPersonClient):
 
     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)
diff --git a/compass/clients/person_client.py b/compass/clients/person_client.py
@@ -1,7 +1,8 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
-
+from django.conf import settings
+from django.core.cache import cache
 from uw_person_client import UWPersonClient
 from uw_person_client.components import Person, Student, Transcript, Degree
 from uw_person_client.exceptions import (
@@ -103,3 +104,16 @@ def get_adviser_caseload(self, uwnetid):
 
         # sorting by display name, can't get it to work in SQL-Alchemy
         return sorted(persons.values(), key=lambda p: p.display_name)
+
+    def get_appuser_by_uwnetid(self, uwnetid):
+        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)
+        return person
diff --git a/compass/context_processors.py b/compass/context_processors.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/dao/__init__.py b/compass/dao/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/dao/group.py b/compass/dao/group.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/dao/person.py b/compass/dao/person.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from uw_pws import PWS, InvalidNetID, DataFailureException

diff --git a/compass/dao/photo.py b/compass/dao/photo.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 import random

diff --git a/compass/dao/term.py b/compass/dao/term.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/exceptions.py b/compass/exceptions.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/logging.py b/compass/logging.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from logging import Filter

diff --git a/compass/management/commands/create_token.py b/compass/management/commands/create_token.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.contrib.auth.models import User

diff --git a/compass/management/commands/fix_student_syskey_padding.py b/compass/management/commands/fix_student_syskey_padding.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/management/commands/initialize_db.py b/compass/management/commands/initialize_db.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/management/commands/load_legacy_affiliations.py b/compass/management/commands/load_legacy_affiliations.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/management/commands/load_legacy_data.py b/compass/management/commands/load_legacy_data.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/management/commands/load_legacy_ic_visits.py b/compass/management/commands/load_legacy_ic_visits.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/models.py b/compass/models.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -24,7 +24,8 @@ def upsert_appuser(self, uwnetid):
         needed.
         """
         # request the current person object for the user
-        person = CompassPersonClient().get_person_by_uwnetid(uwnetid)
+        person = CompassPersonClient().get_person_by_uwnetid(
+            uwnetid, include_employee=False, include_student=False)
         # check the AppUser table to see if they have an existing entry
         user = None
         for netid in person.prior_uwnetids + [person.uwnetid]:
@@ -76,6 +77,12 @@ class Meta:
     def __str__(self):
         return f"{self.uwnetid}"
 
+    @property
+    def display_name(self):
+        if self.uwnetid:
+            person = CompassPersonClient().get_appuser_by_uwnetid(self.uwnetid)
+            return person.display_name
+
 
 class Student(models.Model):
     """

diff --git a/compass/serializers.py b/compass/serializers.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 
@@ -23,9 +23,11 @@
 
 
 class AppUserSerializer(serializers.ModelSerializer):
+    display_name = serializers.CharField()
+
     class Meta:
         model = AppUser
-        fields = ["id", "uwnetid"]
+        fields = ["id", "uwnetid", "display_name"]
         extra_kwargs = {
             "uwnetid": {"validators": []},
         }

diff --git a/compass/templatetags/vite.py b/compass/templatetags/vite.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/__init__.py b/compass/tests/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/commands/test_fix_student_syskey_padding.py b/compass/tests/commands/test_fix_student_syskey_padding.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/dao/test_datetime.py b/compass/tests/dao/test_datetime.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/dao/test_person.py b/compass/tests/dao/test_person.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/dao/test_photo.py b/compass/tests/dao/test_photo.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/dao/test_term.py b/compass/tests/dao/test_term.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/models/test_appuser.py b/compass/tests/models/test_appuser.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.test import TestCase
@@ -10,12 +10,14 @@ class AppUserTest(TestCase):
     def test_upsert_create(self):
         user = AppUser.objects.upsert_appuser("javerage")
         self.assertEqual(user.uwnetid, "javerage")
+        self.assertEqual(user.display_name, "Jamesy McJamesy")
         self.assertEqual(len(AppUser.objects.filter(uwnetid="javerage")), 1)
 
     def test_upsert_update(self):
         AppUser(uwnetid="jadviser1").save()
         user = AppUser.objects.upsert_appuser("jadviser")
         self.assertEqual(user.uwnetid, "jadviser")
+        self.assertEqual(user.display_name, "Jay Adviser")
         self.assertEqual(len(AppUser.objects.filter(uwnetid="jadviser")), 1)
         self.assertRaises(AppUser.DoesNotExist,
                           AppUser.objects.get,

diff --git a/compass/tests/test_cache.py b/compass/tests/test_cache.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/test_templatetags.py b/compass/tests/test_templatetags.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/views/api/test_access_group.py b/compass/tests/views/api/test_access_group.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from compass.tests import ApiTest

diff --git a/compass/tests/views/api/test_adviser.py b/compass/tests/views/api/test_adviser.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.test import override_settings

diff --git a/compass/tests/views/api/test_api.py b/compass/tests/views/api/test_api.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/views/api/test_contact.py b/compass/tests/views/api/test_contact.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/views/api/test_eligibility.py b/compass/tests/views/api/test_eligibility.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from compass.tests import ApiTest

diff --git a/compass/tests/views/api/test_visit.py b/compass/tests/views/api/test_visit.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/tests/views/test_decorators.py b/compass/tests/views/test_decorators.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/urls.py b/compass/urls.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/__init__.py b/compass/views/api/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/access_group.py b/compass/views/api/access_group.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/adviser.py b/compass/views/api/adviser.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/affiliation.py b/compass/views/api/affiliation.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/contact.py b/compass/views/api/contact.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/eligibility.py b/compass/views/api/eligibility.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/photo.py b/compass/views/api/photo.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from compass.views.api import BaseAPIView

diff --git a/compass/views/api/settings.py b/compass/views/api/settings.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/student.py b/compass/views/api/student.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/support.py b/compass/views/api/support.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/api/visit.py b/compass/views/api/visit.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 

diff --git a/compass/views/decorators.py b/compass/views/decorators.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0
 
 from django.contrib.auth.views import redirect_to_login

diff --git a/compass/views/pages.py b/compass/views/pages.py
@@ -1,4 +1,4 @@
-# Copyright 2023 UW-IT, University of Washington
+# Copyright 2024 UW-IT, University of Washington
 # SPDX-License-Identifier: Apache-2.0