Merged in feature/testquery (pull request #39)

Test Query

* depstextandclean

* startedcleaningresult

* resulttidyup

* roundone

* cleaning

* unsyncedquery

* startedtestsandsimplification

* api

* querytests

* resultprocessortests

* unittests

* cleanup
This commit is contained in:
Michael McGuinness
2025-01-29 11:52:37 +00:00
parent c36b0cdcf8
commit 0ac5ff9e15
109 changed files with 2804 additions and 2100 deletions
+14 -47
View File
@@ -4,20 +4,32 @@ import (
"context"
"queryorchestration/internal/database"
"queryorchestration/internal/database/repository"
queryprocessor "queryorchestration/internal/query/processor"
resultprocessor "queryorchestration/internal/query/result/processor"
"github.com/google/uuid"
)
type Query struct {
ID uuid.UUID
Type queryprocessor.Type
Type resultprocessor.Type
ActiveVersion int32
LatestVersion int32
RequiredQueryIDs *[]uuid.UUID
Config *string
}
func (s *Service) GetWithVersion(ctx context.Context, id uuid.UUID, version int32) (*Query, error) {
query, err := s.db.Queries.GetQueryWithVersion(ctx, &repository.GetQueryWithVersionParams{
ID: database.MustToDBUUID(id),
Addedversion: version,
})
if err != nil {
return nil, err
}
return ParseQueryWithVersion(query)
}
func (s *Service) Get(ctx context.Context, id uuid.UUID) (*Query, error) {
query, err := s.db.Queries.GetQuery(ctx, database.MustToDBUUID(id))
if err != nil {
@@ -26,48 +38,3 @@ func (s *Service) Get(ctx context.Context, id uuid.UUID) (*Query, error) {
return ParseFullActiveQuery(query)
}
func ParseFullActiveQuery(q *repository.Fullactivequery) (*Query, error) {
var reqQueryIDs *[]uuid.UUID
if len(q.Requiredids) > 0 {
rQ, err := database.ToUUIDArray(q.Requiredids)
if err != nil {
return nil, err
}
reqQueryIDs = &rQ
}
qType, err := queryprocessor.ParseDBType(q.Type)
if err != nil {
return nil, err
}
var scfg *string
if q.Config != nil && string(q.Config) != "" {
s := string(q.Config)
scfg = &s
}
return &Query{
ID: database.MustToUUID(q.ID),
ActiveVersion: q.Activeversion,
LatestVersion: q.Latestversion,
Type: qType,
RequiredQueryIDs: reqQueryIDs,
Config: scfg,
}, nil
}
func ParseFullActiveQueryArray(q []*repository.Fullactivequery) ([]*Query, error) {
queries := make([]*Query, len(q))
for index, query := range q {
q, err := ParseFullActiveQuery(query)
if err != nil {
return nil, err
}
queries[index] = q
}
return queries, nil
}