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

Merged in feature/serviceconfig-integration (pull request #38)

Browse Source 
DRAFT PR : WIP working through ideas for integration

* movearound

* attempttwo

* openapi

* further sanding

* fix

* start on tests

* runthroughsingleconfig

* somechanges

* reflectissue

* removeerrs

* mostlyremovepanic

* removeenv

* noncfgtests

* go

* repo

* fix service config test

* add PWD to all

* test fix

* fix lint

* todo for later

* passingunittests

* alltests

* testlogger

* testloggername

* clean
This commit is contained in:
Jay Brown
2025-01-31 13:43:55 +00:00
parent 058f8dba7f
commit 15adaebfcd
138 changed files with 1864 additions and 1695 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/queryService/client_test.go
+16 -18
View File
@@ -9,6 +9,7 @@ import (
"queryorchestration/internal/client"
"queryorchestration/internal/database"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"strings"
"testing"
@@ -24,14 +25,13 @@ func TestCreateClient(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Client: client.New(db),
Client: client.New(cfg),
})
body := queryservice.ClientCreate{
@@ -64,14 +64,13 @@ func TestGetClient(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Client: client.New(db),
Client: client.New(cfg),
})
e := echo.New()
@@ -107,14 +106,13 @@ func TestUpdateClient(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Client: client.New(db),
Client: client.New(cfg),
})
cs := false
api/queryService/job_test.go
+17 -21
View File
@@ -13,6 +13,7 @@ import (
documenttext "queryorchestration/internal/document/text"
"queryorchestration/internal/job"
"queryorchestration/internal/job/collector"
"queryorchestration/internal/serviceconfig"
"strings"
"testing"
@@ -29,16 +30,15 @@ func TestCreateJob(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
extract := documenttext.New()
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Job: job.New(db, &job.Services{
Collector: collector.New(db, &collector.Services{
Job: job.New(cfg, &job.Services{
Collector: collector.New(cfg, &collector.Services{
Clean: documentclean.New(),
Text: extract,
}),
@@ -81,15 +81,13 @@ func TestGetJob(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Job: job.New(db, &job.Services{
Client: client.New(db),
Job: job.New(cfg, &job.Services{
Client: client.New(cfg),
}),
})
@@ -133,15 +131,13 @@ func TestUpdateJob(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Job: job.New(db, &job.Services{
Client: client.New(db),
Job: job.New(cfg, &job.Services{
Client: client.New(cfg),
}),
})
api/queryService/jobcollector_test.go
+9 -12
View File
@@ -10,6 +10,7 @@ import (
documentclean "queryorchestration/internal/document/clean"
documenttext "queryorchestration/internal/document/text"
"queryorchestration/internal/job/collector"
"queryorchestration/internal/serviceconfig"
"strings"
"testing"
@@ -26,11 +27,9 @@ func TestUpdateJobCollector(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
av := int32(2)
body := queryservice.JobCollectorUpdate{
@@ -47,7 +46,7 @@ func TestUpdateJobCollector(t *testing.T) {
extract := documenttext.New()
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Collector: collector.New(db, &collector.Services{
Collector: collector.New(cfg, &collector.Services{
Clean: documentclean.New(),
Text: extract,
}),
@@ -83,11 +82,9 @@ func TestGetJobCollectorByJobId(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
e := echo.New()
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(""))
@@ -95,7 +92,7 @@ func TestGetJobCollectorByJobId(t *testing.T) {
ctx := e.NewContext(req, rec)
extract := documenttext.New()
svc := collector.New(db, &collector.Services{
svc := collector.New(cfg, &collector.Services{
Clean: documentclean.New(),
Text: extract,
})
api/queryService/query_test.go
+24 -33
View File
@@ -14,6 +14,7 @@ import (
"queryorchestration/internal/job/collector"
"queryorchestration/internal/query"
"queryorchestration/internal/query/result"
"queryorchestration/internal/serviceconfig"
"strings"
"testing"
@@ -31,14 +32,12 @@ func TestCreateQuery(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Query: query.New(db, &query.Services{}),
Query: query.New(cfg, &query.Services{}),
})
body := queryservice.QueryCreate{
@@ -73,14 +72,12 @@ func TestListQueries(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Query: query.New(db, &query.Services{}),
Query: query.New(cfg, &query.Services{}),
})
e := echo.New()
@@ -118,14 +115,12 @@ func TestGetQuery(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Query: query.New(db, &query.Services{}),
Query: query.New(cfg, &query.Services{}),
})
e := echo.New()
@@ -162,14 +157,12 @@ func TestUpdateQuery(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Query: query.New(db, &query.Services{}),
Query: query.New(cfg, &query.Services{}),
})
av := int32(2)
@@ -210,23 +203,21 @@ func TestTestQuery(t *testing.T) {
if err != nil {
t.Fatalf("failed to open pgxmock database: %v", err)
}
queries := repository.New(pool)
db := &database.Connection{
Queries: queries,
Pool: pool,
}
cfg := &serviceconfig.BaseConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
docsvc := document.New(db)
col := collector.New(db, &collector.Services{
docsvc := document.New(cfg)
col := collector.New(cfg, &collector.Services{
Clean: documentclean.New(),
Text: documenttext.New(),
})
cons := queryservice.NewControllers(validator.New(), &queryservice.Services{
Collector: col,
Query: query.New(db, &query.Services{
Query: query.New(cfg, &query.Services{
Document: docsvc,
Collector: col,
Result: result.New(db),
Result: result.New(cfg),
}),
})