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

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

api/queryService/query_test.go

@@ -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),
 		}),
 	})