renamed variables to be be able to bind with properties

stellio-hub · Apr 24, 2024 · 330077f · 330077f
1 parent 24a18dd
commit 330077f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -60,8 +60,8 @@ services:
       - APPLICATION_TENANTS_0_ISSUER=${APPLICATION_TENANTS_0_ISSUER}
       - APPLICATION_TENANTS_0_NAME=${APPLICATION_TENANTS_0_NAME}
       - APPLICATION_TENANTS_0_DBSCHEMA=${APPLICATION_TENANTS_0_DBSCHEMA}
-      - LIMIT_DEFAULT=${LIMIT_DEFAULT}
-      - LIMIT_MAX=${LIMIT_MAX}
+      - APPLICATION_PAGINATION_LIMITDEFAULT=${LIMIT_DEFAULT}
+      - APPLICATION_PAGINATION_LIMITMAX=${LIMIT_MAX}
     ports:
       - "8083:8083"
     depends_on:
@@ -84,8 +84,8 @@ services:
       - APPLICATION_TENANTS_0_DBSCHEMA=${APPLICATION_TENANTS_0_DBSCHEMA}
       - SUBSCRIPTION_ENTITY-SERVICE-URL=${SUBSCRIPTION_ENTITY_SERVICE_URL}
       - SUBSCRIPTION_STELLIO_URL=${SUBSCRIPTION_STELLIO_URL}
-      - LIMIT_DEFAULT=${LIMIT_DEFAULT}
-      - LIMIT_MAX=${LIMIT_MAX}
+      - APPLICATION_PAGINATION_LIMITDEFAULT=${LIMIT_DEFAULT}
+      - APPLICATION_PAGINATION_LIMITMAX=${LIMIT_MAX}
     ports:
       - "8084:8084"
     depends_on:

diff --git a/shared/src/main/resources/shared.properties b/shared/src/main/resources/shared.properties
@@ -6,8 +6,8 @@ application.tenants[0].dbSchema = public
 
 application.authentication.enabled = false
 # Pagination config for query resources endpoints
-application.pagination.limit-default = ${LIMIT_DEFAULT}
-application.pagination.limit-max = ${LIMIT_MAX}
+application.pagination.limit-default = 30
+application.pagination.limit-max = 100
 
 spring.kafka.bootstrap-servers = localhost:29092
 # To ensure we get all past messages when dynamically joining a new topic based on our "cim.entities.*" pattern

diff --git a/...tion-service/src/test/kotlin/com/egm/stellio/subscription/web/SubscriptionHandlerTests.kt b/...tion-service/src/test/kotlin/com/egm/stellio/subscription/web/SubscriptionHandlerTests.kt
@@ -465,16 +465,16 @@ class SubscriptionHandlerTests {
     }
 
     @Test
-    fun `query subscriptions should return 400 if limit is greater than the maximum authorized limit`() {
+    fun `query subscriptions should return 403 if limit is greater than the maximum authorized limit`() {
         webClient.get()
             .uri("/ngsi-ld/v1/subscriptions/?limit=200&offset=1")
             .exchange()
-            .expectStatus().isBadRequest
+            .expectStatus().isForbidden
             .expectBody().json(
                 """
-                {
-                    "type":"https://uri.etsi.org/ngsi-ld/errors/BadRequestData",
-                    "title":"The request includes input data which does not meet the requirements of the operation",
+               {
+                    "type":"https://uri.etsi.org/ngsi-ld/errors/TooManyResults",
+                    "title":"The query associated to the operation is producing so many results that can exhaust client or server resources. It should be made more restrictive",
                     "detail":"You asked for 200 results, but the supported maximum limit is 100"
                 }
                 """.trimIndent()