Merge pull request #1106 from uw-it-aca/bug/sis-import-none

update cache policy to add student/person

Author: jlaney

setup.py

@@ -35,7 +35,7 @@
         'django-storages[google]',
         'uw-memcached-clients~=1.0',
         'uw-restclients-core~=1.4',
-        'uw-restclients-sws>=2.4',
+        'uw-restclients-sws~=2.5',
         'uw-restclients-pws~=2.1',
         'uw-restclients-gws~=2.3',
         'uw-restclients-kws~=1.1',
@@ -49,7 +49,7 @@
     description='An application that manages SIS imports to Canvas',
     long_description=README,
     url='https://github.com/uw-it-aca/canvas-sis-provisioner',
-    author="UW-IT Student & Educational Technology Services",
+    author="UWIT Student & Educational Technology Services",
     author_email="aca-it@uw.edu",
     classifiers=[
         'Environment :: Web Environment',

sis_provisioner/apps.py

@@ -3,10 +3,15 @@
 
 
 from django.apps import AppConfig
+from restclients_core.dao import MockDAO
+import os
 
 
 class SISProvisionerConfig(AppConfig):
     name = 'sis_provisioner'
 
     def ready(self):
         import sis_provisioner.signals
+
+        mocks = os.path.join(os.path.dirname(__file__), 'resources')
+        MockDAO.register_mock_path(mocks)

sis_provisioner/cache.py

@@ -33,6 +33,8 @@ def get_cache_expiration_time(self, service, url, status=200):
                 return ONE_MINUTE * 5
             if re.match(r'^/student/v\d/term/', url):
                 return ONE_DAY
+            if re.match(r'^/student/v5/person/', url):
+                return ONE_HOUR
             if re.match(
                 r'^/student/v\d/(?:campus|college|department|curriculum)',
                     url):

sis_provisioner/dao/course.py

@@ -215,7 +215,7 @@ def get_new_sections_by_term(changed_since_date, term, existing={}):
 
 def get_registrations_by_section(section):
     registrations = get_all_registrations_by_section(
-        section, transcriptable_course='all')
+        section, transcriptable_course='all', use_pws_person=True)
 
     # Sort by regid, is_active, duplicate code
     registrations.sort(key=lambda r: (

sis_provisioner/management/commands/get_page_views.py

@@ -6,14 +6,13 @@
 from django.conf import settings
 from uw_canvas.users import Users
 from dateutil.parser import parse
-from datetime import timedelta
-from pytz import timezone
+from datetime import timedelta, timezone
+from zoneinfo import ZoneInfo
 import argparse
 import csv
 import os
 
-UTC = timezone('UTC')
-PST = timezone('US/Pacific')
+LOCAL_TZ = ZoneInfo('America/Los_Angeles')
 
 
 class Command(BaseCommand):
@@ -48,7 +47,8 @@ def handle(self, *args, **options):
             login, start_time=start_time, end_time=end_time)
 
         for pv in page_views:
-            dt = parse(pv['created_at']).replace(tzinfo=UTC).astimezone(PST)
+            dt = parse(pv['created_at']).replace(
+                tzinfo=timezone.utc).astimezone(LOCAL_TZ)
             participated = 'yes' if pv['participated'] else ''
             contributed = 'yes' if pv['contributed'] else ''
             writer.writerow([