jacob-mathison/query-orchestration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merged in feature/postprocessing (pull request #114)

Browse Source 
Feature/postprocessing

* tests

* passtest

* fixshorttests

* mosttests

* improvingbasedockerfile

* testspeeds

* testing

* host

* canparallel

* clean

* passfullsuite

* singlepagemax

* test

* findfeatures

* findstables

* tbls

* tablestoo

* tablestoo

* lateraltests

* tableloc

* cleanup

* inlinetable

* childids

* cleanup

* tests
This commit is contained in:
Michael McGuinness
2025-04-22 14:40:16 +00:00
parent edc50c7510
commit fee71e7740
404 changed files with 211048 additions and 2820 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/clientSyncRunner/runner.go
+3 -7
View File
@@ -5,8 +5,6 @@ import (
"log/slog"
clientsync "queryorchestration/internal/client/sync"
"github.com/go-playground/validator/v10"
)
const Name = "clientSyncRunner"
@@ -16,14 +14,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/clientSyncRunner/runner_test.go
+1 -2
View File
@@ -13,7 +13,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -41,7 +40,7 @@ func TestQueryRunner(t *testing.T) {
svc := clientsync.New(cfg)
runner := clientsyncrunner.New(validator.New(), &clientsyncrunner.Services{
runner := clientsyncrunner.New(&clientsyncrunner.Services{
ClientSync: svc,
})
assert.NotNil(t, runner)
api/docCleanRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
documentclean "queryorchestration/internal/document/clean"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/docCleanRunner/runner_test.go
+1 -2
View File
@@ -20,7 +20,6 @@ import (
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -49,7 +48,7 @@ func TestDocCleanRunner(t *testing.T) {
cfg.QueueClient = mockSQS
cfg.DocumentTextTriggerURL = "/i/am/here"
runner := doccleanrunner.New(validator.New(), &doccleanrunner.Services{
runner := doccleanrunner.New(&doccleanrunner.Services{
Clean: documentclean.New(cfg),
})
assert.NotNil(t, runner)
api/docInitRunner/runner.go
+3 -7
View File
@@ -6,8 +6,6 @@ import (
documentinit "queryorchestration/internal/document/init"
"queryorchestration/internal/serviceconfig/objectstore"
"github.com/go-playground/validator/v10"
)
const Name = "docInitRunner"
@@ -17,14 +15,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/docInitRunner/runner_test.go
+1 -2
View File
@@ -16,7 +16,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -41,7 +40,7 @@ func TestDocInitRunner(t *testing.T) {
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
runner := docinitrunner.New(validator.New(), &docinitrunner.Services{
runner := docinitrunner.New(&docinitrunner.Services{
Document: documentinit.New(cfg),
})
assert.NotNil(t, runner)
api/docSyncRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
documentsync "queryorchestration/internal/document/sync"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/docSyncRunner/runner_test.go
+1 -2
View File
@@ -15,7 +15,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -40,7 +39,7 @@ func TestDocInitRunner(t *testing.T) {
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
runner := docsyncrunner.New(validator.New(), &docsyncrunner.Services{
runner := docsyncrunner.New(&docsyncrunner.Services{
Document: documentsync.New(cfg, &documentsync.Services{
Document: document.New(cfg),
Client: client.New(cfg),
api/docTextProcessRunner/runner.go
-55
View File
@@ -1,55 +0,0 @@
package doctextprocessrunner
import (
"context"
"log/slog"
documenttext "queryorchestration/internal/document/text"
"queryorchestration/internal/serviceconfig/objectstore"
"github.com/go-playground/validator/v10"
)
const Name = "docTextProcessRunner"
type Services struct {
Text *documenttext.Service
}
type Runner struct {
validator *validator.Validate
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
}
}
type Body struct {
Bucket string `json:"bucket" validate:"required"`
Key string `json:"key" validate:"required"`
Hash string `json:"hash" validate:"required"`
}
func (s Runner) Process(ctx context.Context, body Body) bool {
key, err := objectstore.ParseBucketKey(body.Key)
if err != nil {
slog.Error("unable to parse key", "key", body.Key)
return true
}
err = s.svc.Text.Process(ctx, &documenttext.ProcessParams{
Bucket: body.Bucket,
Key: key,
Hash: body.Hash,
})
if err != nil {
slog.Error("unable to process", "bucket", body.Bucket, "key", body.Key, "hash", body.Hash, "error", err)
return false
}
return true
}
api/docTextProcessRunner/runner_test.go
-155
View File
@@ -1,155 +0,0 @@
package doctextprocessrunner
import (
"context"
"errors"
"fmt"
"io"
"strings"
"testing"
"time"
"queryorchestration/internal/database/repository"
"queryorchestration/internal/document"
documenttext "queryorchestration/internal/document/text"
"queryorchestration/internal/server/runner"
"queryorchestration/internal/serviceconfig/aws"
"queryorchestration/internal/serviceconfig/objectstore"
"queryorchestration/internal/serviceconfig/queue/querysync"
"queryorchestration/internal/serviceconfig/textract"
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/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
type DocInitConfig struct {
runner.BaseConfig[Body]
aws.AWSConfig
textract.TextractConfig
querysync.QuerySyncConfig
objectstore.ObjectStoreConfig
}
func TestDocTextProcessRunner(t *testing.T) {
ctx := context.Background()
pool, err := pgxmock.NewPool()
require.NoError(t, err)
cfg := &DocInitConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
mockS3 := objectstoremock.NewMockS3Client(t)
cfg.StoreClient = mockS3
runner := New(validator.New(), &Services{
Text: documenttext.New(cfg),
})
assert.NotNil(t, runner)
t.Run("pass through", func(t *testing.T) {
triggerId := uuid.New()
docId := uuid.New()
textractId := "heeloo"
textId := uuid.New()
cleanId := uuid.New()
bucketName := "bucketName"
docinfo := document.DocumentSummary{
ID: uuid.New(),
ClientID: "hello",
Hash: `"5d41402abc4b2a76b9719d911017c592"`,
}
key := objectstore.BucketKey{
ClientID: docinfo.ClientID,
Location: objectstore.TextTextract,
EntityID: triggerId,
CreatedAt: time.Now().UTC(),
}
doc := Body{
Bucket: bucketName,
Key: key.String(),
Hash: docinfo.Hash,
}
pool.ExpectQuery("name: GetDocumentTextTrigger :one").WithArgs(triggerId).WillReturnRows(
pgxmock.NewRows([]string{"id", "cleanId", "version", "textractJobId", "documentId"}).
AddRow(triggerId, cleanId, int64(123), &textractId, docId),
)
pool.ExpectBegin()
pool.ExpectQuery("name: GetDocumentTextExtractionByHash :one").WithArgs(cleanId, docinfo.Hash).WillReturnRows(
pgxmock.NewRows([]string{"id"}).
AddRow(textId),
)
pool.ExpectExec("name: AddDocumentTextEntry :exec").WithArgs(textId, triggerId, pgxmock.AnyArg()).
WillReturnResult(pgxmock.NewResult("", 1))
pool.ExpectCommit()
body := io.NopCloser(strings.NewReader("hello"))
mockS3.EXPECT().
GetObject(
mock.Anything,
mock.MatchedBy(func(in *s3.GetObjectInput) bool {
return *in.IfMatch == `"5d41402abc4b2a76b9719d911017c592"`
}),
mock.Anything,
).
Return(&s3.GetObjectOutput{
Body: body,
}, nil)
mockSQS.EXPECT().
SendMessage(
mock.Anything,
mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
return *in.QueueUrl == cfg.QuerySyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", docId.String())
}),
mock.Anything,
).
Return(&sqs.SendMessageOutput{}, nil)
assert.True(t, runner.Process(ctx, doc))
})
t.Run("invalid key", func(t *testing.T) {
key := objectstore.BucketKey{}
doc := Body{
Key: key.String(),
}
assert.True(t, runner.Process(ctx, doc))
})
t.Run("unable to process", func(t *testing.T) {
triggerId := uuid.New()
bucketName := "bucketName"
docinfo := document.DocumentSummary{
ID: uuid.New(),
ClientID: "hello",
Hash: `"5d41402abc4b2a76b9719d911017c592"`,
}
key := objectstore.BucketKey{
ClientID: docinfo.ClientID,
Location: objectstore.TextTextract,
EntityID: triggerId,
CreatedAt: time.Now().UTC(),
}
doc := Body{
Bucket: bucketName,
Key: key.String(),
Hash: docinfo.Hash,
}
pool.ExpectQuery("name: GetDocumentTextTrigger :one").WithArgs(triggerId).
WillReturnError(errors.New("db fail"))
assert.False(t, runner.Process(ctx, doc))
})
}
api/docTextRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
documenttext "queryorchestration/internal/document/text"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/docTextRunner/runner_test.go
+153 -62
View File
@@ -2,6 +2,11 @@ package doctextrunner_test
import (
"context"
"encoding/json"
"fmt"
"io"
"os"
"strings"
"testing"
"time"
@@ -17,8 +22,9 @@ import (
queuemock "queryorchestration/mocks/queue"
textractmock "queryorchestration/mocks/textract"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/aws/aws-sdk-go-v2/service/sqs"
awstextract "github.com/aws/aws-sdk-go-v2/service/textract"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -36,84 +42,169 @@ type DocTextConfig struct {
func TestDocCleanRunner(t *testing.T) {
ctx := context.Background()
pool, err := pgxmock.NewPool()
require.NoError(t, err)
cfg := &DocTextConfig{}
cfg.DBPool = pool
cfg.DBQueries = repository.New(pool)
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
cfg.QuerySyncURL = "/i/am/here"
mockS3 := objectstoremock.NewMockS3Client(t)
cfg.StoreClient = mockS3
mockStore := objectstoremock.NewMockS3Client(t)
cfg.StoreClient = mockStore
mockTextract := textractmock.NewMockTextractClient(t)
cfg.TextractClient = mockTextract
mockQueue := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockQueue
cfg.QuerySyncURL = "ex"
runner := doctextrunner.New(validator.New(), &doctextrunner.Services{
runner := doctextrunner.New(&doctextrunner.Services{
Text: documenttext.New(cfg),
})
assert.NotNil(t, runner)
doc := doctextrunner.Body{
DocumentID: uuid.New(),
}
t.Run("valid", func(t *testing.T) {
doc := doctextrunner.Body{
DocumentID: uuid.New(),
}
cleanId := uuid.New()
bucket := "bucket"
hash := `"a06d5e0e795adeb6d0b3732330dbcc15"`
textId := uuid.New()
key := objectstore.BucketKey{
ClientID: "aa",
Location: objectstore.Import,
CreatedAt: time.Now().UTC(),
EntityID: cleanId,
}
keyStr := key.String()
filename := "../../assets/sampleGeneration/generated/helloWorld.gen"
file, err := os.Open(filename)
require.NoError(t, err)
defer file.Close()
cleanId := uuid.New()
bucket := "hello"
key := objectstore.BucketKey{
CreatedAt: time.Now().UTC(),
ClientID: "hi",
EntityID: uuid.New(),
Location: objectstore.Import,
}
keyStr := key.String()
hash := "example"
decoder := json.NewDecoder(file)
var textractBaseOut map[string][]awstextract.AnalyzeDocumentOutput
err = decoder.Decode(&textractBaseOut)
require.NoError(t, err)
pool.ExpectQuery("name: IsDocumentTextExtracted :one").WithArgs(doc.DocumentID).WillReturnRows(
pgxmock.NewRows([]string{"isextracted"}).
AddRow(false),
mimetype := repository.NullCleanmimetype{
Valid: true,
Cleanmimetype: repository.CleanmimetypeApplicationPdf,
}
pool.ExpectQuery("name: IsDocumentTextExtracted :one").WithArgs(doc.DocumentID).WillReturnRows(
pgxmock.NewRows([]string{"isextracted"}).
AddRow(false),
)
pool.ExpectQuery("name: GetCleanEntryByDocId :one").WithArgs(doc.DocumentID).
WillReturnRows(
pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "hash", "mimetype", "fail", "clientId"}).
AddRow(cleanId, doc.DocumentID, &bucket, &keyStr, int64(123), &hash, mimetype, nil, key.ClientID),
)
mimeType := "application/pdf"
dbmimetype := repository.NullCleanmimetype{
Valid: true,
Cleanmimetype: repository.Cleanmimetype(mimeType),
}
pool.ExpectQuery("name: GetCleanEntryByDocId :one").WithArgs(doc.DocumentID).WillReturnRows(
pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "hash", "mimetype", "fail", "externalClientId"}).
AddRow(cleanId, doc.DocumentID, &bucket, &keyStr, int64(1), &hash, dbmimetype, repository.NullCleanfailtype{}, key.ClientID),
)
jobId := "hello"
triggerId := uuid.New()
pool.ExpectBegin()
pool.ExpectQuery("name: GetTextractOutputCurrentPart :one").WithArgs(&key.ClientID, pgxmock.AnyArg()).
WillReturnRows(
pgxmock.NewRows([]string{"part", "count"}).
AddRow(0, 2),
)
pool.ExpectQuery("name: AddDocumentTextTrigger :one").WithArgs(cleanId, pgxmock.AnyArg(), pgxmock.AnyArg(), uint16(0)).WillReturnRows(
pgxmock.NewRows([]string{"id"}).AddRow(triggerId),
)
mockTextract.EXPECT().
StartDocumentTextDetection(
mock.Anything,
mock.MatchedBy(func(in *awstextract.StartDocumentTextDetectionInput) bool {
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)
sent := 0
mockTextract.EXPECT().
AnalyzeDocument(
mock.Anything,
mock.MatchedBy(func(in *awstextract.AnalyzeDocumentInput) bool {
if sent == 0 {
sent++
return true
}),
mock.Anything,
).
Return(&awstextract.StartDocumentTextDetectionOutput{
JobId: &jobId,
}, nil)
}
return false
}),
mock.Anything,
).
Return(&textractBaseOut["base"][0], nil).Once()
pool.ExpectExec("name: AddDocumentTextTriggerJobId :exec").WithArgs(&jobId, triggerId).
WillReturnResult(pgxmock.NewResult("", 1))
pool.ExpectCommit()
pool.ExpectBegin()
pool.ExpectQuery("name: GetDocumentTextExtractionByHash :one").WithArgs(cleanId, hash).WillReturnRows(
pgxmock.NewRows([]string{"id"}).
AddRow(textId),
)
pool.ExpectExec("name: AddDocumentTextEntry :exec").WithArgs(textId, pgxmock.AnyArg()).
WillReturnResult(pgxmock.NewResult("", 1))
pool.ExpectCommit()
assert.True(t, runner.Process(ctx, doc))
})
mockQueue.EXPECT().
SendMessage(
mock.Anything,
mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
return *in.QueueUrl == cfg.QuerySyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", doc.DocumentID.String())
}),
mock.Anything,
).
Return(&sqs.SendMessageOutput{}, nil)
assert.True(t, runner.Process(ctx, doc))
}
const pdfHelloWorld = `%PDF-1.4
%����
1 0 obj
<<
/Type /Catalog
/Pages 2 0 R
/Version /1.4
>>
endobj
2 0 obj
<<
/Type /Pages
/Kids [3 0 R]
/Count 1
>>
endobj
3 0 obj
<<
/Type /Page
/Parent 2 0 R
/MediaBox [0 0 612 792]
/Resources <<
/Font <<
/F1 <<
/Type /Font
/Subtype /Type1
/BaseFont /Helvetica
>>
>>
>>
/Contents 4 0 R
>>
endobj
4 0 obj
<<
/Length
44
>>
stream
BT
/F1 24 Tf
100 700 Td
(Hello World!) Tj
ET
endstream
endobj
xref
0 5
0000000000 65535 f
0000000015 00000 n
0000000086 00000 n
0000000151 00000 n
0000000376 00000 n
trailer
<<
/Size 5
/Root 1 0 R
>>
startxref
472
%%EOF`
api/queryRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
resultset "queryorchestration/internal/query/result/set"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/queryRunner/runner_test.go
+3 -4
View File
@@ -17,7 +17,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -44,7 +43,7 @@ func TestQueryRunner(t *testing.T) {
cfg.QueryURL = "/i/am/here"
que := query.New(cfg)
runner := queryrunner.New(validator.New(), &queryrunner.Services{
runner := queryrunner.New(&queryrunner.Services{
ResultSet: resultset.New(cfg, &resultset.Services{
Query: que,
Result: result.New(cfg, &result.Services{
@@ -76,8 +75,8 @@ func TestQueryRunner(t *testing.T) {
textEntryId := uuid.New()
pool.ExpectQuery("name: GetTextEntryByDocId :one").WithArgs(params.DocumentID).
WillReturnRows(
pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "hash", "cleanId", "triggerId", "textractJobId", "triggerVersion", "extractionVersion"}).
AddRow(textEntryId, params.DocumentID, "buket", "/i/am/here", "example", uuid.New(), uuid.New(), "jobId", int64(123), int64(543)),
pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "hash", "cleanId", "extractionVersion"}).
AddRow(textEntryId, params.DocumentID, "buket", "/i/am/here", "example", uuid.New(), int64(543)),
)
pool.ExpectQuery("name: GetQuery :one").WithArgs(query.ID).WillReturnRows(
pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
api/querySyncRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
querysync "queryorchestration/internal/query/sync"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/querySyncRunner/runner_test.go
+1 -2
View File
@@ -14,7 +14,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -44,7 +43,7 @@ func TestQueryRunner(t *testing.T) {
ResultSync: resultsync.New(cfg),
})
runner := querysyncrunner.New(validator.New(), &querysyncrunner.Services{
runner := querysyncrunner.New(&querysyncrunner.Services{
QuerySync: svc,
})
assert.NotNil(t, runner)
api/queryVersionSyncRunner/runner.go
+3 -6
View File
@@ -6,7 +6,6 @@ import (
queryversionsync "queryorchestration/internal/query/versionsync"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
)
@@ -17,14 +16,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/queryVersionSyncRunner/runner_test.go
+1 -2
View File
@@ -13,7 +13,6 @@ import (
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -41,7 +40,7 @@ func TestQueryRunner(t *testing.T) {
svc := queryversionsync.New(cfg)
runner := queryversionsyncrunner.New(validator.New(), &queryversionsyncrunner.Services{
runner := queryversionsyncrunner.New(&queryversionsyncrunner.Services{
Sync: svc,
})
assert.NotNil(t, runner)
api/storeEventRunner/runner.go
+3 -7
View File
@@ -5,8 +5,6 @@ import (
"log/slog"
documentstore "queryorchestration/internal/document/store"
"github.com/go-playground/validator/v10"
)
const Name = "storeEventRunner"
@@ -16,14 +14,12 @@ type Services struct {
}
type Runner struct {
validator *validator.Validate
svc *Services
svc *Services
}
func New(validator *validator.Validate, svc *Services) Runner {
func New(svc *Services) Runner {
return Runner{
validator: validator,
svc: svc,
svc: svc,
}
}
api/storeEventRunner/runner_test.go
+1 -5
View File
@@ -11,11 +11,9 @@ import (
"queryorchestration/internal/server/runner"
"queryorchestration/internal/serviceconfig/objectstore"
"queryorchestration/internal/serviceconfig/queue/documentinit"
"queryorchestration/internal/serviceconfig/queue/documenttextprocess"
queuemock "queryorchestration/mocks/queue"
"github.com/aws/aws-sdk-go-v2/service/sqs"
"github.com/go-playground/validator/v10"
"github.com/google/uuid"
"github.com/pashagolub/pgxmock/v3"
"github.com/stretchr/testify/assert"
@@ -26,7 +24,6 @@ import (
type DocInitConfig struct {
runner.BaseConfig[S3EventNotification]
documentinit.DocInitConfig
documenttextprocess.DocTextProcessConfig
}
func TestDocInitRunner(t *testing.T) {
@@ -41,9 +38,8 @@ func TestDocInitRunner(t *testing.T) {
mockSQS := queuemock.NewMockSQSClient(t)
cfg.QueueClient = mockSQS
cfg.DocInitURL = "hi"
cfg.DocumentTextProcessURL = "hi"
runner := New(validator.New(), &Services{
runner := New(&Services{
documentstore.New(cfg),
})
assert.NotNil(t, runner)