From 4bd362153b664ca0550a53da03e6dde81562c7f2 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Wed, 5 Jun 2024 13:24:45 -0400
Subject: [PATCH] Made endpoints more cruddy
---
docs/swagger-schema.yaml | 22 +++++++---------------
services/capability/capability/routes.py | 14 +++++++-------
2 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/docs/swagger-schema.yaml b/docs/swagger-schema.yaml
index 826cae558..fec458187 100644
--- a/docs/swagger-schema.yaml
+++ b/docs/swagger-schema.yaml
@@ -622,7 +622,7 @@ paths:
description: "successful operation"
schema:
type: integer
- /casa_matrix/get_casa_version:
+ /casa_matrix/version:
parameters:
- $ref: "#/parameters/casa-version"
- $ref: "#/parameters/casa-capability"
@@ -640,7 +640,7 @@ paths:
description: "successful operation"
schema:
$ref: "#/definitions/CasaVersion"
- /casa_matrix/get_casa_versions:
+ /casa_matrix/versions:
parameters:
- $ref: "#/parameters/casa-version"
- $ref: "#/parameters/casa-capability"
@@ -658,7 +658,7 @@ paths:
description: "successful operation"
schema:
$ref: "#/definitions/CasaVersions"
- /casa_matrix/get_casa_recipe:
+ /casa_matrix/recipe:
parameters:
- $ref: "#/parameters/casa-capability"
get:
@@ -674,7 +674,7 @@ paths:
description: "successful operation"
schema:
type: "string"
- /casa_matrix/add_casa_version:
+ /casa_matrix/db/version:
parameters:
- $ref: "#/parameters/casa-version"
- $ref: "#/parameters/casa-capabilities"
@@ -692,12 +692,7 @@ paths:
description: "successful operation"
schema:
type: "boolean"
- /casa_matrix/update_casa_version:
- parameters:
- - $ref: "#/parameters/casa-version"
- - $ref: "#/parameters/casa-capabilities"
- - $ref: "#/parameters/casa-compatible"
- post:
+ put:
tags:
- "casa-matrix"
summary: "Update a CASA version in the matrix tables"
@@ -710,10 +705,7 @@ paths:
description: "successful operation"
schema:
type: "boolean"
- /casa_matrix/delete_casa_version:
- parameters:
- - $ref: "#/parameters/casa-version"
- post:
+ delete:
tags:
- "casa-matrix"
summary: "Delete a CASA version from the matrix tables"
@@ -726,7 +718,7 @@ paths:
description: "successful operation"
schema:
type: "boolean"
- /casa_matrix/make_casa_links:
+ /casa_matrix/links:
post:
tags:
- "casa-matrix"
diff --git a/services/capability/capability/routes.py b/services/capability/capability/routes.py
index ce72f5e5b..cbb3b6122 100644
--- a/services/capability/capability/routes.py
+++ b/services/capability/capability/routes.py
@@ -275,12 +275,12 @@ def casa_matrix_routes(config: Configurator) -> None:
"""
# GET
- config.add_route(name="get_casa_version", pattern=f"casa_matrix/get_casa_version", request_method="GET")
- config.add_route(name="get_casa_versions", pattern=f"casa_matrix/get_casa_versions", request_method="GET")
- config.add_route(name="get_casa_recipe", pattern=f"casa_matrix/get_casa_recipe", request_method="GET")
+ config.add_route(name="get_casa_version", pattern=f"casa_matrix/version", request_method="GET")
+ config.add_route(name="get_casa_versions", pattern=f"casa_matrix/versions", request_method="GET")
+ config.add_route(name="get_casa_recipe", pattern=f"casa_matrix/recipe", request_method="GET")
# POST
- config.add_route(name="add_casa_version", pattern=f"casa_matrix/add_casa_version", request_method="POST")
- config.add_route(name="update_casa_version", pattern=f"casa_matrix/update_casa_version", request_method="POST")
- config.add_route(name="delete_casa_version", pattern=f"casa_matrix/delete_casa_version", request_method="POST")
- config.add_route(name="make_casa_links", pattern=f"casa_matrix/make_casa_links", request_method="POST")
+ config.add_route(name="add_casa_version", pattern=f"casa_matrix/db/version", request_method="POST")
+ config.add_route(name="update_casa_version", pattern=f"casa_matrix/db/version", request_method="PUT")
+ config.add_route(name="delete_casa_version", pattern=f"casa_matrix/db/version", request_method="DELETE")
+ config.add_route(name="make_casa_links", pattern=f"casa_matrix/links", request_method="POST")
--
GitLab