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

Merged in feature/momocks (pull request #150)

Browse Source 
Decrease Mocks

* feature/nomocks

* nonet

* assertsaws

* assert
This commit is contained in:
Michael McGuinness
2025-05-23 00:20:01 +00:00
parent 36ff8096f3
commit 33d68b7e04
42 changed files with 617 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/queryAPI/client_test.go
+12 -22
View File
@@ -8,8 +8,6 @@ import (
"testing"
queryapi "queryorchestration/api/queryAPI"
"queryorchestration/internal/client"
clientupdate "queryorchestration/internal/client/update"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"queryorchestration/internal/serviceconfig/queue/clientsync"
@@ -27,13 +25,11 @@ type ClientConfig struct {
func TestCreateClient(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
body := queryapi.ClientCreate{
Name: "example_name",
@@ -57,13 +53,11 @@ func TestCreateClient(t *testing.T) {
func TestGetClient(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
id := "client_id"
@@ -92,15 +86,11 @@ func TestGetClient(t *testing.T) {
func TestUpdateClient(t *testing.T) {
t.Parallel()
cfg := &ClientConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
ClientUpdate: clientupdate.New(cfg, &clientupdate.Services{
Client: client.New(cfg),
}),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
id := "client_id"
api/queryAPI/collector_test.go
+15 -34
View File
@@ -3,31 +3,28 @@ package queryapi_test
import (
"fmt"
"net/http"
"regexp"
"testing"
queryapi "queryorchestration/api/queryAPI"
"queryorchestration/internal/collector"
collectorset "queryorchestration/internal/collector/set"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/serviceconfig"
"queryorchestration/internal/test"
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func TestSetCollector(t *testing.T) {
t.Parallel()
cfg := &ClientConfig{}
cfg.ClientSyncURL = "example"
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
acfg := test.CreateAWSContainer(t, cfg)
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
test.SetQueueClient(t, t.Context(), cfg, acfg.ExternalEndpoint)
cfg.ClientSyncURL = test.CreateQueue(t, cfg, test.ClientSyncRunnerName)
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
id := "clientid"
@@ -53,37 +50,21 @@ func TestSetCollector(t *testing.T) {
}
ctx, rec := createContextWithBody(t, body)
cons := queryapi.NewControllers(&queryapi.Services{
CollectorSet: collectorset.New(cfg, &collectorset.Services{
Collector: collector.New(cfg),
}),
})
mockSQS.EXPECT().
SendMessage(
mock.Anything,
mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
return *in.QueueUrl == cfg.GetClientSyncURL() && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", id)
}),
mock.Anything,
).
Return(&sqs.SendMessageOutput{}, nil)
err = cons.SetCollectorByClientId(ctx, id)
require.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
test.AssertMessageBody(t, cfg, cfg.GetClientSyncURL(), regexp.MustCompile(fmt.Sprintf("{\"id\":\"%s\"}", id)))
}
func TestGetCollectorByClientId(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Collector: collector.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
id := "clientid"
api/queryAPI/documents_test.go
+8 -21
View File
@@ -6,9 +6,6 @@ import (
queryapi "queryorchestration/api/queryAPI"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/document"
"queryorchestration/internal/serviceconfig"
"queryorchestration/internal/serviceconfig/queue/clientsync"
"queryorchestration/internal/test"
"github.com/stretchr/testify/assert"
@@ -17,16 +14,11 @@ import (
func TestListDocumentsByClientId(t *testing.T) {
t.Parallel()
cfg := &struct {
serviceconfig.BaseConfig
clientsync.ClientSyncConfig
}{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Document: document.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
Clientid: "client_id",
@@ -54,16 +46,11 @@ func TestListDocumentsByClientId(t *testing.T) {
func TestGetDocument(t *testing.T) {
t.Parallel()
cfg := &struct {
serviceconfig.BaseConfig
clientsync.ClientSyncConfig
}{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Document: document.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
Clientid: "client_id",
api/queryAPI/query_test.go
+81 -71
View File
@@ -3,37 +3,41 @@ package queryapi_test
import (
"fmt"
"net/http"
"regexp"
"testing"
"time"
queryapi "queryorchestration/api/queryAPI"
"queryorchestration/internal/client"
clientupdate "queryorchestration/internal/client/update"
"queryorchestration/internal/collector"
collectorset "queryorchestration/internal/collector/set"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/document"
"queryorchestration/internal/export"
"queryorchestration/internal/query"
"queryorchestration/internal/query/result"
resultprocessor "queryorchestration/internal/query/result/processor"
querytest "queryorchestration/internal/query/test"
queryupdate "queryorchestration/internal/query/update"
"queryorchestration/internal/serviceconfig"
"queryorchestration/internal/serviceconfig/objectstore"
"queryorchestration/internal/serviceconfig/queue"
"queryorchestration/internal/serviceconfig/queue/clientsync"
"queryorchestration/internal/serviceconfig/queue/queryversionsync"
"queryorchestration/internal/test"
queuemock "queryorchestration/mocks/queue"
"github.com/jackc/pgx/v5/pgtype"
"github.com/stretchr/testify/require"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
func TestCreateQuery(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
@@ -53,13 +57,11 @@ func TestCreateQuery(t *testing.T) {
func TestListQueries(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
ctx, rec := createContext(t)
@@ -83,13 +85,11 @@ func TestListQueries(t *testing.T) {
func TestGetQuery(t *testing.T) {
t.Parallel()
cfg := &serviceconfig.BaseConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Query: query.New(cfg),
})
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
ctx, rec := createContext(t)
@@ -109,21 +109,15 @@ func TestGetQuery(t *testing.T) {
func TestUpdateQuery(t *testing.T) {
t.Parallel()
cfg := &struct {
serviceconfig.BaseConfig
queryversionsync.QueryVersionSyncConfig
}{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
cfg.QueryVersionSyncURL = "here"
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
acfg := test.CreateAWSContainer(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
QueryUpdate: queryupdate.New(cfg, &queryupdate.Services{
Query: query.New(cfg),
}),
})
test.SetQueueClient(t, t.Context(), cfg, acfg.ExternalEndpoint)
cfg.QueryVersionSyncURL = test.CreateQueue(t, cfg, test.QueryVersionSyncRunnerName)
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
id, err := cfg.GetDBQueries().CreateQuery(t.Context(), repository.QuerytypeJsonExtractor)
require.NoError(t, err)
@@ -136,64 +130,55 @@ func TestUpdateQuery(t *testing.T) {
}
ctx, rec := createContextWithBody(t, body)
mockSQS.EXPECT().
SendMessage(
mock.Anything,
mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
return *in.QueueUrl == cfg.QueryVersionSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", id.String())
}),
mock.Anything,
).
Return(&sqs.SendMessageOutput{}, nil)
err = cons.UpdateQuery(ctx, id)
require.NoError(t, err)
assert.Equal(t, http.StatusOK, rec.Code)
assert.Empty(t, rec.Body.String())
test.AssertMessageBody(t, cfg, cfg.GetQueryVersionSyncURL(), regexp.MustCompile(fmt.Sprintf(`{"id":"%s"}`, id)))
}
type QueryUpdateConfig struct {
type ControllerConfig struct {
serviceconfig.BaseConfig
queryversionsync.QueryVersionSyncConfig
clientsync.ClientSyncConfig
queue.QueueConfig
objectstore.ObjectStoreConfig
}
func TestTestQuery(t *testing.T) {
t.Parallel()
cfg := &QueryUpdateConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
func createControllerServices(cfg *ControllerConfig) *queryapi.Services {
docsvc := document.New(cfg)
col := collector.New(cfg)
que := query.New(cfg)
queup := queryupdate.New(cfg, &queryupdate.Services{
Query: que,
})
cons := queryapi.NewControllers(&queryapi.Services{
Collector: col,
Query: que,
QueryUpdate: queup,
QueryTest: querytest.New(cfg, &querytest.Services{
Document: docsvc,
cli := client.New(cfg)
return &queryapi.Services{
Export: export.New(),
Collector: col,
CollectorSet: collectorset.New(cfg, &collectorset.Services{
Collector: col,
}),
Query: que,
QueryUpdate: queryupdate.New(cfg, &queryupdate.Services{
Query: que,
}),
QueryTest: querytest.New(cfg, &querytest.Services{
Result: result.New(cfg, &result.Services{
Query: que,
}),
Collector: col,
Document: docsvc,
}),
})
Client: cli,
ClientUpdate: clientupdate.New(cfg, &clientupdate.Services{
Client: cli,
}),
Document: docsvc,
}
}
contextQueryId, err := que.Create(t.Context(), &resultprocessor.Create{
Type: resultprocessor.TypeContextFull,
})
require.NoError(t, err)
err = cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
Clientid: "client_id",
Name: "client_name",
})
require.NoError(t, err)
func createDocumentWithText(t testing.TB, cfg *ControllerConfig, clientId string) (uuid.UUID, uuid.UUID, uuid.UUID) {
docId, err := cfg.GetDBQueries().CreateDocument(t.Context(), &repository.CreateDocumentParams{
Clientid: "client_id",
Clientid: clientId,
Hash: "hash",
})
require.NoError(t, err)
@@ -230,6 +215,31 @@ func TestTestQuery(t *testing.T) {
Version: 1,
})
require.NoError(t, err)
return docId, cleanId, textId
}
func TestTestQuery(t *testing.T) {
t.Parallel()
cfg := &ControllerConfig{}
test.CreateDB(t, cfg)
svc := createControllerServices(cfg)
cons := queryapi.NewControllers(svc)
contextQueryId, err := svc.Query.Create(t.Context(), &resultprocessor.Create{
Type: resultprocessor.TypeContextFull,
})
require.NoError(t, err)
_, err = svc.Client.Create(t.Context(), client.CreateParams{
ID: "client_id",
Name: "client_name",
})
require.NoError(t, err)
docId, _, textId := createDocumentWithText(t, cfg, "client_id")
strVal := `{"mykey": "example_value", "oldkey": "old_value"}`
_, err = cfg.GetDBQueries().AddResult(t.Context(), &repository.AddResultParams{
Queryid: contextQueryId,
@@ -240,7 +250,7 @@ func TestTestQuery(t *testing.T) {
require.NoError(t, err)
c := `{"path": "oldkey"}`
queryId, err := que.Create(t.Context(), &resultprocessor.Create{
queryId, err := svc.Query.Create(t.Context(), &resultprocessor.Create{
Type: resultprocessor.TypeJsonExtractor,
Config: &c,
RequiredQueryIDs: &[]uuid.UUID{
@@ -249,7 +259,7 @@ func TestTestQuery(t *testing.T) {
})
require.NoError(t, err)
c = `{"path": "mykey"}`
err = queup.Update(t.Context(), &resultprocessor.Update{
err = svc.QueryUpdate.Update(t.Context(), &resultprocessor.Update{
ID: queryId,
Config: &c,
})
api/queryAPI/status_test.go
+2 -4
View File
@@ -17,8 +17,7 @@ import (
func TestGetClientStatus(t *testing.T) {
t.Parallel()
cfg := &ClientConfig{}
net := test.GetNetwork(t)
test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
test.CreateDB(t, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),
@@ -50,8 +49,7 @@ func TestGetClientStatus(t *testing.T) {
func BenchmarkGetClientStatus(b *testing.B) {
cfg := &ClientConfig{}
net := test.GetNetwork(b)
test.CreateDB(b, cfg, net, &test.CreateDatabaseConfig{})
test.CreateDB(b, cfg)
cons := queryapi.NewControllers(&queryapi.Services{
Client: client.New(cfg),