Add Limit Params and Fix Some Tests

jeffshek · jeffshek · commit 698432099573 · 2020-11-26T15:07:50.000-05:00
diff --git a/open/core/betterself/tests/views/test_supplement_log_views.py b/open/core/betterself/tests/views/test_supplement_log_views.py
@@ -1,4 +1,5 @@
 from django.contrib.auth import get_user_model
+from rest_framework.reverse import reverse
 
 from test_plus import TestCase
 
@@ -203,3 +204,20 @@ def test_edit_supplement_log_with_supplement_stack(self):
 
         response = self.client_1.post(update_url, data=data)
         self.assertEqual(response.status_code, 400)
+
+    def test_supplement_log_with_list_view_limit(self):
+        self.model_class_factory.create_batch(50, user=self.user_1)
+        url_with_params = self.url + "?limit=5"
+
+        response = self.client_1.get(url_with_params)
+        data = response.data
+
+        self.assertEqual(len(data), 5)
+
+    def test_supplement_log_with_list_view_invalid_limitparam(self):
+        self.model_class_factory.create_batch(50, user=self.user_1)
+        url_with_params = self.url + "?limit=DONKEYKONG"
+
+        response = self.client_1.get(url_with_params)
+        # invalid param should return 400
+        self.assertEqual(response.status_code, 400)
diff --git a/open/core/betterself/tests/views/test_supplement_stack_composition_views.py b/open/core/betterself/tests/views/test_supplement_stack_composition_views.py
@@ -132,7 +132,7 @@ def test_create_view_with_duplication_data_change_quantity(self):
         self.assertEqual(response.status_code, 200)
 
         # now create a composition with supplement 2
-        supplement_2 = SupplementFactory(user=self.user_1)
+        supplement_2 = SupplementFactory(user=self.user_1, name="Not Supplement 1")
         self.assertNotEqual(supplement_1, supplement_2)
 
         supplement_2_uuid = str(supplement_2.uuid)
diff --git a/open/core/betterself/tests/views/test_supplement_stack_views.py b/open/core/betterself/tests/views/test_supplement_stack_views.py
@@ -51,7 +51,7 @@ def test_get_view_with_supplement_compositions(self):
         )
 
         # sometimes the randomness makes it not quite equal to how many we wanted to create
-        created_comps_length = len(created_comps)
+        created_comps_length = len(set(created_comps))
 
         url = stack.get_update_url()
         response = self.client_1.get(url)
diff --git a/open/core/betterself/views/mixins.py b/open/core/betterself/views/mixins.py
@@ -1,5 +1,6 @@
 import logging
 
+from rest_framework.exceptions import ValidationError
 from rest_framework.generics import get_object_or_404
 from rest_framework.response import Response
 from rest_framework.views import APIView
@@ -38,6 +39,15 @@ def get(self, request):
         if self.prefetch_related_models:
             instances = instances.prefetch_related(*self.prefetch_related_models)
 
+        limit_params = request.query_params.get("limit")
+        if limit_params:
+            try:
+                limit_params = int(limit_params)
+            except ValueError:
+                raise ValidationError("Invalid Limit Param Entered - Must Be An Integer")
+
+            instances = instances[:limit_params]
+
         serializer = self.read_serializer_class(instances, many=True)
         data = serializer.data
         return Response(data=data)
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -63,3 +63,4 @@ xlrd==1.2.0
 XlsxWriter==1.2.9
 yarl==1.3.0
 zope.interface==4.6.0
+tblib==1.7.0  # use for parallel traceback exceptions

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def test_get_view_with_supplement_compositions(self):`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`# sometimes the randomness makes it not quite equal to how many we wanted to create`
`54`		`- created_comps_length = len(created_comps)`
	`54`	`+ created_comps_length = len(set(created_comps))`
`55`	`55`
`56`	`56`	`url = stack.get_update_url()`
`57`	`57`	`response = self.client_1.get(url)`