jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/textextract (pull request #108)

Browse Source 
Start adding Textract + UUID changes

* base

* startclient

* ts

* short

* tests
This commit is contained in:
Michael McGuinness
2025-03-20 11:06:41 +00:00
parent 1587da9d11
commit 53ea7d34e6
196 changed files with 25972 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/query/result/processor/parse.go
+14 -17
View File
@@ -3,7 +3,6 @@ package resultprocessor
import (
"fmt"
"queryorchestration/internal/database"
"queryorchestration/internal/database/repository"
"github.com/google/uuid"
@@ -67,22 +66,21 @@ func ToDBNullQueryType(t Type) (repository.NullQuerytype, error) {
}
func ParseDBCollectorQuery(q *repository.Collectorquerydependencytree) (*Query, error) {
var reqQueryIDs *[]uuid.UUID
if len(q.Requiredids) > 0 {
ids := database.MustToUUIDArray(q.Requiredids)
reqQueryIDs = &ids
}
qType, err := ParseDBType(q.Type)
if err != nil {
return nil, err
}
var reqIds *[]uuid.UUID
if len(q.Requiredids) > 0 {
reqIds = &q.Requiredids
}
return &Query{
ID: database.MustToUUID(q.Queryid),
ID: *q.Queryid,
Version: q.Queryversion,
Type: qType,
RequiredQueryIDs: reqQueryIDs,
RequiredQueryIDs: reqIds,
}, nil
}
@@ -96,23 +94,22 @@ func ParseFullQuery(qs *repository.Fullactivequery) (*Query, error) {
return nil, err
}
var rids *[]uuid.UUID
if len(qs.Requiredids) > 0 {
r := database.MustToUUIDArray(qs.Requiredids)
rids = &r
}
var cfg *string
if qs.Config != nil {
c := string(qs.Config)
cfg = &c
}
var reqIds *[]uuid.UUID
if len(qs.Requiredids) > 0 {
reqIds = &qs.Requiredids
}
return &Query{
ID: database.MustToUUID(qs.ID),
ID: qs.ID,
Type: qt,
Version: qs.Activeversion,
RequiredQueryIDs: rids,
RequiredQueryIDs: reqIds,
Config: cfg,
}, nil
}
internal/query/result/processor/parse_test.go
+17 -19
View File
@@ -3,21 +3,19 @@ package resultprocessor_test
import (
"testing"
"queryorchestration/internal/database"
"queryorchestration/internal/database/repository"
resultprocessor "queryorchestration/internal/query/result/processor"
"github.com/google/uuid"
"github.com/jackc/pgx/v5/pgtype"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestParseDBCollectorQuery(t *testing.T) {
dbResult := repository.Collectorquerydependencytree{
Clientid: pgtype.UUID{},
Queryid: pgtype.UUID{},
Requiredids: []pgtype.UUID{},
Clientid: uuid.UUID{},
Queryid: &uuid.UUID{},
Requiredids: []uuid.UUID{},
Type: repository.QuerytypeJsonExtractor,
Queryversion: 1,
}
@@ -118,7 +116,7 @@ func TestParseFullQuery(t *testing.T) {
assert.Nil(t, out)
q = &repository.Fullactivequery{
ID: database.MustToDBUUID(uuid.New()),
ID: uuid.New(),
Type: repository.QuerytypeContextFull,
Activeversion: 1,
Latestversion: 2,
@@ -126,36 +124,36 @@ func TestParseFullQuery(t *testing.T) {
out, err = resultprocessor.ParseFullQuery(q)
require.NoError(t, err)
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
assert.EqualExportedValues(t, resultprocessor.Query{
ID: q.ID,
Type: resultprocessor.TypeContextFull,
Version: 1,
}, out)
}, *out)
q = &repository.Fullactivequery{
ID: database.MustToDBUUID(uuid.New()),
ID: uuid.New(),
Type: repository.QuerytypeContextFull,
Activeversion: 1,
Latestversion: 2,
Requiredids: []pgtype.UUID{},
Requiredids: []uuid.UUID{},
}
out, err = resultprocessor.ParseFullQuery(q)
require.NoError(t, err)
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
ID: q.ID,
Type: resultprocessor.TypeContextFull,
Version: 1,
}, out)
q = &repository.Fullactivequery{
ID: database.MustToDBUUID(uuid.New()),
ID: uuid.New(),
Type: repository.QuerytypeContextFull,
Activeversion: 1,
Latestversion: 2,
Config: []byte("hello"),
Requiredids: []pgtype.UUID{
database.MustToDBUUID(uuid.New()),
Requiredids: []uuid.UUID{
uuid.New(),
},
}
@@ -163,11 +161,11 @@ func TestParseFullQuery(t *testing.T) {
require.NoError(t, err)
cfg := "hello"
assert.EqualExportedValues(t, &resultprocessor.Query{
ID: database.MustToUUID(q.ID),
ID: q.ID,
Type: resultprocessor.TypeContextFull,
Version: 1,
Config: &cfg,
RequiredQueryIDs: &[]uuid.UUID{database.MustToUUID(q.Requiredids[0])},
RequiredQueryIDs: &[]uuid.UUID{q.Requiredids[0]},
}, out)
}
@@ -179,7 +177,7 @@ func TestParseFullQueryArray(t *testing.T) {
q = []*repository.Fullactivequery{
{
ID: database.MustToDBUUID(uuid.New()),
ID: uuid.New(),
Type: repository.QuerytypeContextFull,
Activeversion: 1,
Latestversion: 2,
@@ -190,7 +188,7 @@ func TestParseFullQueryArray(t *testing.T) {
require.NoError(t, err)
assert.EqualExportedValues(t, []*resultprocessor.Query{
{
ID: database.MustToUUID(q[0].ID),
ID: q[0].ID,
Type: resultprocessor.TypeContextFull,
Version: 1,
},