From 8d227e4eb5f90f78f4f715ad7e59cd73d1b0321a Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Wed, 13 Nov 2024 16:56:57 +0100 Subject: [PATCH 01/11] fix: run endpoint --- specs/composition/paths/search/run.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/specs/composition/paths/search/run.yml b/specs/composition/paths/search/run.yml index e1aed1a40a4..313b12ea1d7 100644 --- a/specs/composition/paths/search/run.yml +++ b/specs/composition/paths/search/run.yml @@ -1,7 +1,7 @@ post: tags: - Search - operationId: runSingleComposition + operationId: search x-use-read-transporter: true x-cacheable: true x-acl: @@ -11,10 +11,15 @@ post: parameters: - $ref: '../../common/parameters.yml#/compositionID' requestBody: + required: true content: application/json: schema: - $ref: '../../../common/schemas/SearchParams.yml#/searchParams' + title: params + additionalProperties: false + properties: + params: + $ref: '../../../common/schemas/SearchParams.yml#/searchParams' responses: '200': description: OK From 4e6de2a178ac6e35086d574817dc09472a06d763 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 13 Nov 2024 17:06:45 +0100 Subject: [PATCH 02/11] fix: tests --- .../composition/{runSingleComposition.json => search.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/CTS/requests/composition/{runSingleComposition.json => search.json} (100%) diff --git a/tests/CTS/requests/composition/runSingleComposition.json b/tests/CTS/requests/composition/search.json similarity index 100% rename from tests/CTS/requests/composition/runSingleComposition.json rename to tests/CTS/requests/composition/search.json From 569735e0c83970854e4afdc6266cdd10a1dc5f27 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 13 Nov 2024 17:12:58 +0100 Subject: [PATCH 03/11] trigger From 92ea7c6992d36115451717043ff4a742d60f8a53 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 13 Nov 2024 17:28:54 +0100 Subject: [PATCH 04/11] fix: param name --- tests/CTS/requests/composition/search.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index 7d35bfb327d..b27ead3741d 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -2,7 +2,7 @@ { "parameters": { "compositionID": "foo", - "searchParams": { + "params": { "query": "batman" } }, From 985a40b77a418bbb1ff0afe011798e95a0bf92dd Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 13 Nov 2024 18:09:37 +0100 Subject: [PATCH 05/11] fix: use params from composition specs and remove 1 level --- specs/composition/common/schemas/SearchParams.yml | 2 +- specs/composition/paths/search/{run.yml => search.yml} | 6 +----- specs/composition/paths/search/searchForFacetValues.yml | 2 +- specs/composition/spec.yml | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) rename specs/composition/paths/search/{run.yml => search.yml} (82%) diff --git a/specs/composition/common/schemas/SearchParams.yml b/specs/composition/common/schemas/SearchParams.yml index 42b4171585b..001b338ac5d 100644 --- a/specs/composition/common/schemas/SearchParams.yml +++ b/specs/composition/common/schemas/SearchParams.yml @@ -1,4 +1,4 @@ -searchParams: +params: title: Composition Search parameters as object type: object additionalProperties: false diff --git a/specs/composition/paths/search/run.yml b/specs/composition/paths/search/search.yml similarity index 82% rename from specs/composition/paths/search/run.yml rename to specs/composition/paths/search/search.yml index 313b12ea1d7..fb0e46a4c7c 100644 --- a/specs/composition/paths/search/run.yml +++ b/specs/composition/paths/search/search.yml @@ -15,11 +15,7 @@ post: content: application/json: schema: - title: params - additionalProperties: false - properties: - params: - $ref: '../../../common/schemas/SearchParams.yml#/searchParams' + $ref: '../../common/schemas/SearchParams.yml#/params' responses: '200': description: OK diff --git a/specs/composition/paths/search/searchForFacetValues.yml b/specs/composition/paths/search/searchForFacetValues.yml index e7ade059273..191d2ffc8b7 100644 --- a/specs/composition/paths/search/searchForFacetValues.yml +++ b/specs/composition/paths/search/searchForFacetValues.yml @@ -41,7 +41,7 @@ post: maxFacetHits: $ref: '../../../common/schemas/IndexSettings.yml#/maxFacetHits' searchQuery: - $ref: '../../common/schemas/SearchParams.yml#/searchParams' + $ref: '../../common/schemas/SearchParams.yml#/params' responses: '200': description: OK diff --git a/specs/composition/spec.yml b/specs/composition/spec.yml index eb9a6f6d4b0..65553cf1e46 100644 --- a/specs/composition/spec.yml +++ b/specs/composition/spec.yml @@ -57,7 +57,7 @@ paths: # ### Search Endpoints ### # ######################## /1/compositions/{compositionID}/run: - $ref: 'paths/search/run.yml' + $ref: 'paths/search/search.yml' /1/compositions/{compositionID}/facets/{facetName}/query: $ref: 'paths/search/searchForFacetValues.yml' From eed77450802ddc6c445fe7407022da52e82c4b27 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Wed, 13 Nov 2024 18:37:58 +0100 Subject: [PATCH 06/11] fix: 1up --- specs/composition/paths/search/search.yml | 7 ++++++- tests/CTS/requests/composition/search.json | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/specs/composition/paths/search/search.yml b/specs/composition/paths/search/search.yml index fb0e46a4c7c..a6e9b1f134d 100644 --- a/specs/composition/paths/search/search.yml +++ b/specs/composition/paths/search/search.yml @@ -15,7 +15,12 @@ post: content: application/json: schema: - $ref: '../../common/schemas/SearchParams.yml#/params' + title: searchCompositionParams + type: object + additionalProperties: false + properties: + params: + $ref: '../../common/schemas/SearchParams.yml#/params' responses: '200': description: OK diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index b27ead3741d..0d718fdf106 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -2,15 +2,15 @@ { "parameters": { "compositionID": "foo", - "params": { - "query": "batman" + "searchCompositionParams": { + "params": {"query": "batman"} } }, "request": { "path": "/1/compositions/foo/run", "method": "POST", "body": { - "query": "batman" + "params": {"query": "batman"} } } } From 78c72332112c2a1505baf777190d2fedc2b82738 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Wed, 13 Nov 2024 18:42:59 +0100 Subject: [PATCH 07/11] chore: rename searchCompositionParams to body --- specs/composition/paths/search/search.yml | 2 +- tests/CTS/requests/composition/search.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/specs/composition/paths/search/search.yml b/specs/composition/paths/search/search.yml index a6e9b1f134d..3c11a39fc6f 100644 --- a/specs/composition/paths/search/search.yml +++ b/specs/composition/paths/search/search.yml @@ -15,7 +15,7 @@ post: content: application/json: schema: - title: searchCompositionParams + title: body type: object additionalProperties: false properties: diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index 0d718fdf106..d72d12b8d8f 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -2,15 +2,15 @@ { "parameters": { "compositionID": "foo", - "searchCompositionParams": { - "params": {"query": "batman"} + "body": { + "params": { "query": "batman" } } }, "request": { "path": "/1/compositions/foo/run", "method": "POST", "body": { - "params": {"query": "batman"} + "params": { "query": "batman" } } } } From 80afc3d3c75a7eb8e65a1a972a2bf79397429a75 Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 14 Nov 2024 10:16:23 +0100 Subject: [PATCH 08/11] chore: rename to request --- specs/composition/paths/search/search.yml | 2 +- tests/CTS/requests/composition/search.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/composition/paths/search/search.yml b/specs/composition/paths/search/search.yml index 3c11a39fc6f..68061ca4949 100644 --- a/specs/composition/paths/search/search.yml +++ b/specs/composition/paths/search/search.yml @@ -15,7 +15,7 @@ post: content: application/json: schema: - title: body + title: request type: object additionalProperties: false properties: diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index d72d12b8d8f..50e1788e768 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -9,7 +9,7 @@ "request": { "path": "/1/compositions/foo/run", "method": "POST", - "body": { + "request": { "params": { "query": "batman" } } } From b4da8a19a877bec56abc620be63f5f1d0773158d Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 14 Nov 2024 10:24:35 +0100 Subject: [PATCH 09/11] fix: test parameter --- tests/CTS/requests/composition/search.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index 50e1788e768..ae650f8cf44 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -2,7 +2,7 @@ { "parameters": { "compositionID": "foo", - "body": { + "request": { "params": { "query": "batman" } } }, From d175b41eed4e71dcd8e8848764fc3d66b0accfda Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Thu, 14 Nov 2024 10:27:09 +0100 Subject: [PATCH 10/11] fix --- tests/CTS/requests/composition/search.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index ae650f8cf44..6d591603336 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -9,7 +9,7 @@ "request": { "path": "/1/compositions/foo/run", "method": "POST", - "request": { + "body": { "params": { "query": "batman" } } } From ee5d5aab0a2ea6bfe56265d5531c7dc8dde93fd5 Mon Sep 17 00:00:00 2001 From: shortcuts Date: Thu, 14 Nov 2024 11:01:09 +0100 Subject: [PATCH 11/11] fix: everything conflicts --- specs/composition/paths/search/search.yml | 2 +- tests/CTS/requests/composition/search.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specs/composition/paths/search/search.yml b/specs/composition/paths/search/search.yml index 68061ca4949..317715ef48a 100644 --- a/specs/composition/paths/search/search.yml +++ b/specs/composition/paths/search/search.yml @@ -15,7 +15,7 @@ post: content: application/json: schema: - title: request + title: requestBody type: object additionalProperties: false properties: diff --git a/tests/CTS/requests/composition/search.json b/tests/CTS/requests/composition/search.json index 6d591603336..e8be0dcbf2f 100644 --- a/tests/CTS/requests/composition/search.json +++ b/tests/CTS/requests/composition/search.json @@ -2,7 +2,7 @@ { "parameters": { "compositionID": "foo", - "request": { + "requestBody": { "params": { "query": "batman" } } },