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

Merged in feature/e2etest (pull request #74)

Browse Source 
Feature/e2etest

* e2etest

* testcleanups
This commit is contained in:
Michael McGuinness
2025-02-21 17:05:37 +00:00
parent 3d434eedb8
commit 08d2296717
16 changed files with 654 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/database/repository/document.sql.go
+57
View File
@@ -100,3 +100,60 @@ func (q *Queries) GetDocumentIDByHash(ctx context.Context, arg *GetDocumentIDByH
err := row.Scan(&id)
return id, err
}
const listDocumentsByJobId = `-- name: ListDocumentsByJobId :many
WITH docs as (
SELECT id from documents where jobId = $1
),
entries as (
SELECT
de.documentId,
de.bucket,
de.key,
ROW_NUMBER() OVER (PARTITION BY de.documentId ORDER BY de.id DESC) as rowNumber
FROM docs d
JOIN documentEntries de on d.id = de.documentId
)
SELECT documentId as id, bucket, key from entries WHERE rowNumber = 1
`
type ListDocumentsByJobIdRow struct {
ID pgtype.UUID `db:"id"`
Bucket string `db:"bucket"`
Key string `db:"key"`
}
// ListDocumentsByJobId
//
// WITH docs as (
// SELECT id from documents where jobId = $1
// ),
// entries as (
// SELECT
// de.documentId,
// de.bucket,
// de.key,
// ROW_NUMBER() OVER (PARTITION BY de.documentId ORDER BY de.id DESC) as rowNumber
// FROM docs d
// JOIN documentEntries de on d.id = de.documentId
// )
// SELECT documentId as id, bucket, key from entries WHERE rowNumber = 1
func (q *Queries) ListDocumentsByJobId(ctx context.Context, jobid pgtype.UUID) ([]*ListDocumentsByJobIdRow, error) {
rows, err := q.db.Query(ctx, listDocumentsByJobId, jobid)
if err != nil {
return nil, err
}
defer rows.Close()
items := []*ListDocumentsByJobIdRow{}
for rows.Next() {
var i ListDocumentsByJobIdRow
if err := rows.Scan(&i.ID, &i.Bucket, &i.Key); err != nil {
return nil, err
}
items = append(items, &i)
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
internal/database/repository/document_test.go
+71 -32
View File
@@ -34,6 +34,10 @@ func TestDocument(t *testing.T) {
jobId, err := queries.CreateJob(ctx, clientId)
assert.NoError(t, err)
docs, err := queries.ListDocumentsByJobId(ctx, jobId)
assert.NoError(t, err)
assert.Len(t, docs, 0)
hash := "example_hash"
id, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobId,
@@ -41,20 +45,76 @@ func TestDocument(t *testing.T) {
})
assert.NoError(t, err)
assert.NotEmpty(t, id)
bucketone := "bucketone"
keyone := "keyone"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: bucketone,
Key: keyone,
})
assert.NoError(t, err)
docs, err = queries.ListDocumentsByJobId(ctx, jobId)
assert.NoError(t, err)
assert.Len(t, docs, 1)
assert.Equal(t, bucketone, docs[0].Bucket)
assert.Equal(t, keyone, docs[0].Key)
documentTwoID, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobId,
Hash: "example_hash_two",
})
assert.NoError(t, err)
assert.NotEmpty(t, documentTwoID)
buckettwo := "buckettwo"
keytwo := "keytwo"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: documentTwoID,
Bucket: buckettwo,
Key: keytwo,
})
assert.NoError(t, err)
docs, err = queries.ListDocumentsByJobId(ctx, jobId)
assert.NoError(t, err)
assert.Len(t, docs, 2)
jobTwoId, err := queries.CreateJob(ctx, clientId)
assert.NoError(t, err)
_, err = queries.CreateDocument(ctx, &repository.CreateDocumentParams{
docs, err = queries.ListDocumentsByJobId(ctx, jobId)
assert.NoError(t, err)
assert.Len(t, docs, 2)
docs, err = queries.ListDocumentsByJobId(ctx, jobTwoId)
assert.NoError(t, err)
assert.Len(t, docs, 0)
documentThreeId, err := queries.CreateDocument(ctx, &repository.CreateDocumentParams{
Jobid: jobTwoId,
Hash: "example_hash",
})
assert.NoError(t, err)
bucketthree := "buckettwo"
keythree := "keytwo"
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: documentThreeId,
Bucket: bucketthree,
Key: keythree,
})
assert.NoError(t, err)
docs, err = queries.ListDocumentsByJobId(ctx, jobId)
assert.NoError(t, err)
assert.Len(t, docs, 2)
docs, err = queries.ListDocumentsByJobId(ctx, jobTwoId)
assert.NoError(t, err)
assert.Len(t, docs, 1)
assert.Equal(t, bucketthree, docs[0].Bucket)
assert.Equal(t, keythree, docs[0].Key)
doc, err := queries.GetDocument(ctx, id)
assert.NoError(t, err)
assert.EqualExportedValues(t, &repository.Document{
@@ -70,48 +130,27 @@ func TestDocument(t *testing.T) {
assert.NoError(t, err)
assert.EqualExportedValues(t, id, docid)
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: "bucket_one",
Key: "/i/am/here",
})
assert.NoError(t, err)
entry, err := queries.GetDocumentEntry(ctx, id)
assert.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: "bucket_one",
Key: "/i/am/here",
Bucket: bucketone,
Key: keyone,
}, entry)
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: "bucket_two",
Key: "/you/is/there",
})
assert.NoError(t, err)
entry, err = queries.GetDocumentEntry(ctx, id)
entry, err = queries.GetDocumentEntry(ctx, documentTwoID)
assert.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: "bucket_two",
Key: "/you/is/there",
Documentid: documentTwoID,
Bucket: buckettwo,
Key: keytwo,
}, entry)
err = queries.AddDocumentEntry(ctx, &repository.AddDocumentEntryParams{
Documentid: id,
Bucket: "bucket_three",
Key: "/who/is/where",
})
assert.NoError(t, err)
entry, err = queries.GetDocumentEntry(ctx, id)
entry, err = queries.GetDocumentEntry(ctx, documentThreeId)
assert.NoError(t, err)
assert.EqualExportedValues(t, &repository.GetDocumentEntryRow{
Documentid: id,
Bucket: "bucket_three",
Key: "/who/is/where",
Documentid: documentThreeId,
Bucket: bucketthree,
Key: keythree,
}, entry)
}