Merged in feature/checkbox (pull request #145)

Checkbox Primary Edge Cases

* hascheckboxlogic

* gen

* preppinggen

* exploringcheckbox

* removeunselected

* tests

* failingtest

* failintests

* nomockqueryapi

* db

* name

* nocontainer

* deleterow

* cnc

* extradocsandupdatetextracts

* moretables

* appndedtables

* baseversion

api/docInitRunner/runner_test.go

@@ -1,23 +1,19 @@
 package docinitrunner_test
 
 import (
-	"context"
-	"fmt"
 	"testing"
 	"time"
 
 	docinitrunner "queryorchestration/api/docInitRunner"
 	"queryorchestration/internal/database/repository"
-	"queryorchestration/internal/document"
 	documentinit "queryorchestration/internal/document/init"
 	"queryorchestration/internal/server/runner"
 	"queryorchestration/internal/serviceconfig/objectstore"
 	"queryorchestration/internal/serviceconfig/queue/documentsync"
+	"queryorchestration/internal/test"
 	queuemock "queryorchestration/mocks/queue"
 
 	"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"
@@ -29,14 +25,11 @@ type DocInitConfig struct {
 }
 
 func TestDocInitRunner(t *testing.T) {
-	ctx := context.Background()
-
-	pool, err := pgxmock.NewPool()
-	require.NoError(t, err)
-
+	t.Parallel()
 	cfg := &DocInitConfig{}
-	cfg.DBPool = pool
-	cfg.DBQueries = repository.New(pool)
+	net := test.GetNetwork(t)
+	test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
+
 	mockSQS := queuemock.NewMockSQSClient(t)
 	cfg.QueueClient = mockSQS
 
@@ -44,53 +37,32 @@ func TestDocInitRunner(t *testing.T) {
 		Document: documentinit.New(cfg),
 	})
 
-	t.Run("valid", func(t *testing.T) {
-		clientId := "clientid"
-		bucketName := "bucketName"
-		location := objectstore.BucketKey{
-			Location:  objectstore.Import,
-			ClientID:  clientId,
-			CreatedAt: time.Now().UTC(),
-		}
-		docinfo := document.DocumentSummary{
-			ID:       uuid.New(),
-			ClientID: "hello",
-			Hash:     "example_hash",
-		}
-		doc := docinitrunner.Body{
-			Bucket: bucketName,
-			Key:    location.String(),
-			Hash:   docinfo.Hash,
-		}
-
-		pool.ExpectQuery("name: GetDocumentIDByHash :one").WithArgs(docinfo.Hash, clientId).WillReturnRows(
-			pgxmock.NewRows([]string{"id"}),
-		)
-		pool.ExpectBegin()
-		pool.ExpectQuery("name: CreateDocument :one").WithArgs(clientId, docinfo.Hash).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id"}).
-					AddRow(docinfo.ID),
-			)
-		pool.ExpectExec("name: AddDocumentEntry :exec").WithArgs(docinfo.ID, bucketName, location.String()).
-			WillReturnResult(pgxmock.NewResult("", 1))
-		pool.ExpectCommit()
-		pool.ExpectQuery("name: GetDocumentSummary :one").WithArgs(docinfo.ID).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id", "clientId", "hash"}).
-					AddRow(docinfo.ID, docinfo.ClientID, "example"),
-			)
-
-		mockSQS.EXPECT().
-			SendMessage(
-				mock.Anything,
-				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-					return *in.QueueUrl == cfg.DocumentSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", docinfo.ID.String())
-				}),
-				mock.Anything,
-			).
-			Return(&sqs.SendMessageOutput{}, nil)
-
-		assert.True(t, runner.Process(ctx, doc))
+	err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
+		Clientid: "clientid",
+		Name:     "client_name",
 	})
+	require.NoError(t, err)
+
+	location := objectstore.BucketKey{
+		Location:  objectstore.Import,
+		ClientID:  "clientid",
+		CreatedAt: time.Now().UTC(),
+	}
+	doc := docinitrunner.Body{
+		Bucket: "bucket",
+		Key:    location.String(),
+		Hash:   "hash",
+	}
+
+	mockSQS.EXPECT().
+		SendMessage(
+			mock.Anything,
+			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+				return *in.QueueUrl == cfg.DocumentSyncURL
+			}),
+			mock.Anything,
+		).
+		Return(&sqs.SendMessageOutput{}, nil)
+
+	assert.True(t, runner.Process(t.Context(), doc))
 }