Merged in feature/standardisefilepath (pull request #111)

Feature/standardisefilepath

* baseprocessing

* generalstructure

test/process_test.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strings"
 	"testing"
+	"time"
 
 	"queryorchestration/internal/serviceconfig"
 	"queryorchestration/internal/serviceconfig/aws"
@@ -65,18 +66,26 @@ func TestProcess(t *testing.T) {
 
 	filename := "objectname"
 	expectation := test.CreateStartDocTextDetectionExpectation(t, net.Dependencies.MockServer, test.StartDocTextDetectionExpectationParams{
-		Bucket:   net.Dependencies.BucketName,
-		ClientID: client.Id,
-		Filename: filename,
-		JobID:    "textractId",
+		Bucket: net.Dependencies.BucketName,
+		JobID:  "textractId",
+		Key: objectstore.BucketKey{
+			ClientID:  client.Id,
+			Filename:  filename,
+			Location:  objectstore.Import,
+			CreatedAt: time.Now().UTC(),
+		},
 	})
 
 	body := strings.NewReader(pdfHelloWorld)
-	test.PutImportObject(t, ctx, cfg, test.PutObjectParams{
-		ClientId: client.Id,
-		Bucket:   net.Dependencies.BucketName,
-		Filepath: filename,
-		File:     body,
+	test.PutObject(t, ctx, cfg, test.PutObjectParams{
+		Bucket: net.Dependencies.BucketName,
+		File:   body,
+		Key: objectstore.BucketKey{
+			ClientID:  client.Id,
+			Filename:  filename,
+			Location:  objectstore.Import,
+			CreatedAt: time.Now().UTC(),
+		},
 	})
 
 	queryapitest.WaitForClientStatus(t, ctx, net.Client, client.Id, queryapi.NOTSYNCED)