From b4c2fffcdffc01551ed53a30a7fa0d2d24ef775c Mon Sep 17 00:00:00 2001 From: Niv Greenstein <88280771+NivGreenstein@users.noreply.github.com> Date: Sun, 8 Jun 2025 17:09:30 +0300 Subject: [PATCH 1/2] fix: changed sub_tile regex --- openapi3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi3.yaml b/openapi3.yaml index 0088479..136a6bc 100644 --- a/openapi3.yaml +++ b/openapi3.yaml @@ -235,7 +235,7 @@ paths: description: Sub tile number schema: type: string - pattern: ^[1-9][0-9]*$ + pattern: ^[0-9][0-9]*$ - name: mgrs description: 1 meters MGRS Tile example: 18SUJ2338907395 From 48822e09aac527d6b73ce319f882bb5cdda49941 Mon Sep 17 00:00:00 2001 From: Niv Greenstein <88280771+NivGreenstein@users.noreply.github.com> Date: Sun, 8 Jun 2025 14:26:48 +0000 Subject: [PATCH 2/2] fix: fixed regex and testcases --- openapi3.yaml | 2 +- tests/integration/control/item/item.spec.ts | 4 ++-- tests/integration/control/tile/tile.spec.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openapi3.yaml b/openapi3.yaml index 136a6bc..fbab3ca 100644 --- a/openapi3.yaml +++ b/openapi3.yaml @@ -290,7 +290,7 @@ paths: description: The sub tile the item in it (required if tile is defined) schema: type: string - pattern: ^[1-9][0-9]*$ + pattern: ^[0-9][0-9]*$ example: '66' - $ref: '#/components/parameters/geo_context' - $ref: '#/components/parameters/geo_context_mode' diff --git a/tests/integration/control/item/item.spec.ts b/tests/integration/control/item/item.spec.ts index 982836d..e604374 100644 --- a/tests/integration/control/item/item.spec.ts +++ b/tests/integration/control/item/item.spec.ts @@ -283,12 +283,12 @@ describe('/search/control/items', function () { }); }); - test.each(['invalid', '6a6', '06', '-11', '6 ', ' 6', ' ', ' 6 ', ''])( + test.each(['invalid', '6a6', '-11', '6 ', ' 6', ' ', ' 6 ', ''])( 'should return 400 status code and error message when sub_tile value is invalid', async (sub_tile) => { const response = await requestSender.getItems({ command_name: '1234', tile: 'RIT', sub_tile, limit: 5, disable_fuzziness: false }); - const message = sub_tile ? 'request/query/sub_tile must match pattern "^[1-9][0-9]*$"' : "Empty value found for query parameter 'sub_tile'"; + const message = sub_tile ? 'request/query/sub_tile must match pattern "^[0-9][0-9]*$"' : "Empty value found for query parameter 'sub_tile'"; expect(response.status).toBe(httpStatusCodes.BAD_REQUEST); expect(response.body).toEqual({ diff --git a/tests/integration/control/tile/tile.spec.ts b/tests/integration/control/tile/tile.spec.ts index b2a2f6b..7430ab6 100644 --- a/tests/integration/control/tile/tile.spec.ts +++ b/tests/integration/control/tile/tile.spec.ts @@ -440,12 +440,12 @@ describe('/search/control/tiles', function () { } ); - test.each(['invalid', '6a6', '06', '-11', '6 ', ' 6', ' ', ' 6 ', ''])( + test.each(['invalid', '6a6', '-11', '6 ', ' 6', ' ', ' 6 ', ''])( 'should return 400 status code and error message when sub_tile value is invalid', async (sub_tile) => { const response = await requestSender.getTiles({ tile: 'RIT', sub_tile, limit: 5, disable_fuzziness: false }); - const message = sub_tile ? 'request/query/sub_tile must match pattern "^[1-9][0-9]*$"' : "Empty value found for query parameter 'sub_tile'"; + const message = sub_tile ? 'request/query/sub_tile must match pattern "^[0-9][0-9]*$"' : "Empty value found for query parameter 'sub_tile'"; expect(response.status).toBe(httpStatusCodes.BAD_REQUEST); expect(response.body).toEqual({