Merged in feature/textextraction (pull request #110)

Text Extraction

* bases

* go

* splitting

* structure

* movetoasync

* movetoasync

* settinguptrigger

* reorder

* storevent

* standardisepollingvalidation

* unittests

* fixlint

* fixlint

* awscfg

* generatesample

* followthrough

* tests

* clena

* store

* externalidcleanup

* clientid

* local

* baseunittests

* putobjecttests

* tests
This commit is contained in:
Michael McGuinness
2025-04-02 18:50:03 +00:00
parent e6a4cb3990
commit 81e7223560
226 changed files with 17283 additions and 2744 deletions
+60 -49
View File
@@ -180,36 +180,35 @@ func (e Querytype) Valid() bool {
}
type Client struct {
ID uuid.UUID `db:"id"`
Externalid string `db:"externalid"`
Name string `db:"name"`
ID string `db:"id"`
Name string `db:"name"`
}
type Clientcansync struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Cansync bool `db:"cansync"`
}
type Collectoractiveversion struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Versionid int32 `db:"versionid"`
}
type Collectorcurrentactiveversion struct {
Clientid uuid.UUID `db:"clientid"`
Activeversion int32 `db:"activeversion"`
Clientid string `db:"clientid"`
Activeversion int32 `db:"activeversion"`
}
type Collectorlatestversion struct {
Clientid uuid.UUID `db:"clientid"`
Latestversion int32 `db:"latestversion"`
Clientid string `db:"clientid"`
Latestversion int32 `db:"latestversion"`
}
type Collectormincleanversion struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Versionid int64 `db:"versionid"`
Addedversion int32 `db:"addedversion"`
Removedversion *int32 `db:"removedversion"`
@@ -217,7 +216,7 @@ type Collectormincleanversion struct {
type Collectormintextversion struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Versionid int64 `db:"versionid"`
Addedversion int32 `db:"addedversion"`
Removedversion *int32 `db:"removedversion"`
@@ -225,7 +224,7 @@ type Collectormintextversion struct {
type Collectorquery struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Name string `db:"name"`
Queryid uuid.UUID `db:"queryid"`
Addedversion int32 `db:"addedversion"`
@@ -233,7 +232,7 @@ type Collectorquery struct {
}
type Collectorquerydependencytree struct {
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Queryid *uuid.UUID `db:"queryid"`
Type Querytype `db:"type"`
Queryversion int32 `db:"queryversion"`
@@ -241,7 +240,7 @@ type Collectorquerydependencytree struct {
}
type Collectorversion struct {
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
ID int32 `db:"id"`
Addedat pgtype.Timestamp `db:"addedat"`
}
@@ -252,49 +251,54 @@ type Currentcleanentry struct {
Bucket *string `db:"bucket"`
Key *string `db:"key"`
Version int64 `db:"version"`
Hash *string `db:"hash"`
Mimetype NullCleanmimetype `db:"mimetype"`
Fail NullCleanfailtype `db:"fail"`
Clientid string `db:"clientid"`
}
type Currentclientcansync struct {
Clientid uuid.UUID `db:"clientid"`
Cansync bool `db:"cansync"`
Clientid string `db:"clientid"`
Cansync bool `db:"cansync"`
}
type Currentcollectormincleanversion struct {
Clientid uuid.UUID `db:"clientid"`
Mincleanversion int64 `db:"mincleanversion"`
Clientid string `db:"clientid"`
Mincleanversion int64 `db:"mincleanversion"`
}
type Currentcollectormintextversion struct {
Clientid uuid.UUID `db:"clientid"`
Mintextversion int64 `db:"mintextversion"`
Clientid string `db:"clientid"`
Mintextversion int64 `db:"mintextversion"`
}
type Currentcollectorqueriesjsonagg struct {
Clientid uuid.UUID `db:"clientid"`
Fields []byte `db:"fields"`
Clientid string `db:"clientid"`
Fields []byte `db:"fields"`
}
type Currentcollectorquery struct {
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Name *string `db:"name"`
Queryid *uuid.UUID `db:"queryid"`
}
type Currenttextentry struct {
ID uuid.UUID `db:"id"`
Documentid uuid.UUID `db:"documentid"`
Bucket string `db:"bucket"`
Key string `db:"key"`
Version int64 `db:"version"`
Hash string `db:"hash"`
Cleanentryid uuid.UUID `db:"cleanentryid"`
ID uuid.UUID `db:"id"`
Documentid uuid.UUID `db:"documentid"`
Bucket string `db:"bucket"`
Key string `db:"key"`
Hash string `db:"hash"`
Cleanid uuid.UUID `db:"cleanid"`
Triggerid uuid.UUID `db:"triggerid"`
Textractjobid *string `db:"textractjobid"`
Triggerversion int64 `db:"triggerversion"`
Extractionversion int64 `db:"extractionversion"`
}
type Document struct {
ID uuid.UUID `db:"id"`
Clientid uuid.UUID `db:"clientid"`
Clientid string `db:"clientid"`
Hash string `db:"hash"`
}
@@ -303,6 +307,7 @@ type Documentclean struct {
Documentid uuid.UUID `db:"documentid"`
Bucket *string `db:"bucket"`
Key *string `db:"key"`
Hash *string `db:"hash"`
Mimetype NullCleanmimetype `db:"mimetype"`
Fail NullCleanfailtype `db:"fail"`
}
@@ -321,26 +326,33 @@ type Documententry struct {
}
type Documenttextextraction struct {
ID uuid.UUID `db:"id"`
Cleanentryid uuid.UUID `db:"cleanentryid"`
Bucket string `db:"bucket"`
Key string `db:"key"`
Hash string `db:"hash"`
ID uuid.UUID `db:"id"`
Bucket string `db:"bucket"`
Key string `db:"key"`
Hash string `db:"hash"`
}
type Documenttextextractionentry struct {
ID uuid.UUID `db:"id"`
Textid uuid.UUID `db:"textid"`
Version int64 `db:"version"`
ID uuid.UUID `db:"id"`
Textid uuid.UUID `db:"textid"`
Triggerid uuid.UUID `db:"triggerid"`
Version int64 `db:"version"`
}
type Documenttexttriggerextraction struct {
ID uuid.UUID `db:"id"`
Cleanid uuid.UUID `db:"cleanid"`
Version int64 `db:"version"`
Textractjobid *string `db:"textractjobid"`
}
type Fullactivecollector struct {
Clientid uuid.UUID `db:"clientid"`
Mincleanversion int64 `db:"mincleanversion"`
Mintextversion int64 `db:"mintextversion"`
Activeversion int32 `db:"activeversion"`
Latestversion int32 `db:"latestversion"`
Fields []byte `db:"fields"`
Clientid string `db:"clientid"`
Mincleanversion int64 `db:"mincleanversion"`
Mintextversion int64 `db:"mintextversion"`
Activeversion int32 `db:"activeversion"`
Latestversion int32 `db:"latestversion"`
Fields []byte `db:"fields"`
}
type Fullactivequery struct {
@@ -353,10 +365,9 @@ type Fullactivequery struct {
}
type Fullclient struct {
ID uuid.UUID `db:"id"`
Externalid string `db:"externalid"`
Name string `db:"name"`
Cansync bool `db:"cansync"`
ID string `db:"id"`
Name string `db:"name"`
Cansync bool `db:"cansync"`
}
type Query struct {