Merged in feature/openapifixes (pull request #106)

OpenAPI Middleware & Fixes

* updates
This commit is contained in:
Michael McGuinness
2025-03-18 13:06:42 +00:00
parent 555b6d420b
commit 3dd0c718cd
56 changed files with 8577 additions and 122 deletions
+81 -58
View File
@@ -188,7 +188,7 @@ type Document struct {
// DocumentID The document id.
type DocumentID = openapi_types.UUID
// DocumentSummary The document properties.
// DocumentSummary The document summary properties.
type DocumentSummary struct {
// Hash The document hash
Hash Hash `json:"hash"`
@@ -197,6 +197,12 @@ type DocumentSummary struct {
Id DocumentID `json:"id"`
}
// ErrorMessage Description of error
type ErrorMessage struct {
// Message Message describing the cause.
Message string `json:"message"`
}
// ExportDetails Payload for export trigger response.
type ExportDetails struct {
// ClientId The client external id
@@ -338,6 +344,18 @@ type RequiredQueryIDs = []QueryID
// Version The desired version.
type Version = int32
// InternalError Description of error
type InternalError = ErrorMessage
// InvalidRequest Description of error
type InvalidRequest = ErrorMessage
// TooManyRequests Description of error
type TooManyRequests = ErrorMessage
// Unauthorized Description of error
type Unauthorized = ErrorMessage
// CreateClientJSONRequestBody defines body for CreateClient for application/json ContentType.
type CreateClientJSONRequestBody = ClientCreate
@@ -711,63 +729,68 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL
// Base64 encoded, gzipped, json marshaled Swagger object
var swaggerSpec = []string{
"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",
"7wAAAP//OVAUyb5OAAA=",
"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",
"CjqVkFohm0PYPG7+PwAA///Y9ZsKxFkAAA==",
}
// GetSwagger returns the content of the embedded swagger specification file
+3 -4
View File
@@ -14,7 +14,6 @@ import (
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"github.com/pashagolub/pgxmock/v3"
@@ -30,7 +29,7 @@ func TestCreateClient(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})
@@ -66,7 +65,7 @@ func TestGetClient(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})
@@ -108,7 +107,7 @@ func TestUpdateClient(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})
+2 -3
View File
@@ -18,7 +18,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
@@ -68,7 +67,7 @@ func TestSetCollector(t *testing.T) {
rec := httptest.NewRecorder()
ctx := e.NewContext(req, rec)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
CollectorSet: collectorset.New(cfg, &collectorset.Services{
Collector: collector.New(cfg),
}),
@@ -134,7 +133,7 @@ func TestGetCollectorByclientId(t *testing.T) {
ctx := e.NewContext(req, rec)
svc := collector.New(cfg)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Collector: svc,
})
+3 -7
View File
@@ -9,8 +9,6 @@ import (
"queryorchestration/internal/query"
querytest "queryorchestration/internal/query/test"
queryupdate "queryorchestration/internal/query/update"
"github.com/go-playground/validator/v10"
)
const Name = "queryAPI"
@@ -27,13 +25,11 @@ type Services struct {
}
type Controllers struct {
validator *validator.Validate
svc *Services
svc *Services
}
func NewControllers(validator *validator.Validate, services *Services) *Controllers {
func NewControllers(services *Services) *Controllers {
return &Controllers{
validator: validator,
svc: services,
svc: services,
}
}
+1 -2
View File
@@ -5,11 +5,10 @@ import (
queryapi "queryorchestration/api/queryAPI"
"github.com/go-playground/validator/v10"
"github.com/stretchr/testify/assert"
)
func TestNewControllers(t *testing.T) {
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{})
cons := queryapi.NewControllers(&queryapi.Services{})
assert.NotNil(t, cons)
}
+2 -3
View File
@@ -15,7 +15,6 @@ import (
"queryorchestration/internal/serviceconfig/queue/clientsync"
queuemock "queryorchestration/mocks/queue"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"github.com/pashagolub/pgxmock/v3"
@@ -43,7 +42,7 @@ func TestListDocumentsByClientId(t *testing.T) {
rec := httptest.NewRecorder()
ctx := e.NewContext(req, rec)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Document: document.New(cfg),
})
@@ -91,7 +90,7 @@ func TestGetDocument(t *testing.T) {
rec := httptest.NewRecorder()
ctx := e.NewContext(req, rec)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Document: document.New(cfg),
})
+2 -3
View File
@@ -8,7 +8,6 @@ import (
queryapi "queryorchestration/api/queryAPI"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"github.com/stretchr/testify/assert"
@@ -20,7 +19,7 @@ func TestTriggerExport(t *testing.T) {
rec := httptest.NewRecorder()
ctx := e.NewContext(req, rec)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{})
cons := queryapi.NewControllers(&queryapi.Services{})
err := cons.TriggerExport(ctx, "clientid")
assert.NoError(t, err)
@@ -34,7 +33,7 @@ func TestExportState(t *testing.T) {
rec := httptest.NewRecorder()
ctx := e.NewContext(req, rec)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{})
cons := queryapi.NewControllers(&queryapi.Services{})
id := uuid.New()
+5 -6
View File
@@ -24,7 +24,6 @@ import (
"github.com/stretchr/testify/require"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgtype"
@@ -41,7 +40,7 @@ func TestCreateQuery(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
})
@@ -85,7 +84,7 @@ func TestListQueries(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
})
@@ -126,7 +125,7 @@ func TestGetQuery(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
})
@@ -172,7 +171,7 @@ func TestUpdateQuery(t *testing.T) {
cfg.QueueClient = mockSQS
cfg.QueryVersionSyncURL = "here"
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
QueryUpdate: queryupdate.New(cfg, &queryupdate.Services{
Query: query.New(cfg),
}),
@@ -230,7 +229,7 @@ func TestTestQuery(t *testing.T) {
docsvc := document.New(cfg)
col := collector.New(cfg)
que := query.New(cfg)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Collector: col,
Query: que,
QueryTest: querytest.New(cfg, &querytest.Services{
+1 -2
View File
@@ -13,7 +13,6 @@ import (
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
"github.com/pashagolub/pgxmock/v3"
@@ -28,7 +27,7 @@ func TestGetClientStatus(t *testing.T) {
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryapi.NewControllers(validator.New(), &queryapi.Services{
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})