Merged in feature/standardisefilepath (pull request #111)

Feature/standardisefilepath

* baseprocessing

* generalstructure
This commit is contained in:
Michael McGuinness
2025-04-03 12:13:16 +00:00
parent 81e7223560
commit 1d49313a9f
17 changed files with 466 additions and 253 deletions
+14 -22
View File
@@ -2,11 +2,11 @@ package documenttext
import (
"context"
"fmt"
"testing"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/document"
"queryorchestration/internal/serviceconfig/objectstore"
objectstoremock "queryorchestration/mocks/objectstore"
textractmock "queryorchestration/mocks/textract"
@@ -82,40 +82,32 @@ func TestTriggerExtract(t *testing.T) {
})
}
func TestGetOutputLocation(t *testing.T) {
func TestGetOutputFilename(t *testing.T) {
svc := Service{}
_, err := svc.getOutputLocation("", uuid.Nil)
assert.EqualError(t, err, "client id required")
_, err = svc.getOutputLocation("a", uuid.Nil)
_, err := svc.getOutputFilename(uuid.Nil)
assert.EqualError(t, err, "trigger id required")
triggerId := uuid.New()
key, err := svc.getOutputLocation("a", triggerId)
key, err := svc.getOutputFilename(triggerId)
assert.NoError(t, err)
assert.Equal(t, fmt.Sprintf("a/text/textract/%s", triggerId), key)
assert.Equal(t, triggerId.String(), key)
}
func TestGetTriggerIdFromKey(t *testing.T) {
svc := Service{}
_, err := svc.getTriggerIdFromKey("")
assert.EqualError(t, err, "Trigger Id not found")
_, err := svc.getTriggerIdFromKey(objectstore.BucketKey{})
assert.EqualError(t, err, "invalid UUID length: 0")
_, err = svc.getTriggerIdFromKey("aa")
assert.EqualError(t, err, "Trigger Id not found")
_, err = svc.getTriggerIdFromKey(objectstore.BucketKey{
Filename: "aa",
})
assert.EqualError(t, err, "invalid UUID length: 2")
_, err = svc.getTriggerIdFromKey("6ece4a77-702c-4cc9-8654-43c557e21658")
assert.EqualError(t, err, "Trigger Id not found")
_, err = svc.getTriggerIdFromKey("6ece4a77-702c-4cc9-8654-43c557e21658/text/textract/")
assert.EqualError(t, err, "Trigger Id not found")
_, err = svc.getTriggerIdFromKey("6ece4a77-702c-4cc9-8654-43c557e21658/text/textract/a")
assert.EqualError(t, err, "Trigger Id not found")
triggerId, err := svc.getTriggerIdFromKey("6ece4a77-702c-4cc9-8654-43c557e21658/text/textract/6ac21b2b-f36c-4ae7-a815-307d4a9bfe4d")
triggerId, err := svc.getTriggerIdFromKey(objectstore.BucketKey{
Filename: "6ac21b2b-f36c-4ae7-a815-307d4a9bfe4d",
})
assert.NoError(t, err)
assert.Equal(t, "6ac21b2b-f36c-4ae7-a815-307d4a9bfe4d", triggerId.String())
}