Merged in feature/splitqueryrunning (pull request #57)
Split Query Running + Debugging Full Flow * completedquerysyncrunner * spliitinglogic * synccomplete * informdependents * only push same collector * deps * livetesting * foundissue * some issues resolved * activeupdate * collectorupdatefixes * fix dbquesries * tests * tests * pollingdebug
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
"queryorchestration/internal/job/collector"
|
||||
"queryorchestration/internal/query"
|
||||
"queryorchestration/internal/query/result"
|
||||
querytest "queryorchestration/internal/query/test"
|
||||
"queryorchestration/internal/serviceconfig"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -35,7 +36,7 @@ func TestCreateQuery(t *testing.T) {
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
|
||||
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
|
||||
Query: query.New(cfg, &query.Services{}),
|
||||
Query: query.New(cfg),
|
||||
})
|
||||
|
||||
body := queryservice.QueryCreate{
|
||||
@@ -75,7 +76,7 @@ func TestListQueries(t *testing.T) {
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
|
||||
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
|
||||
Query: query.New(cfg, &query.Services{}),
|
||||
Query: query.New(cfg),
|
||||
})
|
||||
|
||||
e := echo.New()
|
||||
@@ -118,7 +119,7 @@ func TestGetQuery(t *testing.T) {
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
|
||||
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
|
||||
Query: query.New(cfg, &query.Services{}),
|
||||
Query: query.New(cfg),
|
||||
})
|
||||
|
||||
e := echo.New()
|
||||
@@ -160,7 +161,7 @@ func TestUpdateQuery(t *testing.T) {
|
||||
cfg.DBQueries = repository.New(pool)
|
||||
|
||||
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
|
||||
Query: query.New(cfg, &query.Services{}),
|
||||
Query: query.New(cfg),
|
||||
})
|
||||
|
||||
av := int32(2)
|
||||
@@ -209,12 +210,16 @@ func TestTestQuery(t *testing.T) {
|
||||
col := collector.New(cfg, &collector.Services{
|
||||
Document: docsvc,
|
||||
})
|
||||
que := query.New(cfg)
|
||||
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
|
||||
Collector: col,
|
||||
Query: query.New(cfg, &query.Services{
|
||||
Query: que,
|
||||
QueryTest: querytest.New(cfg, &querytest.Services{
|
||||
Document: docsvc,
|
||||
Collector: col,
|
||||
Result: result.New(cfg),
|
||||
Result: result.New(cfg, &result.Services{
|
||||
Query: que,
|
||||
}),
|
||||
}),
|
||||
})
|
||||
|
||||
@@ -227,7 +232,7 @@ func TestTestQuery(t *testing.T) {
|
||||
JobID: coll.JobID,
|
||||
Hash: "example_hash",
|
||||
}
|
||||
params := &query.Test{
|
||||
params := &result.Process{
|
||||
QueryID: uuid.New(),
|
||||
DocumentID: doc.ID,
|
||||
QueryVersion: int32(3),
|
||||
@@ -260,10 +265,10 @@ func TestTestQuery(t *testing.T) {
|
||||
pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
|
||||
AddRow(database.MustToDBUUID(params.QueryID), repository.QuerytypeJsonExtractor, int32(1), params.QueryVersion+1, []byte("{\"path\":\"oldkey\"}"), []pgtype.UUID{reqID}),
|
||||
)
|
||||
pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(database.MustToDBUUID(params.QueryID), params.QueryVersion, database.MustToDBUUID(params.DocumentID), coll.MinCleanVersion, coll.MinTextVersion).
|
||||
pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(database.MustToDBUUID(params.DocumentID), database.MustToDBUUID(params.QueryID), params.QueryVersion).
|
||||
WillReturnRows(
|
||||
pgxmock.NewRows([]string{"queryId", "value", "type"}).
|
||||
AddRow(reqID, "{\"mykey\":\"example_value\",\"oldkey\":\"old_value\"}", repository.QuerytypeContextFull),
|
||||
pgxmock.NewRows([]string{"queryId", "type", "value"}).
|
||||
AddRow(reqID, repository.QuerytypeContextFull, "{\"mykey\":\"example_value\",\"oldkey\":\"old_value\"}"),
|
||||
)
|
||||
pool.ExpectQuery("name: GetQueryConfig :one").WithArgs(database.MustToDBUUID(params.QueryID), params.QueryVersion).WillReturnRows(
|
||||
pgxmock.NewRows([]string{"id", "config"}).
|
||||
|
||||
Reference in New Issue
Block a user