Merged in feature/momocks (pull request #150)

Decrease Mocks

* feature/nomocks

* nonet

* assertsaws

* assert

api/queryVersionSyncRunner/runner_test.go

@@ -1,42 +1,36 @@
 package queryversionsyncrunner_test
 
 import (
-	"context"
-	"fmt"
+	"regexp"
 	"testing"
 
 	queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner"
 	"queryorchestration/internal/database/repository"
 	queryversionsync "queryorchestration/internal/query/versionsync"
 	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig/objectstore"
+	"queryorchestration/internal/serviceconfig/queue"
 	"queryorchestration/internal/serviceconfig/queue/clientsync"
-	queuemock "queryorchestration/mocks/queue"
+	"queryorchestration/internal/test"
 
-	"github.com/aws/aws-sdk-go-v2/service/sqs"
-	"github.com/google/uuid"
-	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
 type QuerySyncConfig struct {
 	runner.BaseConfig[queryversionsyncrunner.Body]
 	clientsync.ClientSyncConfig
+	queue.QueueConfig
+	objectstore.ObjectStoreConfig
 }
 
-func TestQueryRunner(t *testing.T) {
-	ctx := context.Background()
-
-	pool, err := pgxmock.NewPool()
-	require.NoError(t, err)
-
+func TestQueryVersionSyncRunner(t *testing.T) {
 	cfg := &QuerySyncConfig{}
-	cfg.DBPool = pool
-	cfg.DBQueries = repository.New(pool)
-	mockSQS := queuemock.NewMockSQSClient(t)
-	cfg.QueueClient = mockSQS
-	cfg.ClientSyncURL = "/i/am/here"
+	test.CreateDB(t, cfg)
+	acfg := test.CreateAWSContainer(t, cfg)
+
+	test.SetQueueClient(t, t.Context(), cfg, acfg.ExternalEndpoint)
+	cfg.ClientSyncURL = test.CreateQueue(t, cfg, test.ClientSyncRunnerName)
 
 	svc := queryversionsync.New(cfg)
 
@@ -44,42 +38,62 @@ func TestQueryRunner(t *testing.T) {
 		Sync: svc,
 	})
 
+	queryId, err := cfg.GetDBQueries().CreateQuery(t.Context(), repository.QuerytypeContextFull)
+	require.NoError(t, err)
+	version, err := cfg.GetDBQueries().AddLatestQueryVersion(t.Context(), queryId)
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().AddActiveQueryVersion(t.Context(), &repository.AddActiveQueryVersionParams{
+		Versionid: version,
+		Queryid:   queryId,
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
+		Clientid: "client_one",
+		Name:     "name_one",
+	})
+	require.NoError(t, err)
+	collectorOneVersion, err := cfg.GetDBQueries().AddLatestCollectorVersion(t.Context(), "client_one")
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().SetActiveCollectorVersion(t.Context(), &repository.SetActiveCollectorVersionParams{
+		Versionid: version,
+		Clientid:  "client_one",
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().AddCollectorQuery(t.Context(), &repository.AddCollectorQueryParams{
+		Queryid:      queryId,
+		Clientid:     "client_one",
+		Name:         "EXAMPLE_ONE",
+		Addedversion: collectorOneVersion,
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
+		Clientid: "client_two",
+		Name:     "name_two",
+	})
+	require.NoError(t, err)
+	collectorTwoVersion, err := cfg.GetDBQueries().AddLatestCollectorVersion(t.Context(), "client_two")
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().SetActiveCollectorVersion(t.Context(), &repository.SetActiveCollectorVersionParams{
+		Versionid: version,
+		Clientid:  "client_two",
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().AddCollectorQuery(t.Context(), &repository.AddCollectorQueryParams{
+		Queryid:      queryId,
+		Clientid:     "client_two",
+		Name:         "EXAMPLE_TWO",
+		Addedversion: collectorTwoVersion,
+	})
+	require.NoError(t, err)
+
 	doc := queryversionsyncrunner.Body{
-		QueryID: uuid.New(),
+		QueryID: queryId,
 	}
 
-	clientOne := "hello"
-	clientTwo := "bye"
-	clientIds := []string{
-		clientOne,
-		clientTwo,
-	}
+	assert.True(t, runner.Process(t.Context(), doc))
 
-	pool.ExpectQuery("name: ListQueryClientIDs :many").WithArgs(&doc.QueryID).
-		WillReturnRows(
-			pgxmock.NewRows([]string{"clientId"}).
-				AddRow(clientOne).
-				AddRow(clientTwo),
-		)
-
-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.ClientSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", clientIds[0])
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.ClientSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", clientIds[1])
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
-
-	assert.True(t, runner.Process(ctx, doc))
+	test.AssertMessageBodies(t, cfg, cfg.GetClientSyncURL(), []*regexp.Regexp{
+		regexp.MustCompile(`^{"id":"client_one"}$`),
+		regexp.MustCompile(`^{"id":"client_two"}$`),
+	})
 }