Merged in feature/momocks (pull request #150)

Decrease Mocks

* feature/nomocks

* nonet

* assertsaws

* assert

api/querySyncRunner/runner_test.go

@@ -1,81 +1,120 @@
 package querysyncrunner_test
 
 import (
-	"context"
 	"fmt"
+	"regexp"
 	"testing"
+	"time"
 
 	querysyncrunner "queryorchestration/api/querySyncRunner"
 	"queryorchestration/internal/database/repository"
 	resultsync "queryorchestration/internal/query/result/sync"
 	querysync "queryorchestration/internal/query/sync"
 	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig/objectstore"
+	"queryorchestration/internal/serviceconfig/queue"
 	queryc "queryorchestration/internal/serviceconfig/queue/query"
-	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/jackc/pgx/v5/pgtype"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
 type QuerySyncConfig struct {
 	runner.BaseConfig[querysyncrunner.Body]
 	queryc.QueryConfig
+	queue.QueueConfig
+	objectstore.ObjectStoreConfig
 }
 
-func TestQueryRunner(t *testing.T) {
-	ctx := context.Background()
-
-	pool, err := pgxmock.NewPool()
-	require.NoError(t, err)
-
+func TestQuerySyncRunner(t *testing.T) {
 	cfg := &QuerySyncConfig{}
-	cfg.DBPool = pool
-	cfg.DBQueries = repository.New(pool)
-	mockSQS := queuemock.NewMockSQSClient(t)
-	cfg.QueueClient = mockSQS
-	cfg.QueryURL = "/i/am/here"
+	test.CreateDB(t, cfg)
+	acfg := test.CreateAWSContainer(t, cfg)
 
-	svc := querysync.New(cfg, &querysync.Services{
-		ResultSync: resultsync.New(cfg),
-	})
+	test.SetQueueClient(t, t.Context(), cfg, acfg.ExternalEndpoint)
+	cfg.QueryURL = test.CreateQueue(t, cfg, test.QueryRunnerName)
 
 	runner := querysyncrunner.New(&querysyncrunner.Services{
-		QuerySync: svc,
+		QuerySync: querysync.New(cfg, &querysync.Services{
+			ResultSync: resultsync.New(cfg),
+		}),
 	})
 
+	err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
+		Clientid: "client_one",
+		Name:     "name_one",
+	})
+	require.NoError(t, err)
+	docId, err := cfg.GetDBQueries().CreateDocument(t.Context(), &repository.CreateDocumentParams{
+		Clientid: "client_one",
+		Hash:     "hash",
+	})
+	require.NoError(t, err)
+	fill := "fill"
+	cleanId, err := cfg.GetDBQueries().AddDocumentClean(t.Context(), &repository.AddDocumentCleanParams{
+		Documentid: docId,
+		Bucket:     &fill,
+		Key:        &fill,
+		Hash:       &fill,
+		Mimetype: repository.NullCleanmimetype{
+			Valid:         true,
+			Cleanmimetype: repository.CleanmimetypeApplicationPdf,
+		},
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().AddDocumentCleanEntry(t.Context(), &repository.AddDocumentCleanEntryParams{
+		Cleanid: cleanId,
+		Version: 1,
+	})
+	require.NoError(t, err)
+	textId, err := cfg.GetDBQueries().AddDocumentText(t.Context(), &repository.AddDocumentTextParams{
+		Cleanid: cleanId,
+		Bucket:  fill,
+		Key:     fill,
+		Hash:    fill,
+		Createdat: pgtype.Timestamp{
+			Time:  time.Now(),
+			Valid: true,
+		},
+	})
+	require.NoError(t, err)
+	err = cfg.GetDBQueries().AddDocumentTextEntry(t.Context(), &repository.AddDocumentTextEntryParams{
+		Textid:  textId,
+		Version: 1,
+	})
+	require.NoError(t, err)
+
+	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)
+	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)
+
 	doc := querysyncrunner.Body{
-		DocumentID: uuid.New(),
+		DocumentID: docId,
 	}
 
-	reqId := uuid.New()
-	qs := []uuid.UUID{
-		reqId,
-	}
+	assert.True(t, runner.Process(t.Context(), doc))
 
-	pool.ExpectQuery("name: IsDocumentTextExtracted :one").WithArgs(doc.DocumentID).
-		WillReturnRows(
-			pgxmock.NewRows([]string{"isextracted"}).
-				AddRow(true),
-		)
-	pool.ExpectQuery("name: ListUnsyncedNoDepsQueriesByDocId :many").WithArgs(&doc.DocumentID).
-		WillReturnRows(
-			pgxmock.NewRows([]string{"id"}).
-				AddRow(&reqId),
-		)
-
-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.QueryURL && *in.MessageBody == fmt.Sprintf("{\"document_id\":\"%s\",\"query_id\":\"%s\"}", doc.DocumentID.String(), qs[0].String())
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
-
-	assert.True(t, runner.Process(ctx, doc))
+	test.AssertMessageBody(t, cfg, cfg.GetQueryURL(), regexp.MustCompile(fmt.Sprintf("{\"document_id\":\"%s\",\"query_id\":\"%s\"}", docId, queryId)))
 }