From 39d1a63531a783e6a93e8b238a1fd3ffb4dab256 Mon Sep 17 00:00:00 2001
From: Jordi Rambla <jordi.rambla@crg.eu>
Date: Tue, 17 Dec 2024 19:19:58 +0100
Subject: [PATCH] Changes for issue 156 OpenAPI related

---
 framework/json/requests/filteringTerms.json                   | 4 ++--
 .../json/responses/sections/beaconFilteringTermsResults.json  | 4 ++--
 framework/src/requests/filteringTerms.yaml                    | 4 ++--
 .../src/responses/sections/beaconFilteringTermsResults.yaml   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/framework/json/requests/filteringTerms.json b/framework/json/requests/filteringTerms.json
index 732b49c5..9a0abb26 100644
--- a/framework/json/requests/filteringTerms.json
+++ b/framework/json/requests/filteringTerms.json
@@ -59,7 +59,7 @@
             ],
             "type": "object"
         },
-        "FilteringTerm": {
+        "FilteringTermInRequest": {
             "anyOf": [
                 {
                     "$ref": "#/$defs/OntologyFilter"
@@ -112,7 +112,7 @@
     "additionalProperties": true,
     "description": "Filtering terms are the main means to select subsets of records from a Beacon response. While the name implies the application to a generated response, in practice implementations may apply them at the query stage. Note: In the processing of Beacon v2.0 requests multiple filters are assumed to be chained by the logical AND operator.",
     "items": {
-        "$ref": "#/$defs/FilteringTerm"
+        "$ref": "#/$defs/FilteringTermInRequest"
     },
     "title": "Filtering Term Element",
     "type": "array"
diff --git a/framework/json/responses/sections/beaconFilteringTermsResults.json b/framework/json/responses/sections/beaconFilteringTermsResults.json
index d17c15c6..a295b093 100644
--- a/framework/json/responses/sections/beaconFilteringTermsResults.json
+++ b/framework/json/responses/sections/beaconFilteringTermsResults.json
@@ -1,6 +1,6 @@
 {
     "$defs": {
-        "FilteringTerm": {
+        "FilteringTermInResponse": {
             "description": "Entities can be filtered using this term.",
             "properties": {
                 "id": {
@@ -129,7 +129,7 @@
     "properties": {
         "filteringTerms": {
             "items": {
-                "$ref": "#/$defs/FilteringTerm"
+                "$ref": "#/$defs/FilteringTermInResponse"
             },
             "type": "array"
         },
diff --git a/framework/src/requests/filteringTerms.yaml b/framework/src/requests/filteringTerms.yaml
index 2b1a8fbb..5883cf1e 100644
--- a/framework/src/requests/filteringTerms.yaml
+++ b/framework/src/requests/filteringTerms.yaml
@@ -8,9 +8,9 @@ description: >-
   to be chained by the logical AND operator.
 type: array
 items:
-  $ref: '#/$defs/FilteringTerm'
+  $ref: '#/$defs/FilteringTermInRequest'
 $defs:
-  FilteringTerm:
+  FilteringTermInRequest:
     anyOf:
       - $ref: '#/$defs/OntologyFilter'
       - $ref: '#/$defs/AlphanumericFilter'
diff --git a/framework/src/responses/sections/beaconFilteringTermsResults.yaml b/framework/src/responses/sections/beaconFilteringTermsResults.yaml
index aba1cb14..26d46cef 100644
--- a/framework/src/responses/sections/beaconFilteringTermsResults.yaml
+++ b/framework/src/responses/sections/beaconFilteringTermsResults.yaml
@@ -10,9 +10,9 @@ properties:
   filteringTerms:
     type: array
     items:
-      $ref: '#/$defs/FilteringTerm'
+      $ref: '#/$defs/FilteringTermInResponse'
 $defs:
-  FilteringTerm:
+  FilteringTermInResponse:
     type: object
     description: >-
       Entities can be filtered using this term.