Merged in feature/docinit (pull request #48)

Feature/docinit

* createunittests

* cleanup

* skip

* cleanup

api/docInitRunner/runner_test.go

@@ -7,23 +7,29 @@ import (
 	"queryorchestration/internal/client"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/document"
 	documentinit "queryorchestration/internal/document/init"
 	"queryorchestration/internal/job"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/serviceconfig"
+	"queryorchestration/internal/serviceconfig/objectstore"
 	"queryorchestration/internal/serviceconfig/queue/documentclean"
+	objectstoremock "queryorchestration/mocks/objectstore"
 	"testing"
 
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/go-playground/validator/v10"
 	"github.com/google/uuid"
 	"github.com/pashagolub/pgxmock/v3"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 type DocInitConfig struct {
 	serviceconfig.BaseConfig
 	documentclean.DocCleanConfig
+	objectstore.ObjectStoreConfig
 }
 
 func TestDocInitRunner(t *testing.T) {
@@ -37,6 +43,8 @@ func TestDocInitRunner(t *testing.T) {
 	cfg := &DocInitConfig{}
 	cfg.DBPool = pool
 	cfg.DBQueries = repository.New(pool)
+	mockStore := objectstoremock.NewMockS3Client(t)
+	cfg.StoreClient = mockStore
 
 	runner := docinitrunner.New(validator.New(), &docinitrunner.Services{
 		Document: documentinit.New(cfg, &documentinit.Services{
@@ -54,6 +62,7 @@ func TestDocInitRunner(t *testing.T) {
 	}
 	doc := documentinit.Create{
 		JobID:    j.ID,
+		Bucket:   "bucket_name",
 		Location: "/I/am/here",
 	}
 	bodyBytes, err := json.Marshal(doc)
@@ -63,6 +72,11 @@ func TestDocInitRunner(t *testing.T) {
 		Body: &body,
 	}
 
+	docinfo := document.Document{
+		ID:   uuid.New(),
+		Hash: "example_hash",
+	}
+
 	pool.ExpectQuery("name: GetJob :one").WithArgs(database.MustToDBUUID(j.ID)).WillReturnRows(
 		pgxmock.NewRows([]string{"id", "clientId", "canSync"}).
 			AddRow(database.MustToDBUUID(j.ID), database.MustToDBUUID(j.ClientID), j.CanSync),
@@ -71,11 +85,30 @@ func TestDocInitRunner(t *testing.T) {
 		pgxmock.NewRows([]string{"id", "name", "canSync"}).
 			AddRow(database.MustToDBUUID(j.ClientID), "client_name", true),
 	)
-	pool.ExpectQuery("name: CreateDocument :one").WithArgs(database.MustToDBUUID(doc.JobID), pgxmock.AnyArg(), doc.Location).
+	pool.ExpectQuery("-- name: GetDocumentIDByHash :one").WithArgs(docinfo.Hash, database.MustToDBUUID(doc.JobID)).WillReturnRows(
+		pgxmock.NewRows([]string{"id"}),
+	)
+	pool.ExpectBegin()
+	pool.ExpectQuery("name: CreateDocument :one").WithArgs(database.MustToDBUUID(doc.JobID), docinfo.Hash).
 		WillReturnRows(
 			pgxmock.NewRows([]string{"id"}).
-				AddRow(database.MustToDBUUID(uuid.New())),
+				AddRow(database.MustToDBUUID(docinfo.ID)),
 		)
+	pool.ExpectExec("name: AddDocumentEntry :exec").WithArgs(database.MustToDBUUID(docinfo.ID), doc.Bucket, doc.Location).
+		WillReturnResult(pgxmock.NewResult("", 1))
+	pool.ExpectCommit()
+
+	mockStore.EXPECT().
+		HeadObject(
+			mock.Anything,
+			mock.MatchedBy(func(in *s3.HeadObjectInput) bool {
+				return *in.Bucket == doc.Bucket && *in.Key == doc.Location
+			}),
+			mock.Anything,
+		).
+		Return(&s3.HeadObjectOutput{
+			ETag: &docinfo.Hash,
+		}, nil)
 
 	err = runner.Process(ctx, msg)
 	assert.NoError(t, err)

api/queryService/query_test.go

@@ -226,10 +226,9 @@ func TestTestQuery(t *testing.T) {
 		JobID: uuid.New(),
 	}
 	doc := document.Document{
-		ID:       uuid.New(),
-		JobID:    coll.JobID,
-		Hash:     "example_hash",
-		Location: "example_location",
+		ID:    uuid.New(),
+		JobID: coll.JobID,
+		Hash:  "example_hash",
 	}
 	params := &query.Test{
 		QueryID:      uuid.New(),
@@ -252,8 +251,8 @@ func TestTestQuery(t *testing.T) {
 	reqID := database.MustToDBUUID(uuid.New())
 	pool.ExpectQuery("name: GetDocument :one").WithArgs(database.MustToDBUUID(doc.ID)).
 		WillReturnRows(
-			pgxmock.NewRows([]string{"id", "jobId", "hash", "location"}).
-				AddRow(database.MustToDBUUID(doc.ID), database.MustToDBUUID(doc.JobID), doc.Hash, doc.Location),
+			pgxmock.NewRows([]string{"id", "jobId", "hash"}).
+				AddRow(database.MustToDBUUID(doc.ID), database.MustToDBUUID(doc.JobID), doc.Hash),
 		)
 	pool.ExpectQuery("name: GetCollectorByJobID :one").WithArgs(database.MustToDBUUID(doc.JobID)).
 		WillReturnRows(