Second fix for OpenAPI document

internetofwater · Jan 17, 2025 · 811f820 · 811f820
1 parent 1a1d24e
commit 811f820
Showing 1 changed file with 39 additions and 18 deletions.
diff --git a/src/nldi/api/main.py b/src/nldi/api/main.py
@@ -449,8 +449,8 @@ def openapi_json(self) -> Dict[str, Any]:
                 "tags": ["by_sourceid"],
                 "operationId": f"SourceFeatureById",
                 "parameters": [
-                    {"$ref": "#/components/parameters/identifier"},
                     {"$ref": "#/components/parameters/sourceid"},
+                    {"$ref": "#/components/parameters/identifier"},
                 ],
                 "responses": {
                     "200": {
@@ -498,15 +498,24 @@ def openapi_json(self) -> Dict[str, Any]:
                             },
                         },
                         **RESPONSES,
-                    },
+                    }
                 }
             }
+
+            if src == "{sourceid}":
+                paths[f"{base_path}"]["get"]["parameters"] = [
+                    {"$ref": "#/components/parameters/sourceid"},
+                ]
+
             params = [
+                *([
+                    {"$ref": "#/components/parameters/sourceid"},
+                    {"$ref": "#/components/parameters/identifier"}]
+                    if src == "{sourceid}"
+                    else [{"$ref": "#/components/parameters/comid"}]
+                ),
                 {"$ref": "#/components/parameters/simplified"},
-                {"$ref": "#/components/parameters/splitCatchment"},
-                {"$ref": "#/components/parameters/identifier"},
-                {"$ref": "#/components/parameters/sourceid"} if src == "{sourceid}"
-                else {"$ref": "#/components/parameters/comid"},
+                {"$ref": "#/components/parameters/splitCatchment"}
             ]
 
             paths[f"{base_path}/{id_field}/basin"] = {
@@ -544,9 +553,12 @@ def openapi_json(self) -> Dict[str, Any]:
                     "tags": ["by_comid" if src == "comid" else "by_sourceid"],
                     "operationId": f"{src_name}NavigationOptions",
                     "parameters": [
-                        {"$ref": "#/components/parameters/identifier"},
-                        {"$ref": "#/components/parameters/sourceid"} if src == "{sourceid}"
-                        else {"$ref": "#/components/parameters/comid"},
+                        *([
+                            {"$ref": "#/components/parameters/sourceid"},
+                            {"$ref": "#/components/parameters/identifier"}]
+                            if src == "{sourceid}"
+                            else [{"$ref": "#/components/parameters/comid"}]
+                        )
                     ],
                     "responses": {
                         "200": {
@@ -569,9 +581,12 @@ def openapi_json(self) -> Dict[str, Any]:
                     "tags": ["by_comid" if src == "comid" else "by_sourceid"],
                     "operationId": f"{src_name}Navigation",
                     "parameters": [
-                        {"$ref": "#/components/parameters/identifier"},
-                        {"$ref": "#/components/parameters/sourceid"} if src == "{sourceid}"
-                        else {"$ref": "#/components/parameters/comid"},
+                       *([
+                            {"$ref": "#/components/parameters/sourceid"},
+                            {"$ref": "#/components/parameters/identifier"}]
+                            if src == "{sourceid}"
+                            else [{"$ref": "#/components/parameters/comid"}]
+                        ),
                         {"$ref": "#/components/parameters/navigationMode"},
                     ],
                     "responses": {
@@ -599,9 +614,12 @@ def openapi_json(self) -> Dict[str, Any]:
                     "tags": ["by_comid" if src == "comid" else "by_sourceid"],
                     "operationId": f"{src_name}NavigationDataSource",
                     "parameters": [
-                        {"$ref": "#/components/parameters/identifier"},
-                        {"$ref": "#/components/parameters/sourceid"} if src == "{sourceid}"
-                        else {"$ref": "#/components/parameters/comid"},
+                        *([
+                            {"$ref": "#/components/parameters/sourceid"},
+                            {"$ref": "#/components/parameters/identifier"}]
+                            if src == "{sourceid}"
+                            else [{"$ref": "#/components/parameters/comid"}]
+                        ),
                         {"$ref": "#/components/parameters/navigationMode"},
                         {
                             "name": "dataSource",
@@ -638,9 +656,12 @@ def openapi_json(self) -> Dict[str, Any]:
             }
 
             params = [
-                {"$ref": "#/components/parameters/identifier"},
-                {"$ref": "#/components/parameters/sourceid"} if src == "{sourceid}"
-                else {"$ref": "#/components/parameters/comid"},
+                *([
+                    {"$ref": "#/components/parameters/sourceid"},
+                    {"$ref": "#/components/parameters/identifier"}]
+                    if src == "{sourceid}"
+                    else [{"$ref": "#/components/parameters/comid"}]
+                ),
                 {"$ref": "#/components/parameters/navigationMode"},
                 {"$ref": "#/components/parameters/distance"},
             ]