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

Merged in feature/docinitialisation (pull request #41)

Browse Source 
Queuing Changes and Cfg Testing

* staarting

* staarting

* startedpush

* note

* save

* mocking

* removederrs

* fixtests

* cleanuperrs

* newenvsetup

* preppingtests

* queue

* mmovetocfgpassunittests

* sortoutconfig

* passinginteg

* deps

* fixtests
This commit is contained in:
Michael McGuinness
2025-02-03 17:30:50 +00:00
parent 15adaebfcd
commit 7001ca854c
135 changed files with 3916 additions and 1523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/repository/result_test.go
+47 -57
View File
@@ -5,7 +5,6 @@ import (
"os"
"path"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"queryorchestration/internal/test"
"testing"
@@ -16,11 +15,8 @@ import (
func TestResults(t *testing.T) {
ctx := context.Background()
t.Setenv("BASE_PATH", path.Join(os.Getenv("PWD"), "../../.."))
cfg := &serviceconfig.BaseConfig{}
err := serviceconfig.InitializeConfig(cfg)
assert.Nil(t, err)
cfg := test.CreateBaseConfig()
cfg.BasePath = path.Join(os.Getenv("PWD"), "../../..")
_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
Cfg: cfg,
RunMigrations: true,
@@ -30,20 +26,20 @@ func TestResults(t *testing.T) {
queries := cfg.DBQueries
jsonQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeJsonExtractor))
assert.Nil(t, err)
assert.NoError(t, err)
clientId, err := queries.CreateClient(ctx, "example_client")
assert.Nil(t, err)
assert.NoError(t, err)
jobId, err := queries.CreateJob(ctx, clientId)
assert.Nil(t, err)
assert.NoError(t, err)
documentID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobId,
Hash: "example_hash",
})
assert.Nil(t, err)
assert.NoError(t, err)
jsonQuery, err := queries.GetQuery(ctx, jsonQueryID)
assert.Nil(t, err)
assert.NoError(t, err)
cleanVersion := int32(1)
textVersion := int32(1)
@@ -57,7 +53,7 @@ func TestResults(t *testing.T) {
Textversion: textVersion,
Queryversion: jsonQuery.Activeversion,
})
assert.Nil(t, err)
assert.NoError(t, err)
assert.True(t, jsonResultID.Valid)
res, err := queries.GetResultValueWithVersion(ctx, &repository.GetResultValueWithVersionParams{
@@ -67,7 +63,7 @@ func TestResults(t *testing.T) {
Cleanversion: cleanVersion,
Textversion: textVersion,
})
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetResultValueWithVersionRow{
ID: jsonResultID,
Value: jsonResultValue,
@@ -77,11 +73,8 @@ func TestResults(t *testing.T) {
func TestResultValues(t *testing.T) {
ctx := context.Background()
t.Setenv("BASE_PATH", path.Join(os.Getenv("PWD"), "../../.."))
cfg := &serviceconfig.BaseConfig{}
err := serviceconfig.InitializeConfig(cfg)
assert.Nil(t, err)
cfg := test.CreateBaseConfig()
cfg.BasePath = path.Join(os.Getenv("PWD"), "../../..")
_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
Cfg: cfg,
RunMigrations: true,
@@ -91,29 +84,29 @@ func TestResultValues(t *testing.T) {
queries := cfg.DBQueries
jsonQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeJsonExtractor))
assert.Nil(t, err)
assert.NoError(t, err)
clientId, err := queries.CreateClient(ctx, "example_client")
assert.Nil(t, err)
assert.NoError(t, err)
jobId, err := queries.CreateJob(ctx, clientId)
assert.Nil(t, err)
assert.NoError(t, err)
documentID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobId,
Hash: "example_hash",
})
assert.Nil(t, err)
assert.NoError(t, err)
contextQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeContextFull))
assert.Nil(t, err)
assert.NoError(t, err)
err = queries.AddRequiredQuery(ctx, &repository.AddRequiredQueryParams{
Queryid: jsonQueryID,
Requiredqueryid: contextQueryID,
Addedversion: 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
contextQuery, err := queries.GetQuery(ctx, contextQueryID)
assert.Nil(t, err)
assert.NoError(t, err)
result := repository.SetResultParams{
Queryid: contextQueryID,
@@ -125,7 +118,7 @@ func TestResultValues(t *testing.T) {
}
_, err = queries.SetResult(ctx, &result)
assert.Nil(t, err)
assert.NoError(t, err)
_, err = queries.SetResult(ctx, &repository.SetResultParams{
Queryid: contextQueryID,
@@ -135,7 +128,7 @@ func TestResultValues(t *testing.T) {
Textversion: 2,
Queryversion: contextQuery.Activeversion - 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
_, err = queries.SetResult(ctx, &repository.SetResultParams{
Queryid: contextQueryID,
@@ -145,7 +138,7 @@ func TestResultValues(t *testing.T) {
Textversion: 2,
Queryversion: contextQuery.Activeversion,
})
assert.Nil(t, err)
assert.NoError(t, err)
_, err = queries.SetResult(ctx, &repository.SetResultParams{
Queryid: jsonQueryID,
@@ -155,7 +148,7 @@ func TestResultValues(t *testing.T) {
Textversion: 2,
Queryversion: contextQuery.Activeversion,
})
assert.Nil(t, err)
assert.NoError(t, err)
qResults, err := queries.ListQueryRequirementValues(ctx, &repository.ListQueryRequirementValuesParams{
Queryid: jsonQueryID,
@@ -164,7 +157,7 @@ func TestResultValues(t *testing.T) {
Cleanversion: result.Cleanversion,
Textversion: result.Textversion,
})
assert.Nil(t, err)
assert.NoError(t, err)
assert.EqualExportedValues(t, []*repository.ListQueryRequirementValuesRow{
{
Queryid: contextQueryID,
@@ -177,11 +170,8 @@ func TestResultValues(t *testing.T) {
func TestUnsyncedQueries(t *testing.T) {
ctx := context.Background()
t.Setenv("BASE_PATH", path.Join(os.Getenv("PWD"), "../../.."))
cfg := &serviceconfig.BaseConfig{}
err := serviceconfig.InitializeConfig(cfg)
assert.Nil(t, err)
cfg := test.CreateBaseConfig()
cfg.BasePath = path.Join(os.Getenv("PWD"), "../../..")
_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
Cfg: cfg,
RunMigrations: true,
@@ -191,27 +181,27 @@ func TestUnsyncedQueries(t *testing.T) {
queries := cfg.DBQueries
clientId, err := queries.CreateClient(ctx, "example_client")
assert.Nil(t, err)
assert.NoError(t, err)
jobId, err := queries.CreateJob(ctx, clientId)
assert.Nil(t, err)
assert.NoError(t, err)
collectorId, err := queries.CreateCollector(ctx, jobId)
assert.Nil(t, err)
assert.NoError(t, err)
documentID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobId,
Hash: "example_hash",
})
assert.Nil(t, err)
assert.NoError(t, err)
contextQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeContextFull))
assert.Nil(t, err)
assert.NoError(t, err)
jsonQueryID, err := queries.CreateQuery(ctx, repository.Querytype(repository.QuerytypeJsonExtractor))
assert.Nil(t, err)
assert.NoError(t, err)
err = queries.AddRequiredQuery(ctx, &repository.AddRequiredQueryParams{
Queryid: jsonQueryID,
Requiredqueryid: contextQueryID,
Addedversion: 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
err = queries.AddCollectorQuery(ctx, &repository.AddCollectorQueryParams{
Collectorid: collectorId,
@@ -219,10 +209,10 @@ func TestUnsyncedQueries(t *testing.T) {
Queryid: jsonQueryID,
Addedversion: 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err := queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 2)
assert.ElementsMatch(t, []*repository.Fullactivequery{
{
@@ -251,10 +241,10 @@ func TestUnsyncedQueries(t *testing.T) {
Textversion: 2,
Queryversion: 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 1)
assert.ElementsMatch(t, []*repository.Fullactivequery{
{
@@ -272,10 +262,10 @@ func TestUnsyncedQueries(t *testing.T) {
Activeversion: 2,
ID: contextQueryID,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 2)
assert.ElementsMatch(t, []*repository.Fullactivequery{
{
@@ -304,7 +294,7 @@ func TestUnsyncedQueries(t *testing.T) {
Textversion: 2,
Queryversion: 2,
})
assert.Nil(t, err)
assert.NoError(t, err)
_, err = queries.SetResult(ctx, &repository.SetResultParams{
Queryid: jsonQueryID,
Documentid: documentID,
@@ -313,10 +303,10 @@ func TestUnsyncedQueries(t *testing.T) {
Textversion: 2,
Queryversion: 1,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 0)
err = queries.UpdateQuery(ctx, &repository.UpdateQueryParams{
@@ -324,10 +314,10 @@ func TestUnsyncedQueries(t *testing.T) {
Activeversion: 2,
ID: jsonQueryID,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 1)
assert.ElementsMatch(t, []*repository.Fullactivequery{
{
@@ -348,10 +338,10 @@ func TestUnsyncedQueries(t *testing.T) {
Textversion: 2,
Queryversion: 2,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 0)
err = queries.UpdateQuery(ctx, &repository.UpdateQueryParams{
@@ -359,10 +349,10 @@ func TestUnsyncedQueries(t *testing.T) {
Activeversion: 3,
ID: contextQueryID,
})
assert.Nil(t, err)
assert.NoError(t, err)
qs, err = queries.ListUnsyncedQueriesByDocId(ctx, documentID)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Len(t, qs, 2)
assert.ElementsMatch(t, []*repository.Fullactivequery{
{