Merged in feature/momocks (pull request #150)

Decrease Mocks * feature/nomocks * nonet * assertsaws * assert
2025-05-23 00:20:01 +00:00
parent 36ff8096f3
commit 33d68b7e04
42 changed files with 617 additions and 650 deletions
@@ -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,
 	})