Merge pull request #11 from uw-it-aca/feature/activity-log-filtering

Feature/activity log filtering

uw_adsel/__init__.py

@@ -9,6 +9,7 @@
 from uw_adsel.models import Major, Cohort, Quarter, Activity, Application
 import dateutil.parser
 from datetime import datetime
+import urllib.parse
 
 
 logger = logging.getLogger(__name__)
@@ -96,11 +97,50 @@ def _get_applications_from_json(self, response):
             applications.append(application)
         return applications
 
-    def get_activities(self, **kwargs):
+    def get_filtered_activities(self,
+                                netid=None,
+                                assignment_type=None,
+                                cohort=None,
+                                major=None,
+                                start_date=None,
+                                end_date=None,
+                                system_key=None,
+                                collection_type=None,
+                                assignment_period=None,
+                                comment=None):
         url = "{}/activities".format(self.API)
-        response = self._get_resource(url)
-        activities = self._activities_from_json(response)
-        return activities
+        filters = {}
+        if netid is not None:
+            filters['netid'] = netid
+        if assignment_type is not None:
+            filters['assignmentType'] = assignment_type
+        if cohort is not None:
+            filters['cohort'] = cohort
+        if major is not None:
+            filters['cohort'] = major
+        if start_date is not None:
+            filters['startDate'] = start_date
+        if end_date is not None:
+            filters['endDate'] = end_date
+        if system_key is not None:
+            filters['systemKey'] = system_key
+        if collection_type is not None:
+            filters['collectionType'] = collection_type
+        if assignment_period is not None:
+            filters['assignmentPeriod'] = assignment_period
+        if comment is not None:
+            filters['comment'] = comment
+        filter_url = urllib.parse.urlencode(filters)
+        if len(filter_url) > 0:
+            url = url + "?" + filter_url
+        try:
+            response = self._get_resource(url)
+            return self._activities_from_json(response)
+        except DataFailureException:
+            return []
+
+    def get_activities(self, **kwargs):
+        return self.get_filtered_activities()
 
     def _activities_from_json(self, response):
         activities = []

uw_adsel/resources/adsel/file/api/v1/activities?assignmentType=major

@@ -0,0 +1,18 @@
+{
+  "decisions": [
+    {
+      "assignmentMadeOn": "2019-12-04T23:44:49.494Z",
+      "comment": "Making some assignments",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "major",
+      "cohortNbr": 42,
+      "majorAbbr": "",
+      "majorProgramCode": "",
+      "totalSubmitted": 20,
+      "totalAssigned": 19
+    }
+  ],
+  "nextPage": "2",
+  "previousPage": "1",
+  "totalCount": 2
+}

uw_adsel/resources/adsel/file/api/v1/activities?netid=javerage

@@ -0,0 +1,29 @@
+{
+  "decisions": [
+    {
+      "assignmentMadeOn": "2019-12-04T23:44:49.494Z",
+      "comment": "Making some assignments",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "Type 1",
+      "cohortNbr": 42,
+      "majorAbbr": "",
+      "majorProgramCode": "",
+      "totalSubmitted": 20,
+      "totalAssigned": 19
+    },
+    {
+      "assignmentMadeOn": "2019-02-24T03:44:49.494Z",
+      "comment": "Making some assignments",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "who knows",
+      "cohortNbr": 0,
+      "majorAbbr": "CHEM",
+      "majorProgramCode": "CHEM",
+      "totalSubmitted": 20044,
+      "totalAssigned": 1547
+    }
+  ],
+  "nextPage": "2",
+  "previousPage": "1",
+  "totalCount": 2
+}

uw_adsel/resources/adsel/file/api/v1/activities?netid=javerage&systemKey=12345

@@ -0,0 +1,51 @@
+{
+  "decisions": [
+    {
+      "assignmentMadeOn": "2019-12-04T23:44:49.494Z",
+      "comment": "Making some assignments",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "Type 1",
+      "cohortNbr": 42,
+      "majorAbbr": "",
+      "majorProgramCode": "",
+      "totalSubmitted": 20,
+      "totalAssigned": 19
+    },
+    {
+      "assignmentMadeOn": "2019-12-04T19:44:49.494Z",
+      "comment": "More assignment work",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "Type 3",
+      "cohortNbr": 13,
+      "majorAbbr": "",
+      "majorProgramCode": "",
+      "totalSubmitted": 35,
+      "totalAssigned": 35
+    },
+    {
+      "assignmentMadeOn": "2019-12-09T21:44:49.494Z",
+      "comment": "Setting up a major",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "Type 2",
+      "cohortNbr": 0,
+      "majorAbbr": "CSE",
+      "majorProgramCode": "CSE",
+      "totalSubmitted": 2,
+      "totalAssigned": 2
+    },
+    {
+      "assignmentMadeOn": "2019-02-24T03:44:49.494Z",
+      "comment": "Making some assignments",
+      "assignmentMadeBy": "javerage",
+      "assignmentType": "who knows",
+      "cohortNbr": 0,
+      "majorAbbr": "CHEM",
+      "majorProgramCode": "CHEM",
+      "totalSubmitted": 20044,
+      "totalAssigned": 1547
+    }
+  ],
+  "nextPage": "2",
+  "previousPage": "1",
+  "totalCount": 2
+}

uw_adsel/tests/test_adsel.py

@@ -54,6 +54,18 @@ def test_get_activities(self):
         self.assertEqual(len(activities), 4)
         self.assertEqual(activities[0].user, "javerage")
 
+    def test_get_filtered_activities(self):
+        # netid filter
+        activities = self.adsel.get_filtered_activities(netid="javerage")
+        self.assertEqual(len(activities), 2)
+        # No results
+        activities = self.adsel.get_filtered_activities(netid="foo")
+        self.assertEqual(len(activities), 0)
+        # dual filter
+        activities = self.adsel.get_filtered_activities(netid="javerage",
+                                                        system_key=12345)
+        self.assertEqual(len(activities), 4)
+
     def test_get_application(self):
         applications = self.adsel.get_applications_by_qtr_syskey(0, 123)
         self.assertEqual(len(applications), 4)