Merged in feature/richname (pull request #112)

Standardised rich name for Files

* tests

api/docCleanRunner/runner_test.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"strings"
 	"testing"
+	"time"
 
 	doccleanrunner "queryorchestration/api/docCleanRunner"
 	"queryorchestration/internal/database/repository"
@@ -63,10 +64,14 @@ func TestDocCleanRunner(t *testing.T) {
 			ClientID: "hello",
 			Hash:     "example_hash",
 		}
-		inloc := document.Location{
-			Bucket: "bucket_name",
-			Key:    "/i/am/here",
+		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(
@@ -80,7 +85,7 @@ func TestDocCleanRunner(t *testing.T) {
 			)
 		pool.ExpectQuery("name: GetDocumentEntry :one").WithArgs(dbid).WillReturnRows(
 			pgxmock.NewRows([]string{"documentId", "bucket", "key"}).
-				AddRow(dbid, inloc.Bucket, inloc.Key),
+				AddRow(dbid, bucket, keyStr),
 		)
 		mimeType := "application/pdf"
 		dbmimetype := repository.NullCleanmimetype{
@@ -93,7 +98,7 @@ func TestDocCleanRunner(t *testing.T) {
 			WillReturnRows(
 				pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "hash", "mimetype", "fail"}),
 			)
-		pool.ExpectQuery("name: AddDocumentClean :one").WithArgs(dbid, &inloc.Bucket, &inloc.Key, &doc.Hash, dbmimetype, repository.NullCleanfailtype{}).
+		pool.ExpectQuery("name: AddDocumentClean :one").WithArgs(dbid, &bucket, &keyStr, &doc.Hash, dbmimetype, repository.NullCleanfailtype{}).
 			WillReturnRows(
 				pgxmock.NewRows([]string{"id"}).
 					AddRow(cleanid),
@@ -116,7 +121,7 @@ func TestDocCleanRunner(t *testing.T) {
 			HeadObject(
 				mock.Anything,
 				mock.MatchedBy(func(in *s3.HeadObjectInput) bool {
-					return *in.Bucket == inloc.Bucket && *in.Key == inloc.Key
+					return *in.Bucket == bucket && *in.Key == keyStr
 				}),
 				mock.Anything,
 			).
@@ -129,7 +134,7 @@ func TestDocCleanRunner(t *testing.T) {
 			GetObject(
 				mock.Anything,
 				mock.MatchedBy(func(in *s3.GetObjectInput) bool {
-					return *in.Bucket == inloc.Bucket && *in.Key == inloc.Key
+					return *in.Bucket == bucket && *in.Key == keyStr
 				}),
 				mock.Anything,
 			).