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/docCleanRunner/runner_test.go

@@ -1,7 +1,6 @@
 package doccleanrunner_test
 
 import (
-	"context"
 	"fmt"
 	"io"
 	"strings"
@@ -10,18 +9,17 @@ import (
 
 	doccleanrunner "queryorchestration/api/docCleanRunner"
 	"queryorchestration/internal/database/repository"
-	"queryorchestration/internal/document"
 	documentclean "queryorchestration/internal/document/clean"
 	"queryorchestration/internal/server/runner"
 	"queryorchestration/internal/serviceconfig/objectstore"
 	"queryorchestration/internal/serviceconfig/queue/documenttexttrigger"
+	"queryorchestration/internal/test"
 	objectstoremock "queryorchestration/mocks/objectstore"
 	queuemock "queryorchestration/mocks/queue"
 
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"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"
@@ -34,14 +32,11 @@ type DocCleanConfig struct {
 }
 
 func TestDocCleanRunner(t *testing.T) {
-	ctx := context.Background()
-
-	pool, err := pgxmock.NewPool()
-	require.NoError(t, err)
-
+	t.Parallel()
 	cfg := &DocCleanConfig{}
-	cfg.DBPool = pool
-	cfg.DBQueries = repository.New(pool)
+	net := test.GetNetwork(t)
+	test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
+
 	mockStore := objectstoremock.NewMockS3Client(t)
 	cfg.StoreClient = mockStore
 	mockSQS := queuemock.NewMockSQSClient(t)
@@ -52,96 +47,73 @@ func TestDocCleanRunner(t *testing.T) {
 		Clean: documentclean.New(cfg),
 	})
 
-	t.Run("valid", func(t *testing.T) {
-		bod := doccleanrunner.Body{
-			DocumentID: uuid.New(),
-		}
-
-		doc := document.DocumentSummary{
-			ID:       bod.DocumentID,
-			ClientID: "hello",
-			Hash:     "example_hash",
-		}
-		bucket := "hello"
-		key := objectstore.BucketKey{
-			CreatedAt: time.Now().UTC(),
-			ClientID:  "hi",
-			EntityID:  uuid.New(),
-			Location:  objectstore.Import,
-		}
-		keyStr := key.String()
-		dbid := doc.ID
-
-		pool.ExpectQuery("name: HasDocumentCleanEntry :one").WithArgs(dbid).WillReturnRows(
-			pgxmock.NewRows([]string{"isclean"}).
-				AddRow(false),
-		)
-		pool.ExpectQuery("name: GetDocumentSummary :one").WithArgs(dbid).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id", "clientId", "hash"}).
-					AddRow(dbid, doc.ClientID, doc.Hash),
-			)
-		pool.ExpectQuery("name: GetDocumentEntry :one").WithArgs(dbid).WillReturnRows(
-			pgxmock.NewRows([]string{"documentId", "bucket", "key"}).
-				AddRow(dbid, bucket, keyStr),
-		)
-		mimeType := "application/pdf"
-		dbmimetype := repository.NullCleanmimetype{
-			Valid:         true,
-			Cleanmimetype: repository.Cleanmimetype(mimeType),
-		}
-		pool.ExpectBegin()
-		cleanid := uuid.New()
-		pool.ExpectQuery("name: GetMostRecentDocumentCleanEntry :one").WithArgs(dbid).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "hash", "mimetype", "fail"}),
-			)
-		pool.ExpectQuery("name: AddDocumentClean :one").WithArgs(dbid, &bucket, &keyStr, &doc.Hash, dbmimetype, repository.NullCleanfailtype{}).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id"}).
-					AddRow(cleanid),
-			)
-		pool.ExpectExec("name: AddDocumentCleanEntry :exec").WithArgs(cleanid, pgxmock.AnyArg()).
-			WillReturnResult(pgxmock.NewResult("", 1))
-		pool.ExpectCommit()
-
-		mockSQS.EXPECT().
-			SendMessage(
-				mock.Anything,
-				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-					return *in.QueueUrl == cfg.DocumentTextTriggerURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", doc.ID.String())
-				}),
-				mock.Anything,
-			).
-			Return(&sqs.SendMessageOutput{}, nil)
-
-		mockStore.EXPECT().
-			HeadObject(
-				mock.Anything,
-				mock.MatchedBy(func(in *s3.HeadObjectInput) bool {
-					return *in.Bucket == bucket && *in.Key == keyStr
-				}),
-				mock.Anything,
-			).
-			Return(&s3.HeadObjectOutput{
-				ContentType: &mimeType,
-			}, nil)
-
-		bodyMsg := io.NopCloser(strings.NewReader(pdfHelloWorld))
-		mockStore.EXPECT().
-			GetObject(
-				mock.Anything,
-				mock.MatchedBy(func(in *s3.GetObjectInput) bool {
-					return *in.Bucket == bucket && *in.Key == keyStr
-				}),
-				mock.Anything,
-			).
-			Return(&s3.GetObjectOutput{
-				Body: bodyMsg,
-			}, nil)
-
-		assert.True(t, runner.Process(ctx, bod))
+	err := cfg.GetDBQueries().CreateClient(t.Context(), &repository.CreateClientParams{
+		Clientid: "clientid",
+		Name:     "client_name",
 	})
+	require.NoError(t, err)
+	docId, err := cfg.GetDBQueries().CreateDocument(t.Context(), &repository.CreateDocumentParams{
+		Clientid: "clientid",
+		Hash:     "hash",
+	})
+	require.NoError(t, err)
+	part := uint16(1)
+	filetype := "pdf"
+	key := objectstore.BucketKey{
+		CreatedAt: time.Now().UTC(),
+		ClientID:  "clientid",
+		EntityID:  uuid.New(),
+		Location:  objectstore.Import,
+		Part:      &part,
+		FileType:  &filetype,
+	}
+	err = cfg.GetDBQueries().AddDocumentEntry(t.Context(), &repository.AddDocumentEntryParams{
+		Documentid: docId,
+		Bucket:     "bucket",
+		Key:        key.String(),
+	})
+	require.NoError(t, err)
+
+	mockSQS.EXPECT().
+		SendMessage(
+			mock.Anything,
+			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+				return *in.QueueUrl == cfg.DocumentTextTriggerURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", docId.String())
+			}),
+			mock.Anything,
+		).
+		Return(&sqs.SendMessageOutput{}, nil)
+
+	mimeType := "application/pdf"
+	mockStore.EXPECT().
+		HeadObject(
+			mock.Anything,
+			mock.MatchedBy(func(in *s3.HeadObjectInput) bool {
+				return *in.Bucket == "bucket" && *in.Key == key.String()
+			}),
+			mock.Anything,
+		).
+		Return(&s3.HeadObjectOutput{
+			ContentType: &mimeType,
+		}, nil)
+
+	bodyMsg := io.NopCloser(strings.NewReader(pdfHelloWorld))
+	mockStore.EXPECT().
+		GetObject(
+			mock.Anything,
+			mock.MatchedBy(func(in *s3.GetObjectInput) bool {
+				return *in.Bucket == "bucket" && *in.Key == key.String()
+			}),
+			mock.Anything,
+		).
+		Return(&s3.GetObjectOutput{
+			Body: bodyMsg,
+		}, nil)
+
+	bod := doccleanrunner.Body{
+		DocumentID: docId,
+	}
+	assert.True(t, runner.Process(t.Context(), bod))
 }
 
 const pdfHelloWorld = `%PDF-1.4