From d0319970e43fc49222e5bf9871d0d2abd213c93a Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Wed, 28 Jun 2023 14:47:43 +0200 Subject: [PATCH 1/9] filter in post --- paths/filters/get.yml | 24 ++++++++---------------- schemas/filters/Filter.yml | 8 ++++++-- schemas/filters/FiltersResponse.yml | 2 -- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/paths/filters/get.yml b/paths/filters/get.yml index 4d8cdf8..0fe8392 100644 --- a/paths/filters/get.yml +++ b/paths/filters/get.yml @@ -1,25 +1,17 @@ -get: +post: tags: - Filters summary: get Filter description: get operationId: getFilter x-eov-operation-handler: filters - parameters: - - name: filter - in: query - description: the type of filter (Reaction2Gene, Reaction2Metabolite) - required: true - schema: - type: string - allowReserved: true - - name: listid - in: query - description: the of id mysql in - required: true - allowReserved: true - schema: - type: string + requestBody: + content: + application/json: + schema: + type: object + items: + $ref: '../../schemas/filters/Filter.yml' responses: 200: description: successful operation diff --git a/schemas/filters/Filter.yml b/schemas/filters/Filter.yml index 8027e27..e273b89 100644 --- a/schemas/filters/Filter.yml +++ b/schemas/filters/Filter.yml @@ -1,7 +1,11 @@ type: object description: "result filter object" properties: - result: + filter: description: "list id" type: string - example: "12,123" + example: "Gene2Reaction" + listid: + description: "list id" + type: string + example: "1,12" diff --git a/schemas/filters/FiltersResponse.yml b/schemas/filters/FiltersResponse.yml index b9cac96..a7d79ee 100644 --- a/schemas/filters/FiltersResponse.yml +++ b/schemas/filters/FiltersResponse.yml @@ -5,5 +5,3 @@ allOf: result: description: 'result' type: string - items: - $ref: '../../schemas/filters/Filter.yml' -- GitLab From a57826b7dd9e1e245e5d5536447b248be268f165 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Wed, 28 Jun 2023 15:09:56 +0200 Subject: [PATCH 2/9] 0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 670be91..4449593 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@metexplore/metexplore3-api-specs", "private": false, "description": "MetExplore 3 API specifications", - "version": "0.3.0", + "version": "0.4.0", "license": "Apache-2.0", "devDependencies": { "@redocly/cli": "^1.0.0-beta.125", -- GitLab From dbeb79d01a4094f352a909fd8aceea95e6e9d089 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Thu, 29 Jun 2023 09:16:14 +0200 Subject: [PATCH 3/9] request description --- paths/filters/get.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paths/filters/get.yml b/paths/filters/get.yml index 0fe8392..7c05c9f 100644 --- a/paths/filters/get.yml +++ b/paths/filters/get.yml @@ -1,8 +1,8 @@ post: tags: - Filters - summary: get Filter - description: get + summary: filter identifiers of metabolic entities byids of other metabolic entities + description: filter identifiers of metabolic entities byids of other metabolic entities operationId: getFilter x-eov-operation-handler: filters requestBody: -- GitLab From 90c811bcc20e0fdc0aa77ab01d4d31c82ede3974 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Thu, 29 Jun 2023 09:35:31 +0200 Subject: [PATCH 4/9] filter description & type array & enum --- schemas/filters/Filter.yml | 11 ++++++----- schemas/filters/FiltersResponse.yml | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/schemas/filters/Filter.yml b/schemas/filters/Filter.yml index e273b89..e7a6277 100644 --- a/schemas/filters/Filter.yml +++ b/schemas/filters/Filter.yml @@ -1,11 +1,12 @@ type: object description: "result filter object" properties: - filter: - description: "list id" + filtertype: + description: "type of filter" type: string + enum: ['Gene2Pathway','Protein2Pathway',Enzyme2Pathway,MetabLeft2Pathway,MetabRight2Pathway,Reaction2Pathway,Gene2Reaction,Protein2Reaction,Enzyme2Reaction,MetabLeft2Reaction,MetabRight2Reaction,Pathway2Reaction,Gene2MetabLeft,Protein2MetabLeft,Enzyme2MetabLeft,Reaction2MetabLeft,Pathway2MetabLeft,Gene2MetabRight,Protein2MetabRight,Enzyme2MetabRight,Reaction2MetabRight,Metabolite2MetabRight,Pathway2MetabRight,Gene2Metabolite,Protein2Metabolite,Enzyme2Metabolite,Reaction2Metabolite,Pathway2Metabolite,Gene2Enzyme,Protein2Enzyme,MetabLeft2Enzyme,MetabRight2Enzyme,Reaction2Enzyme,Pathway2Enzyme,Compart2Enzyme,Gene2Protein,Enzyme2Protein,MetabLeft2Protein,MetabRight2Protein,Reaction2Protein,Pathway2Protein,Compart2Protein,Protein2Gene,Enzyme2Gene,MetabLeft2Gene,MetabRight2Gene,Reaction2Gene,Pathway2Gene,Protein2Compart,Enzyme2Compart,Metabolite2Compart,Reaction2Compart,Pathway2Compart] example: "Gene2Reaction" - listid: - description: "list id" - type: string + ids: + description: "array ids of " + type: array example: "1,12" diff --git a/schemas/filters/FiltersResponse.yml b/schemas/filters/FiltersResponse.yml index a7d79ee..8d66ca7 100644 --- a/schemas/filters/FiltersResponse.yml +++ b/schemas/filters/FiltersResponse.yml @@ -3,5 +3,5 @@ allOf: - type: object - properties: result: - description: 'result' - type: string + description: 'array of ids result filter' + type: array -- GitLab From 7198118a2fd57ab4e7e70c8c910a21a0528dcd74 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Thu, 29 Jun 2023 09:49:10 +0200 Subject: [PATCH 5/9] change enum --- schemas/filters/Filter.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/schemas/filters/Filter.yml b/schemas/filters/Filter.yml index e7a6277..829e2d4 100644 --- a/schemas/filters/Filter.yml +++ b/schemas/filters/Filter.yml @@ -4,9 +4,11 @@ properties: filtertype: description: "type of filter" type: string - enum: ['Gene2Pathway','Protein2Pathway',Enzyme2Pathway,MetabLeft2Pathway,MetabRight2Pathway,Reaction2Pathway,Gene2Reaction,Protein2Reaction,Enzyme2Reaction,MetabLeft2Reaction,MetabRight2Reaction,Pathway2Reaction,Gene2MetabLeft,Protein2MetabLeft,Enzyme2MetabLeft,Reaction2MetabLeft,Pathway2MetabLeft,Gene2MetabRight,Protein2MetabRight,Enzyme2MetabRight,Reaction2MetabRight,Metabolite2MetabRight,Pathway2MetabRight,Gene2Metabolite,Protein2Metabolite,Enzyme2Metabolite,Reaction2Metabolite,Pathway2Metabolite,Gene2Enzyme,Protein2Enzyme,MetabLeft2Enzyme,MetabRight2Enzyme,Reaction2Enzyme,Pathway2Enzyme,Compart2Enzyme,Gene2Protein,Enzyme2Protein,MetabLeft2Protein,MetabRight2Protein,Reaction2Protein,Pathway2Protein,Compart2Protein,Protein2Gene,Enzyme2Gene,MetabLeft2Gene,MetabRight2Gene,Reaction2Gene,Pathway2Gene,Protein2Compart,Enzyme2Compart,Metabolite2Compart,Reaction2Compart,Pathway2Compart] + enum: ['Gene2Pathway','Protein2Pathway',Enzyme2Pathway,Reaction2Pathway,Gene2Reaction,Protein2Reaction,Enzyme2Reaction,Pathway2Reaction,Gene2Metabolite,Protein2Metabolite,Enzyme2Metabolite,Reaction2Metabolite,Pathway2Metabolite,Gene2Enzyme,Protein2Enzyme,Reaction2Enzyme,Pathway2Enzyme,Compart2Enzyme,Gene2Protein,Enzyme2Protein,Reaction2Protein,Pathway2Protein,Compart2Protein,Protein2Gene,Enzyme2Gene,Reaction2Gene,Pathway2Gene,Protein2Compart,Enzyme2Compart,Metabolite2Compart,Reaction2Compart,Pathway2Compart] example: "Gene2Reaction" ids: description: "array ids of " type: array + items: + type: integer example: "1,12" -- GitLab From 508e55926251ffa9376518fbdc4a30e14c4cd663 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Thu, 29 Jun 2023 09:49:39 +0200 Subject: [PATCH 6/9] type --- schemas/filters/FiltersResponse.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/schemas/filters/FiltersResponse.yml b/schemas/filters/FiltersResponse.yml index 8d66ca7..ce06af8 100644 --- a/schemas/filters/FiltersResponse.yml +++ b/schemas/filters/FiltersResponse.yml @@ -5,3 +5,5 @@ allOf: result: description: 'array of ids result filter' type: array + items: + type: integer -- GitLab From f91726e8cc0e62e29026ad206af49b6ce6b5cf99 Mon Sep 17 00:00:00 2001 From: Florence Vinson <florence.vinson@inrae.fr> Date: Thu, 29 Jun 2023 14:58:27 +0200 Subject: [PATCH 7/9] description --- schemas/filters/FiltersResponse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/filters/FiltersResponse.yml b/schemas/filters/FiltersResponse.yml index ce06af8..16dd774 100644 --- a/schemas/filters/FiltersResponse.yml +++ b/schemas/filters/FiltersResponse.yml @@ -3,7 +3,7 @@ allOf: - type: object - properties: result: - description: 'array of ids result filter' + description: 'array of ids' type: array items: type: integer -- GitLab From 95780784f314b4ac3f2f6a3689e07e51c3edbf3d Mon Sep 17 00:00:00 2001 From: Ludovic Cottret <ludovic.cottret@inra.fr> Date: Thu, 29 Jun 2023 15:05:00 +0200 Subject: [PATCH 8/9] Fix typo --- paths/filters/get.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paths/filters/get.yml b/paths/filters/get.yml index 7c05c9f..6bb875a 100644 --- a/paths/filters/get.yml +++ b/paths/filters/get.yml @@ -1,7 +1,7 @@ post: tags: - Filters - summary: filter identifiers of metabolic entities byids of other metabolic entities + summary: filter identifiers of metabolic entities by ids of other metabolic entities description: filter identifiers of metabolic entities byids of other metabolic entities operationId: getFilter x-eov-operation-handler: filters -- GitLab From 9c244315b6d4040e788f982dad1572295bc00512 Mon Sep 17 00:00:00 2001 From: Ludovic Cottret <ludovic.cottret@inra.fr> Date: Thu, 29 Jun 2023 15:05:10 +0200 Subject: [PATCH 9/9] Fix typo --- paths/filters/get.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paths/filters/get.yml b/paths/filters/get.yml index 6bb875a..7b1d505 100644 --- a/paths/filters/get.yml +++ b/paths/filters/get.yml @@ -2,7 +2,7 @@ post: tags: - Filters summary: filter identifiers of metabolic entities by ids of other metabolic entities - description: filter identifiers of metabolic entities byids of other metabolic entities + description: filter identifiers of metabolic entities by ids of other metabolic entities operationId: getFilter x-eov-operation-handler: filters requestBody: -- GitLab