Merged in feature/textextract (pull request #108)

Start adding Textract + UUID changes

* base

* startclient

* ts

* short

* tests
This commit is contained in:
Michael McGuinness
2025-03-20 11:06:41 +00:00
parent 1587da9d11
commit 53ea7d34e6
196 changed files with 25972 additions and 1456 deletions
+37 -37
View File
@@ -8,7 +8,7 @@ package repository
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
"github.com/google/uuid"
)
const addActiveQueryVersion = `-- name: AddActiveQueryVersion :exec
@@ -16,8 +16,8 @@ INSERT INTO queryActiveVersions (queryId, versionId) VALUES ($1, $2)
`
type AddActiveQueryVersionParams struct {
Queryid pgtype.UUID `db:"queryid"`
Versionid int32 `db:"versionid"`
Queryid uuid.UUID `db:"queryid"`
Versionid int32 `db:"versionid"`
}
// AddActiveQueryVersion
@@ -35,7 +35,7 @@ INSERT INTO queryVersions (queryId) VALUES ($1) RETURNING id
// AddLatestQueryVersion
//
// INSERT INTO queryVersions (queryId) VALUES ($1) RETURNING id
func (q *Queries) AddLatestQueryVersion(ctx context.Context, queryid pgtype.UUID) (int32, error) {
func (q *Queries) AddLatestQueryVersion(ctx context.Context, queryid uuid.UUID) (int32, error) {
row := q.db.QueryRow(ctx, addLatestQueryVersion, queryid)
var id int32
err := row.Scan(&id)
@@ -47,9 +47,9 @@ INSERT INTO requiredQueries (queryId, requiredQueryId, addedVersion) VALUES ($1,
`
type AddRequiredQueryParams struct {
Queryid pgtype.UUID `db:"queryid"`
Requiredqueryid pgtype.UUID `db:"requiredqueryid"`
Addedversion int32 `db:"addedversion"`
Queryid uuid.UUID `db:"queryid"`
Requiredqueryid uuid.UUID `db:"requiredqueryid"`
Addedversion int32 `db:"addedversion"`
}
// AddRequiredQuery
@@ -71,7 +71,7 @@ SELECT COUNT(*) = COUNT(DISTINCT id) AS all_exist
// SELECT COUNT(*) = COUNT(DISTINCT id) AS all_exist
// FROM unnest($1::uuid[]) AS input_id
// LEFT JOIN queries ON input_id = queries.id
func (q *Queries) AllQueriesExist(ctx context.Context, dollar_1 []pgtype.UUID) (bool, error) {
func (q *Queries) AllQueriesExist(ctx context.Context, dollar_1 []uuid.UUID) (bool, error) {
row := q.db.QueryRow(ctx, allQueriesExist, dollar_1)
var all_exist bool
err := row.Scan(&all_exist)
@@ -85,9 +85,9 @@ INSERT INTO queries (type) VALUES ($1) RETURNING id
// CreateQuery
//
// INSERT INTO queries (type) VALUES ($1) RETURNING id
func (q *Queries) CreateQuery(ctx context.Context, type_ Querytype) (pgtype.UUID, error) {
func (q *Queries) CreateQuery(ctx context.Context, type_ Querytype) (uuid.UUID, error) {
row := q.db.QueryRow(ctx, createQuery, type_)
var id pgtype.UUID
var id uuid.UUID
err := row.Scan(&id)
return id, err
}
@@ -99,7 +99,7 @@ SELECT config FROM queryCurrentConfigs where queryId = $1
// GetActiveQueryConfig
//
// SELECT config FROM queryCurrentConfigs where queryId = $1
func (q *Queries) GetActiveQueryConfig(ctx context.Context, queryid pgtype.UUID) ([]byte, error) {
func (q *Queries) GetActiveQueryConfig(ctx context.Context, queryid uuid.UUID) ([]byte, error) {
row := q.db.QueryRow(ctx, getActiveQueryConfig, queryid)
var config []byte
err := row.Scan(&config)
@@ -113,7 +113,7 @@ SELECT id, type, activeversion, latestversion, config, requiredids FROM fullActi
// GetQuery
//
// SELECT id, type, activeversion, latestversion, config, requiredids FROM fullActiveQueries WHERE id = $1
func (q *Queries) GetQuery(ctx context.Context, id pgtype.UUID) (*Fullactivequery, error) {
func (q *Queries) GetQuery(ctx context.Context, id uuid.UUID) (*Fullactivequery, error) {
row := q.db.QueryRow(ctx, getQuery, id)
var i Fullactivequery
err := row.Scan(
@@ -161,17 +161,17 @@ SELECT DISTINCT q.id, q.type,
`
type GetQueryWithVersionParams struct {
ID pgtype.UUID `db:"id"`
Version *int32 `db:"version"`
ID *uuid.UUID `db:"id"`
Version *int32 `db:"version"`
}
type GetQueryWithVersionRow struct {
ID pgtype.UUID `db:"id"`
Type Querytype `db:"type"`
Activeversion int32 `db:"activeversion"`
Latestversion int32 `db:"latestversion"`
Config []byte `db:"config"`
Requiredids []pgtype.UUID `db:"requiredids"`
ID uuid.UUID `db:"id"`
Type Querytype `db:"type"`
Activeversion int32 `db:"activeversion"`
Latestversion int32 `db:"latestversion"`
Config []byte `db:"config"`
Requiredids []uuid.UUID `db:"requiredids"`
}
// GetQueryWithVersion
@@ -230,8 +230,8 @@ SELECT EXISTS (
`
type IsQueryInDependencyTreeParams struct {
Requiredqueryids []pgtype.UUID `db:"requiredqueryids"`
Queryid pgtype.UUID `db:"queryid"`
Requiredqueryids []uuid.UUID `db:"requiredqueryids"`
Queryid *uuid.UUID `db:"queryid"`
}
// IsQueryInDependencyTree
@@ -290,7 +290,7 @@ SELECT id, type, activeversion, latestversion, config, requiredids FROM fullActi
// ListQueriesById
//
// SELECT id, type, activeversion, latestversion, config, requiredids FROM fullActiveQueries WHERE id = any($1)
func (q *Queries) ListQueriesById(ctx context.Context, id []pgtype.UUID) ([]*Fullactivequery, error) {
func (q *Queries) ListQueriesById(ctx context.Context, id []uuid.UUID) ([]*Fullactivequery, error) {
rows, err := q.db.Query(ctx, listQueriesById, id)
if err != nil {
return nil, err
@@ -324,15 +324,15 @@ SELECT clientId FROM collectorQueryDependencyTree WHERE queryId = $1
// ListQueryClientIDs
//
// SELECT clientId FROM collectorQueryDependencyTree WHERE queryId = $1
func (q *Queries) ListQueryClientIDs(ctx context.Context, queryid pgtype.UUID) ([]pgtype.UUID, error) {
func (q *Queries) ListQueryClientIDs(ctx context.Context, queryid *uuid.UUID) ([]uuid.UUID, error) {
rows, err := q.db.Query(ctx, listQueryClientIDs, queryid)
if err != nil {
return nil, err
}
defer rows.Close()
items := []pgtype.UUID{}
items := []uuid.UUID{}
for rows.Next() {
var clientid pgtype.UUID
var clientid uuid.UUID
if err := rows.Scan(&clientid); err != nil {
return nil, err
}
@@ -356,8 +356,8 @@ SELECT dt.queryId
`
type ListQueryDirectDependentsByDocumentIDParams struct {
Queryid pgtype.UUID `db:"queryid"`
Documentid pgtype.UUID `db:"documentid"`
Queryid uuid.UUID `db:"queryid"`
Documentid uuid.UUID `db:"documentid"`
}
// ListQueryDirectDependentsByDocumentID
@@ -370,15 +370,15 @@ type ListQueryDirectDependentsByDocumentIDParams struct {
// JOIN collectorQueryDependencyTree as dt
// on d.clientId = dt.clientId
// and $1 = any(dt.requiredIds)
func (q *Queries) ListQueryDirectDependentsByDocumentID(ctx context.Context, arg *ListQueryDirectDependentsByDocumentIDParams) ([]pgtype.UUID, error) {
func (q *Queries) ListQueryDirectDependentsByDocumentID(ctx context.Context, arg *ListQueryDirectDependentsByDocumentIDParams) ([]*uuid.UUID, error) {
rows, err := q.db.Query(ctx, listQueryDirectDependentsByDocumentID, arg.Queryid, arg.Documentid)
if err != nil {
return nil, err
}
defer rows.Close()
items := []pgtype.UUID{}
items := []*uuid.UUID{}
for rows.Next() {
var queryid pgtype.UUID
var queryid *uuid.UUID
if err := rows.Scan(&queryid); err != nil {
return nil, err
}
@@ -395,9 +395,9 @@ UPDATE requiredQueries SET removedVersion = $1 WHERE requiredQueryId = $2 and qu
`
type RemoveRequiredQueryParams struct {
Removedversion *int32 `db:"removedversion"`
Requiredqueryid pgtype.UUID `db:"requiredqueryid"`
Queryid pgtype.UUID `db:"queryid"`
Removedversion *int32 `db:"removedversion"`
Requiredqueryid uuid.UUID `db:"requiredqueryid"`
Queryid uuid.UUID `db:"queryid"`
}
// RemoveRequiredQuery
@@ -413,9 +413,9 @@ INSERT INTO queryConfigs (queryId, config, addedVersion) VALUES ($1, $2, $3)
`
type SetQueryConfigParams struct {
Queryid pgtype.UUID `db:"queryid"`
Config []byte `db:"config"`
Addedversion int32 `db:"addedversion"`
Queryid uuid.UUID `db:"queryid"`
Config []byte `db:"config"`
Addedversion int32 `db:"addedversion"`
}
// SetQueryConfig