Merged in feature/textExtractionsPart2 (pull request #193)
Continue finishing the parts of the text extraction plan * add missing fields
This commit is contained in:
Jay Brown
@@ -0,0 +1,10 @@
|
||||
-- Remove the unique constraint and documentId column
|
||||
|
||||
DROP INDEX IF EXISTS idx_documentfieldextractionversions_documentid;
|
||||
DROP INDEX IF EXISTS idx_unique_version_per_document;
|
||||
|
||||
ALTER TABLE documentFieldExtractionVersions
|
||||
DROP CONSTRAINT IF EXISTS fk_documentfieldextractionversions_documentid;
|
||||
|
||||
ALTER TABLE documentFieldExtractionVersions
|
||||
DROP COLUMN IF EXISTS documentId;
|
||||
@@ -0,0 +1,30 @@
|
||||
-- Add unique constraint to prevent duplicate versions per document
|
||||
-- This ensures that concurrent requests cannot create the same version number
|
||||
|
||||
-- First, add documentId column to versions table for easier constraint enforcement
|
||||
ALTER TABLE documentFieldExtractionVersions
|
||||
ADD COLUMN documentId uuid;
|
||||
|
||||
-- Populate documentId from the joined extraction record
|
||||
UPDATE documentFieldExtractionVersions dfev
|
||||
SET documentId = dfe.documentId
|
||||
FROM documentFieldExtractions dfe
|
||||
WHERE dfev.fieldExtractionId = dfe.id;
|
||||
|
||||
-- Make documentId NOT NULL after populating
|
||||
ALTER TABLE documentFieldExtractionVersions
|
||||
ALTER COLUMN documentId SET NOT NULL;
|
||||
|
||||
-- Add foreign key constraint (documents table has 'id' as primary key)
|
||||
ALTER TABLE documentFieldExtractionVersions
|
||||
ADD CONSTRAINT fk_documentfieldextractionversions_documentid
|
||||
FOREIGN KEY (documentId) REFERENCES documents(id);
|
||||
|
||||
-- Add unique constraint on documentId + version
|
||||
-- This prevents duplicate version numbers for the same document
|
||||
CREATE UNIQUE INDEX idx_unique_version_per_document
|
||||
ON documentFieldExtractionVersions(documentId, version);
|
||||
|
||||
-- Add index for efficient lookups by documentId
|
||||
CREATE INDEX idx_documentfieldextractionversions_documentid
|
||||
ON documentFieldExtractionVersions(documentId);
|
||||
@@ -4,6 +4,10 @@ INSERT INTO clients (clientId, name) VALUES ($1, $2);
|
||||
-- name: GetClient :one
|
||||
SELECT * FROM fullClients WHERE clientId = $1;
|
||||
|
||||
-- name: ListClients :many
|
||||
-- Returns all clients ordered by name
|
||||
SELECT * FROM fullClients ORDER BY name;
|
||||
|
||||
-- name: UpdateClient :exec
|
||||
UPDATE clients SET name = $1 WHERE clientId = $2;
|
||||
|
||||
|
||||
@@ -158,13 +158,63 @@ INSERT INTO documentFieldExtractionArrayFields (
|
||||
);
|
||||
|
||||
-- name: AddFieldExtractionEntry :exec
|
||||
INSERT INTO documentFieldExtractionVersions (fieldExtractionId, version, createdBy)
|
||||
VALUES ($1, $2, $3);
|
||||
-- Insert a new version entry for a field extraction
|
||||
-- documentId is required for the unique constraint enforcement
|
||||
INSERT INTO documentFieldExtractionVersions (fieldExtractionId, documentId, version, createdBy)
|
||||
VALUES ($1, $2, $3, $4);
|
||||
|
||||
-- name: LockFieldExtractionVersionsForDocument :many
|
||||
-- Lock all existing version rows for a document to prevent concurrent inserts
|
||||
-- Must be called within a transaction before GetMaxFieldExtractionVersion
|
||||
-- Returns the locked rows (which may be empty for first version)
|
||||
SELECT id, version FROM documentFieldExtractionVersions
|
||||
WHERE documentId = $1
|
||||
FOR UPDATE;
|
||||
|
||||
-- name: GetMaxFieldExtractionVersion :one
|
||||
-- Get the current max version for a document (call after LockFieldExtractionVersionsForDocument)
|
||||
-- Returns 0 if no versions exist, otherwise the max version number
|
||||
-- COALESCE ensures we always get a non-NULL value that can be scanned into int64
|
||||
SELECT COALESCE(MAX(version), 0) as max_version
|
||||
FROM documentFieldExtractionVersions
|
||||
WHERE documentId = $1;
|
||||
|
||||
-- name: GetCurrentFieldExtraction :one
|
||||
SELECT * FROM currentFieldExtractions
|
||||
WHERE documentId = $1;
|
||||
|
||||
-- name: GetFieldExtractionByVersion :one
|
||||
-- Retrieves a specific version of field extraction for a document
|
||||
-- Returns the field extraction record with version metadata
|
||||
SELECT
|
||||
dfe.id,
|
||||
dfe.documentId,
|
||||
dfe.fileName,
|
||||
dfe.contractTitle,
|
||||
dfe.aareteDerivedAmendmentNum,
|
||||
dfe.clientName,
|
||||
dfe.payerName,
|
||||
dfe.payerState,
|
||||
dfe.providerState,
|
||||
dfe.filenameTin,
|
||||
dfe.provGroupTin,
|
||||
dfe.provGroupNpi,
|
||||
dfe.provGroupNameFull,
|
||||
dfe.provOtherTin,
|
||||
dfe.provOtherNpi,
|
||||
dfe.provOtherNameFull,
|
||||
dfe.aareteDerivedEffectiveDt,
|
||||
dfe.aareteDerivedTerminationDt,
|
||||
dfe.autoRenewalInd,
|
||||
dfe.autoRenewalTerm,
|
||||
dfev.version,
|
||||
dfev.createdBy,
|
||||
dfev.createdAt
|
||||
FROM documentFieldExtractions dfe
|
||||
JOIN documentFieldExtractionVersions dfev
|
||||
ON dfev.fieldExtractionId = dfe.id
|
||||
WHERE dfev.documentId = $1 AND dfev.version = $2;
|
||||
|
||||
-- name: GetCurrentFieldExtractionWithArrayCount :one
|
||||
SELECT * FROM currentFieldExtractionsWithArrayCount
|
||||
WHERE documentId = $1;
|
||||
|
||||
@@ -255,6 +255,33 @@ func (q *Queries) IsClientSynced(ctx context.Context, dollar_1 *string) (bool, e
|
||||
return is_synced, err
|
||||
}
|
||||
|
||||
const listClients = `-- name: ListClients :many
|
||||
SELECT clientid, name, cansync FROM fullClients ORDER BY name
|
||||
`
|
||||
|
||||
// Returns all clients ordered by name
|
||||
//
|
||||
// SELECT clientid, name, cansync FROM fullClients ORDER BY name
|
||||
func (q *Queries) ListClients(ctx context.Context) ([]*Fullclient, error) {
|
||||
rows, err := q.db.Query(ctx, listClients)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []*Fullclient{}
|
||||
for rows.Next() {
|
||||
var i Fullclient
|
||||
if err := rows.Scan(&i.Clientid, &i.Name, &i.Cansync); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, &i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const updateClient = `-- name: UpdateClient :exec
|
||||
UPDATE clients SET name = $1 WHERE clientId = $2
|
||||
`
|
||||
|
||||
@@ -644,22 +644,29 @@ func (q *Queries) AddFieldExtractionArrayField(ctx context.Context, arg *AddFiel
|
||||
}
|
||||
|
||||
const addFieldExtractionEntry = `-- name: AddFieldExtractionEntry :exec
|
||||
INSERT INTO documentFieldExtractionVersions (fieldExtractionId, version, createdBy)
|
||||
VALUES ($1, $2, $3)
|
||||
INSERT INTO documentFieldExtractionVersions (fieldExtractionId, documentId, version, createdBy)
|
||||
VALUES ($1, $2, $3, $4)
|
||||
`
|
||||
|
||||
type AddFieldExtractionEntryParams struct {
|
||||
Fieldextractionid uuid.UUID `db:"fieldextractionid"`
|
||||
Documentid uuid.UUID `db:"documentid"`
|
||||
Version int64 `db:"version"`
|
||||
Createdby string `db:"createdby"`
|
||||
}
|
||||
|
||||
// AddFieldExtractionEntry
|
||||
// Insert a new version entry for a field extraction
|
||||
// documentId is required for the unique constraint enforcement
|
||||
//
|
||||
// INSERT INTO documentFieldExtractionVersions (fieldExtractionId, version, createdBy)
|
||||
// VALUES ($1, $2, $3)
|
||||
// INSERT INTO documentFieldExtractionVersions (fieldExtractionId, documentId, version, createdBy)
|
||||
// VALUES ($1, $2, $3, $4)
|
||||
func (q *Queries) AddFieldExtractionEntry(ctx context.Context, arg *AddFieldExtractionEntryParams) error {
|
||||
_, err := q.db.Exec(ctx, addFieldExtractionEntry, arg.Fieldextractionid, arg.Version, arg.Createdby)
|
||||
_, err := q.db.Exec(ctx, addFieldExtractionEntry,
|
||||
arg.Fieldextractionid,
|
||||
arg.Documentid,
|
||||
arg.Version,
|
||||
arg.Createdby,
|
||||
)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -930,6 +937,130 @@ func (q *Queries) GetFieldExtractionByID(ctx context.Context, id uuid.UUID) (*Do
|
||||
return &i, err
|
||||
}
|
||||
|
||||
const getFieldExtractionByVersion = `-- name: GetFieldExtractionByVersion :one
|
||||
SELECT
|
||||
dfe.id,
|
||||
dfe.documentId,
|
||||
dfe.fileName,
|
||||
dfe.contractTitle,
|
||||
dfe.aareteDerivedAmendmentNum,
|
||||
dfe.clientName,
|
||||
dfe.payerName,
|
||||
dfe.payerState,
|
||||
dfe.providerState,
|
||||
dfe.filenameTin,
|
||||
dfe.provGroupTin,
|
||||
dfe.provGroupNpi,
|
||||
dfe.provGroupNameFull,
|
||||
dfe.provOtherTin,
|
||||
dfe.provOtherNpi,
|
||||
dfe.provOtherNameFull,
|
||||
dfe.aareteDerivedEffectiveDt,
|
||||
dfe.aareteDerivedTerminationDt,
|
||||
dfe.autoRenewalInd,
|
||||
dfe.autoRenewalTerm,
|
||||
dfev.version,
|
||||
dfev.createdBy,
|
||||
dfev.createdAt
|
||||
FROM documentFieldExtractions dfe
|
||||
JOIN documentFieldExtractionVersions dfev
|
||||
ON dfev.fieldExtractionId = dfe.id
|
||||
WHERE dfev.documentId = $1 AND dfev.version = $2
|
||||
`
|
||||
|
||||
type GetFieldExtractionByVersionParams struct {
|
||||
Documentid uuid.UUID `db:"documentid"`
|
||||
Version int64 `db:"version"`
|
||||
}
|
||||
|
||||
type GetFieldExtractionByVersionRow struct {
|
||||
ID uuid.UUID `db:"id"`
|
||||
Documentid uuid.UUID `db:"documentid"`
|
||||
Filename *string `db:"filename"`
|
||||
Contracttitle *string `db:"contracttitle"`
|
||||
Aaretederivedamendmentnum *int32 `db:"aaretederivedamendmentnum"`
|
||||
Clientname *string `db:"clientname"`
|
||||
Payername *string `db:"payername"`
|
||||
Payerstate *string `db:"payerstate"`
|
||||
Providerstate *string `db:"providerstate"`
|
||||
Filenametin *string `db:"filenametin"`
|
||||
Provgrouptin *string `db:"provgrouptin"`
|
||||
Provgroupnpi *string `db:"provgroupnpi"`
|
||||
Provgroupnamefull *string `db:"provgroupnamefull"`
|
||||
Provothertin *string `db:"provothertin"`
|
||||
Provothernpi *string `db:"provothernpi"`
|
||||
Provothernamefull *string `db:"provothernamefull"`
|
||||
Aaretederivedeffectivedt pgtype.Date `db:"aaretederivedeffectivedt"`
|
||||
Aaretederivedterminationdt pgtype.Date `db:"aaretederivedterminationdt"`
|
||||
Autorenewalind *bool `db:"autorenewalind"`
|
||||
Autorenewalterm *string `db:"autorenewalterm"`
|
||||
Version int64 `db:"version"`
|
||||
Createdby string `db:"createdby"`
|
||||
Createdat pgtype.Timestamp `db:"createdat"`
|
||||
}
|
||||
|
||||
// Retrieves a specific version of field extraction for a document
|
||||
// Returns the field extraction record with version metadata
|
||||
//
|
||||
// SELECT
|
||||
// dfe.id,
|
||||
// dfe.documentId,
|
||||
// dfe.fileName,
|
||||
// dfe.contractTitle,
|
||||
// dfe.aareteDerivedAmendmentNum,
|
||||
// dfe.clientName,
|
||||
// dfe.payerName,
|
||||
// dfe.payerState,
|
||||
// dfe.providerState,
|
||||
// dfe.filenameTin,
|
||||
// dfe.provGroupTin,
|
||||
// dfe.provGroupNpi,
|
||||
// dfe.provGroupNameFull,
|
||||
// dfe.provOtherTin,
|
||||
// dfe.provOtherNpi,
|
||||
// dfe.provOtherNameFull,
|
||||
// dfe.aareteDerivedEffectiveDt,
|
||||
// dfe.aareteDerivedTerminationDt,
|
||||
// dfe.autoRenewalInd,
|
||||
// dfe.autoRenewalTerm,
|
||||
// dfev.version,
|
||||
// dfev.createdBy,
|
||||
// dfev.createdAt
|
||||
// FROM documentFieldExtractions dfe
|
||||
// JOIN documentFieldExtractionVersions dfev
|
||||
// ON dfev.fieldExtractionId = dfe.id
|
||||
// WHERE dfev.documentId = $1 AND dfev.version = $2
|
||||
func (q *Queries) GetFieldExtractionByVersion(ctx context.Context, arg *GetFieldExtractionByVersionParams) (*GetFieldExtractionByVersionRow, error) {
|
||||
row := q.db.QueryRow(ctx, getFieldExtractionByVersion, arg.Documentid, arg.Version)
|
||||
var i GetFieldExtractionByVersionRow
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Documentid,
|
||||
&i.Filename,
|
||||
&i.Contracttitle,
|
||||
&i.Aaretederivedamendmentnum,
|
||||
&i.Clientname,
|
||||
&i.Payername,
|
||||
&i.Payerstate,
|
||||
&i.Providerstate,
|
||||
&i.Filenametin,
|
||||
&i.Provgrouptin,
|
||||
&i.Provgroupnpi,
|
||||
&i.Provgroupnamefull,
|
||||
&i.Provothertin,
|
||||
&i.Provothernpi,
|
||||
&i.Provothernamefull,
|
||||
&i.Aaretederivedeffectivedt,
|
||||
&i.Aaretederivedterminationdt,
|
||||
&i.Autorenewalind,
|
||||
&i.Autorenewalterm,
|
||||
&i.Version,
|
||||
&i.Createdby,
|
||||
&i.Createdat,
|
||||
)
|
||||
return &i, err
|
||||
}
|
||||
|
||||
const getFieldExtractionHistory = `-- name: GetFieldExtractionHistory :many
|
||||
SELECT
|
||||
dfe.id,
|
||||
@@ -1045,6 +1176,64 @@ func (q *Queries) GetFieldExtractionsByDocumentID(ctx context.Context, documenti
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const getMaxFieldExtractionVersion = `-- name: GetMaxFieldExtractionVersion :one
|
||||
SELECT COALESCE(MAX(version), 0) as max_version
|
||||
FROM documentFieldExtractionVersions
|
||||
WHERE documentId = $1
|
||||
`
|
||||
|
||||
// Get the current max version for a document (call after LockFieldExtractionVersionsForDocument)
|
||||
// Returns 0 if no versions exist, otherwise the max version number
|
||||
// COALESCE ensures we always get a non-NULL value that can be scanned into int64
|
||||
//
|
||||
// SELECT COALESCE(MAX(version), 0) as max_version
|
||||
// FROM documentFieldExtractionVersions
|
||||
// WHERE documentId = $1
|
||||
func (q *Queries) GetMaxFieldExtractionVersion(ctx context.Context, documentid uuid.UUID) (*int64, error) {
|
||||
row := q.db.QueryRow(ctx, getMaxFieldExtractionVersion, documentid)
|
||||
var max_version *int64
|
||||
err := row.Scan(&max_version)
|
||||
return max_version, err
|
||||
}
|
||||
|
||||
const lockFieldExtractionVersionsForDocument = `-- name: LockFieldExtractionVersionsForDocument :many
|
||||
SELECT id, version FROM documentFieldExtractionVersions
|
||||
WHERE documentId = $1
|
||||
FOR UPDATE
|
||||
`
|
||||
|
||||
type LockFieldExtractionVersionsForDocumentRow struct {
|
||||
ID uuid.UUID `db:"id"`
|
||||
Version int64 `db:"version"`
|
||||
}
|
||||
|
||||
// Lock all existing version rows for a document to prevent concurrent inserts
|
||||
// Must be called within a transaction before GetMaxFieldExtractionVersion
|
||||
// Returns the locked rows (which may be empty for first version)
|
||||
//
|
||||
// SELECT id, version FROM documentFieldExtractionVersions
|
||||
// WHERE documentId = $1
|
||||
// FOR UPDATE
|
||||
func (q *Queries) LockFieldExtractionVersionsForDocument(ctx context.Context, documentid uuid.UUID) ([]*LockFieldExtractionVersionsForDocumentRow, error) {
|
||||
rows, err := q.db.Query(ctx, lockFieldExtractionVersionsForDocument, documentid)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
items := []*LockFieldExtractionVersionsForDocumentRow{}
|
||||
for rows.Next() {
|
||||
var i LockFieldExtractionVersionsForDocumentRow
|
||||
if err := rows.Scan(&i.ID, &i.Version); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
items = append(items, &i)
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return items, nil
|
||||
}
|
||||
|
||||
const validateArrayFieldCount = `-- name: ValidateArrayFieldCount :one
|
||||
SELECT COUNT(*) as arrayFieldCount
|
||||
FROM documentFieldExtractionArrayFields
|
||||
|
||||
@@ -602,6 +602,7 @@ type Documentfieldextractionversion struct {
|
||||
Version int64 `db:"version"`
|
||||
Createdby string `db:"createdby"`
|
||||
Createdat pgtype.Timestamp `db:"createdat"`
|
||||
Documentid uuid.UUID `db:"documentid"`
|
||||
}
|
||||
|
||||
type Documentlabel struct {
|
||||
|
||||
Reference in New Issue
Block a user