Merged in feature/simplifystatus (pull request #86)

Simplify Statuses

* simple
This commit is contained in:
Michael McGuinness
2025-03-04 16:44:18 +00:00
parent a07037b018
commit 1232ed528f
7 changed files with 60 additions and 80 deletions
+45 -45
View File
@@ -671,51 +671,51 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
// Base64 encoded, gzipped, json marshaled Swagger object
var swaggerSpec = []string{
"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",
"aUAAAA==",
}
// GetSwagger returns the content of the embedded swagger specification file
+1 -1
View File
@@ -28,7 +28,7 @@ func (s *Controllers) CreateClient(ctx echo.Context) error {
func (s *Controllers) GetClient(ctx echo.Context, id types.UUID) error {
client, err := s.svc.Client.Get(ctx.Request().Context(), id)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to get client: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get client: %s", err))
}
return ctx.JSON(http.StatusOK, JobClient{
+1 -1
View File
@@ -11,7 +11,7 @@ import (
func (s *Controllers) ListDocumentsByJobId(ctx echo.Context, jobId types.UUID) error {
documents, err := s.svc.Document.ListByJobId(ctx.Request().Context(), jobId)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to list documents: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to list documents: %s", err))
}
docs := make([]Document, len(documents))
+2 -2
View File
@@ -28,7 +28,7 @@ func (s *Controllers) CreateJob(ctx echo.Context) error {
func (s *Controllers) GetJob(ctx echo.Context, id types.UUID) error {
job, err := s.svc.Job.Get(ctx.Request().Context(), id)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to find job: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to find job: %s", err))
}
return ctx.JSON(http.StatusOK, Job{
@@ -41,7 +41,7 @@ func (s *Controllers) GetJob(ctx echo.Context, id types.UUID) error {
func (s *Controllers) GetJobStatusByJobId(ctx echo.Context, id types.UUID) error {
status, err := s.svc.Job.GetStatus(ctx.Request().Context(), id)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to find job: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to find job: %s", err))
}
return ctx.JSON(http.StatusOK, JobStatusBody{
+1 -1
View File
@@ -13,7 +13,7 @@ import (
func (s *Controllers) GetJobCollectorByJobId(ctx echo.Context, jobId types.UUID) error {
coll, err := s.svc.Collector.GetByJobID(ctx.Request().Context(), jobId)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to get collector: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get collector: %s", err))
}
fields := make([]JobCollectorField, len(coll.Fields))
+4 -4
View File
@@ -13,12 +13,12 @@ import (
func (s *Controllers) ListQueries(ctx echo.Context) error {
queries, err := s.svc.Query.List(ctx.Request().Context())
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to list query: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to list query: %s", err))
}
outQueries, err := parseQueries(queries)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to list query: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to list query: %s", err))
}
return ctx.JSON(http.StatusOK, ListQueries{
@@ -29,12 +29,12 @@ func (s *Controllers) ListQueries(ctx echo.Context) error {
func (s *Controllers) GetQuery(ctx echo.Context, id types.UUID) error {
query, err := s.svc.Query.Get(ctx.Request().Context(), id)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to get query: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get query: %s", err))
}
qt, err := parseQuery(query)
if err != nil {
return echo.NewHTTPError(http.StatusNotFound, fmt.Sprintf("Unable to get query: %s", err))
return echo.NewHTTPError(http.StatusBadRequest, fmt.Sprintf("Unable to get query: %s", err))
}
return ctx.JSON(http.StatusOK, qt)
+6 -26
View File
@@ -69,8 +69,6 @@ paths:
$ref: "#/components/schemas/JobClient"
"400":
description: Invalid request parameters.
"404":
description: Client not found.
patch:
operationId: updateClient
tags:
@@ -88,8 +86,6 @@ paths:
description: Client updated successfully.
"400":
description: Invalid request body.
"404":
description: Client not found
/query:
get:
@@ -107,8 +103,6 @@ paths:
$ref: "#/components/schemas/ListQueries"
"400":
description: Invalid request parameters.
"404":
description: Query not found.
post:
operationId: createQuery
tags:
@@ -155,8 +149,6 @@ paths:
$ref: "#/components/schemas/Query"
"400":
description: Invalid request parameters.
"404":
description: Query not found.
patch:
operationId: updateQuery
tags:
@@ -174,8 +166,6 @@ paths:
description: Query updated successfully.
"400":
description: Invalid request body.
"404":
description: Query not found.
/query/{id}/test:
parameters:
@@ -255,8 +245,6 @@ paths:
$ref: "#/components/schemas/Job"
"400":
description: Invalid request parameters.
"404":
description: Job not found.
patch:
operationId: updateJob
tags:
@@ -274,8 +262,6 @@ paths:
description: Job updated successfully.
"400":
description: Invalid request body.
"404":
description: Job not found.
/job/{id}/status:
parameters:
@@ -301,8 +287,6 @@ paths:
$ref: "#/components/schemas/JobStatusBody"
"400":
description: Invalid request parameters.
"404":
description: Job not found.
/job/{id}/collector:
parameters:
@@ -326,8 +310,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/JobCollector"
"404":
description: Job collector not found.
"400":
description: Invalid body.
patch:
operationId: updateJobCollectorByJobId
tags:
@@ -345,8 +329,6 @@ paths:
description: Job collector updated successfully.
"400":
description: Invalid request body.
"404":
description: Job collector not found.
/job/{id}/documents:
parameters:
@@ -370,8 +352,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ListDocuments"
"404":
description: Job not found.
"400":
description: Invalid request body.
/job/export:
post:
@@ -395,8 +377,6 @@ paths:
$ref: "#/components/schemas/IdMessage"
"400":
description: Invalid request body.
"404":
description: Job not found.
/job/{id}/export:
parameters:
@@ -420,8 +400,8 @@ paths:
application/json:
schema:
$ref: "#/components/schemas/ExportDetails"
"404":
description: Export job not found.
"400":
description: Invalid body.
components:
schemas: