Merge pull request #43 from uw-it-aca/fix/remove-pagination

removing pagination from majors

uw_adsel/__init__.py

@@ -308,25 +308,12 @@ def get_major_details_by_qtr_major(self,
         return major
 
     def get_majors_by_qtr(self, quarter_id, workspace_id=None):
-        majors = self._get_majors_by_page(quarter_id, 1, [], workspace_id)
-        return majors
-
-    def _get_majors_by_page(self,
-                            quarter_id,
-                            page,
-                            major_list=[],
-                            workspace_id=None):
-        url = "{}/majors/details/{}?Page={}&Limit=100".format(self.API,
-                                                              quarter_id,
-                                                              page)
-        if workspace_id is not None:
-            url += "&" + urllib.parse.urlencode({'workspaceId': workspace_id})
+        url = "{}/majors/details/{}?workspaceId={}".format(self.API,
+                                                           quarter_id,
+                                                           workspace_id)
         response = self._get_resource(url)
         majors = self._majors_from_json(response)
-        major_list += majors
-        if response['nextPage'] is not None:
-            self._get_majors_by_page(quarter_id, page+1, major_list)
-        return major_list
+        return majors
 
     def _majors_from_json(self, response):
         majors = []

uw_adsel/resources/adsel/file/api/v1/majors/details/1?workspaceId=1

@@ -0,0 +1,24 @@
+{
+	"majors": [
+		{
+			"majorAbbr": "CHEM",
+			"academicQtrKeyId": 1,
+			"displayName": "Chemistry",
+			"college": "Science",
+			"division": "6B2",
+			"majorPathway": 0,
+			"dtx": "string",
+			"majorProgramCode": "0_CHEM_1",
+            "assignedCount": 120,
+            "residentCount": 20,
+            "nonResidentCount": 50,
+            "internationalCount": 0,
+            "freshmanCount": 10,
+            "transferCount": 50,
+            "postBacCount": 0
+		}
+	],
+	"nextPage": null,
+	"previousPage": "1",
+	"totalCount": 1
+}

uw_adsel/resources/adsel/file/api/v1/majors/details/1?Page=1&Limit=100 → uw_adsel/resources/adsel/file/api/v1/majors/details/1?workspaceId=None

@@ -12,7 +12,7 @@
             "residentCount": 20,
             "nonResidentCount": 50,
             "internationalCount": 0,
-            "freshmanCount": 0,
+            "freshmanCount": 10,
             "transferCount": 50,
             "postBacCount": 0
 		},
@@ -29,7 +29,7 @@
             "residentCount": 20,
             "nonResidentCount": 50,
             "internationalCount": 0,
-            "freshmanCount": 0,
+            "freshmanCount": 10,
             "transferCount": 50,
             "postBacCount": 0
 		}

uw_adsel/tests/test_adsel.py

@@ -24,16 +24,16 @@ def test_error(self):
             self.adsel._get_resource("/foobar/")
 
     def test_get_majors(self):
-        majors = self.adsel.get_majors_by_qtr(0)
-        self.assertEqual(len(majors), 4)
+        majors = self.adsel.get_majors_by_qtr(1)
+        self.assertEqual(len(majors), 2)
         self.assertEqual(majors[1].major_abbr, "CHEM")
-        self.assertEqual(majors[1].assigned_freshman, 50)
+        self.assertEqual(majors[1].assigned_freshman, 10)
         majors_unpaginated = self.adsel.get_majors_by_qtr(1)
         self.assertEqual(len(majors_unpaginated), 2)
 
-        workspace_majors = self.adsel.get_majors_by_qtr(0, 1)
-        self.assertEqual(len(workspace_majors), 2)
-        self.assertEqual(workspace_majors[1].assigned_count, 721)
+        workspace_majors = self.adsel.get_majors_by_qtr(1, 1)
+        self.assertEqual(len(workspace_majors), 1)
+        self.assertEqual(workspace_majors[0].assigned_count, 120)
 
     @mock.patch('uw_adsel.AdSel.get_now', side_effect=mocked_get_now)
     def test_get_quarters(self, mock_obj):