Merged in feature/textextract (pull request #108)
Start adding Textract + UUID changes * base * startclient * ts * short * tests
This commit is contained in:
@@ -9,13 +9,11 @@ import (
|
||||
"regexp"
|
||||
|
||||
docsyncrunner "queryorchestration/api/docSyncRunner"
|
||||
"queryorchestration/internal/database"
|
||||
"queryorchestration/internal/database/repository"
|
||||
"queryorchestration/internal/document"
|
||||
"queryorchestration/internal/serviceconfig/queue"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
type Create struct {
|
||||
@@ -52,18 +50,18 @@ func (s *Service) Create(ctx context.Context, doc *Create) (uuid.UUID, error) {
|
||||
}
|
||||
|
||||
type createDocumentParams struct {
|
||||
ID *pgtype.UUID
|
||||
ClientID pgtype.UUID
|
||||
ID *uuid.UUID
|
||||
ClientID uuid.UUID
|
||||
Hash string
|
||||
Location document.Location
|
||||
}
|
||||
|
||||
func (s *Service) getCreateParams(ctx context.Context, doc *Create) (*createDocumentParams, error) {
|
||||
idbyhash, err := s.cfg.GetDBQueries().GetDocumentIDByHash(ctx, &repository.GetDocumentIDByHashParams{
|
||||
Clientid: database.MustToDBUUID(doc.ClientID),
|
||||
Clientid: doc.ClientID,
|
||||
Hash: doc.Hash,
|
||||
})
|
||||
var docID *pgtype.UUID
|
||||
var docID *uuid.UUID
|
||||
if err != nil && !errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, err
|
||||
} else if err == nil {
|
||||
@@ -72,7 +70,7 @@ func (s *Service) getCreateParams(ctx context.Context, doc *Create) (*createDocu
|
||||
|
||||
return &createDocumentParams{
|
||||
ID: docID,
|
||||
ClientID: database.MustToDBUUID(doc.ClientID),
|
||||
ClientID: doc.ClientID,
|
||||
Hash: doc.Hash,
|
||||
Location: doc.Location,
|
||||
}, nil
|
||||
@@ -82,7 +80,7 @@ func (s *Service) submitCreate(ctx context.Context, params *createDocumentParams
|
||||
var id uuid.UUID
|
||||
|
||||
err := s.cfg.ExecuteDBTransaction(ctx, func(ctx context.Context, q *repository.Queries) error {
|
||||
var dbid pgtype.UUID
|
||||
var dbid uuid.UUID
|
||||
if params.ID == nil {
|
||||
createid, err := s.cfg.GetDBQueries().CreateDocument(ctx, &repository.CreateDocumentParams{
|
||||
Clientid: params.ClientID,
|
||||
@@ -109,7 +107,7 @@ func (s *Service) submitCreate(ctx context.Context, params *createDocumentParams
|
||||
return err
|
||||
}
|
||||
|
||||
id = database.MustToUUID(dbid)
|
||||
id = dbid
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user