Merge pull request #705 from petridishdev/paging

Results paging fix
bcgov · Oct 25, 2021 · c08ee1c · c08ee1c
2 parents 3c57951 + 800fe4b
commit c08ee1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -79,6 +79,8 @@ services:
       - RTI_RAISE_ERRORS=${RTI_RAISE_ERRORS}
       - RANDOM_ERRORS=${RANDOM_ERRORS}
       - STARTUP_DELAY=${STARTUP_DELAY}
+      - PAGE_SIZE=${PAGE_SIZE}
+      - MAX_PAGE_SIZE=${MAX_PAGE_SIZE}
     volumes:
       - ../server/vcr-server/subscriptions:/home/indy/subscriptions
       - ../server/vcr-server/agent_webhooks:/home/indy/agent_webhooks

diff --git a/docker/manage b/docker/manage
@@ -354,6 +354,9 @@ configureEnvironment() {
   export SP_TRACKING_EMITTER=${SP_TRACKING_EMITTER:-spm.apps.gov.bc.ca}
   export SP_TRACKING_EMITTER_PROTOCOL=${SP_TRACKING_EMITTER_PROTOCOL:-https}
 
+  export PAGE_SIZE=${PAGE_SIZE:-10}
+  export MAX_PAGE_SIZE=${MAX_PAGE_SIZE:-200}
+
   # rabbitmq
   export RABBITMQ_USER="RABBITMQ_USER"
   export RABBITMQ_PASSWORD="RABBITMQ_PASSWORD"

diff --git a/server/vcr-server/vcr_server/settings.py b/server/vcr-server/vcr_server/settings.py
@@ -165,8 +165,8 @@ def parse_bool(val):
 REST_FRAMEWORK = {
     # "DEFAULT_VERSIONING_CLASS": "rest_framework.versioning.NamespaceVersioning",
     "DEFAULT_PAGINATION_CLASS": "vcr_server.pagination.EnhancedPageNumberPagination",
-    "PAGE_SIZE": 100,
-    "MAX_PAGE_SIZE": 200,
+    "PAGE_SIZE": int(os.getenv("PAGE_SIZE", "10")),
+    "MAX_PAGE_SIZE": int(os.getenv("MAX_PAGE_SIZE", "200")),
     "DEFAULT_AUTHENTICATION_CLASSES": authentication.defaults(),
     "DEFAULT_PERMISSION_CLASSES": [
         "rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly"