Remove old FieldSeeker tables, use v2 generated tables.

This requires a bunch of changes since the types on these tables are
much closer to the underlying types of the Fieldseeker data we are
getting back from the API.

I now need to use proper UUID types everywhere, which means I had to
modify the bob gen config to consistently use google UUID, my UUID
library of choice.

I also had to add the organization_id to all the fieldseeker tables
since we rely on them existing for some of our compound queries.

There were some changes to the API type signatures to get things to
build. I may yet regret those.
This commit is contained in:
Eli Ribble 2025-12-24 17:49:39 -07:00
parent 58f5afccc9
commit 1395e3d3ac
445 changed files with 54077 additions and 275856 deletions

View file

@ -1,18 +1,19 @@
// Code generated by BobGen psql v0.0.3-0.20251202003046-49148fc66a73+dirty. DO NOT EDIT.
// Code generated by BobGen psql v0.0.4-0.20251216163753-8e325b7c773a+dirty. DO NOT EDIT.
// This file is meant to be re-generated in place and/or deleted at any time.
package models
import (
"context"
"encoding/json"
"fmt"
"io"
"time"
enums "github.com/Gleipnir-Technology/nidus-sync/db/enums"
"github.com/aarondl/opt/null"
"github.com/aarondl/opt/omit"
"github.com/aarondl/opt/omitnull"
"github.com/gofrs/uuid/v5"
"github.com/google/uuid"
"github.com/stephenafamo/bob"
"github.com/stephenafamo/bob/dialect/psql"
"github.com/stephenafamo/bob/dialect/psql/dialect"
@ -20,27 +21,47 @@ import (
"github.com/stephenafamo/bob/dialect/psql/sm"
"github.com/stephenafamo/bob/dialect/psql/um"
"github.com/stephenafamo/bob/expr"
"github.com/stephenafamo/bob/mods"
"github.com/stephenafamo/bob/orm"
"github.com/stephenafamo/bob/types"
"github.com/stephenafamo/bob/types/pgtypes"
)
// FieldseekerContainerrelate is an object representing the database table.
type FieldseekerContainerrelate struct {
Objectid int64 `db:"objectid,pk" `
Globalid null.Val[uuid.UUID] `db:"globalid" `
CreatedUser null.Val[string] `db:"created_user" `
CreatedDate null.Val[time.Time] `db:"created_date" `
LastEditedUser null.Val[string] `db:"last_edited_user" `
Objectid int64 `db:"objectid,pk" `
// Original attribute from ArcGIS API is GlobalID
Globalid null.Val[uuid.UUID] `db:"globalid" `
// Original attribute from ArcGIS API is created_user
CreatedUser null.Val[string] `db:"created_user" `
// Original attribute from ArcGIS API is created_date
CreatedDate null.Val[time.Time] `db:"created_date" `
// Original attribute from ArcGIS API is last_edited_user
LastEditedUser null.Val[string] `db:"last_edited_user" `
// Original attribute from ArcGIS API is last_edited_date
LastEditedDate null.Val[time.Time] `db:"last_edited_date" `
Inspsampleid null.Val[uuid.UUID] `db:"inspsampleid" `
// Original attribute from ArcGIS API is INSPSAMPLEID
Inspsampleid null.Val[uuid.UUID] `db:"inspsampleid" `
// Original attribute from ArcGIS API is MOSQUITOINSPID
Mosquitoinspid null.Val[uuid.UUID] `db:"mosquitoinspid" `
Treatmentid null.Val[uuid.UUID] `db:"treatmentid" `
// Container Type
Containertype null.Val[enums.FieldseekerContainerrelateMosquitocontainertypeEnum] `db:"containertype" `
Creationdate null.Val[time.Time] `db:"creationdate" `
Creator null.Val[string] `db:"creator" `
Editdate null.Val[time.Time] `db:"editdate" `
Editor null.Val[string] `db:"editor" `
// Tracks version changes to the row. Increases when data is modified.
Version int32 `db:"version,pk" `
// Original attribute from ArcGIS API is TREATMENTID
Treatmentid null.Val[uuid.UUID] `db:"treatmentid" `
// Original attribute from ArcGIS API is CONTAINERTYPE
Containertype null.Val[string] `db:"containertype" `
// Original attribute from ArcGIS API is CreationDate
Creationdate null.Val[time.Time] `db:"creationdate" `
// Original attribute from ArcGIS API is Creator
Creator null.Val[string] `db:"creator" `
// Original attribute from ArcGIS API is EditDate
Editdate null.Val[time.Time] `db:"editdate" `
// Original attribute from ArcGIS API is Editor
Editor null.Val[string] `db:"editor" `
Geometry types.JSON[json.RawMessage] `db:"geometry" `
Geospatial null.Val[string] `db:"geospatial" `
Version int32 `db:"version,pk" `
OrganizationID int32 `db:"organization_id" `
R fieldseekerContainerrelateR `db:"-" `
}
// FieldseekerContainerrelateSlice is an alias for a slice of pointers to FieldseekerContainerrelate.
@ -53,10 +74,15 @@ var FieldseekerContainerrelates = psql.NewTablex[*FieldseekerContainerrelate, Fi
// FieldseekerContainerrelatesQuery is a query on the containerrelate table
type FieldseekerContainerrelatesQuery = *psql.ViewQuery[*FieldseekerContainerrelate, FieldseekerContainerrelateSlice]
// fieldseekerContainerrelateR is where relationships are stored.
type fieldseekerContainerrelateR struct {
Organization *Organization // fieldseeker.containerrelate.containerrelate_organization_id_fkey
}
func buildFieldseekerContainerrelateColumns(alias string) fieldseekerContainerrelateColumns {
return fieldseekerContainerrelateColumns{
ColumnsExpr: expr.NewColumnsExpr(
"objectid", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "inspsampleid", "mosquitoinspid", "treatmentid", "containertype", "creationdate", "creator", "editdate", "editor", "version",
"objectid", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "inspsampleid", "mosquitoinspid", "treatmentid", "containertype", "creationdate", "creator", "editdate", "editor", "geometry", "geospatial", "version", "organization_id",
).WithParent("fieldseeker.containerrelate"),
tableAlias: alias,
Objectid: psql.Quote(alias, "objectid"),
@ -73,7 +99,10 @@ func buildFieldseekerContainerrelateColumns(alias string) fieldseekerContainerre
Creator: psql.Quote(alias, "creator"),
Editdate: psql.Quote(alias, "editdate"),
Editor: psql.Quote(alias, "editor"),
Geometry: psql.Quote(alias, "geometry"),
Geospatial: psql.Quote(alias, "geospatial"),
Version: psql.Quote(alias, "version"),
OrganizationID: psql.Quote(alias, "organization_id"),
}
}
@ -94,7 +123,10 @@ type fieldseekerContainerrelateColumns struct {
Creator psql.Expression
Editdate psql.Expression
Editor psql.Expression
Geometry psql.Expression
Geospatial psql.Expression
Version psql.Expression
OrganizationID psql.Expression
}
func (c fieldseekerContainerrelateColumns) Alias() string {
@ -109,25 +141,28 @@ func (fieldseekerContainerrelateColumns) AliasedAs(alias string) fieldseekerCont
// All values are optional, and do not have to be set
// Generated columns are not included
type FieldseekerContainerrelateSetter struct {
Objectid omit.Val[int64] `db:"objectid,pk" `
Globalid omitnull.Val[uuid.UUID] `db:"globalid" `
CreatedUser omitnull.Val[string] `db:"created_user" `
CreatedDate omitnull.Val[time.Time] `db:"created_date" `
LastEditedUser omitnull.Val[string] `db:"last_edited_user" `
LastEditedDate omitnull.Val[time.Time] `db:"last_edited_date" `
Inspsampleid omitnull.Val[uuid.UUID] `db:"inspsampleid" `
Mosquitoinspid omitnull.Val[uuid.UUID] `db:"mosquitoinspid" `
Treatmentid omitnull.Val[uuid.UUID] `db:"treatmentid" `
Containertype omitnull.Val[enums.FieldseekerContainerrelateMosquitocontainertypeEnum] `db:"containertype" `
Creationdate omitnull.Val[time.Time] `db:"creationdate" `
Creator omitnull.Val[string] `db:"creator" `
Editdate omitnull.Val[time.Time] `db:"editdate" `
Editor omitnull.Val[string] `db:"editor" `
Version omit.Val[int32] `db:"version,pk" `
Objectid omit.Val[int64] `db:"objectid,pk" `
Globalid omitnull.Val[uuid.UUID] `db:"globalid" `
CreatedUser omitnull.Val[string] `db:"created_user" `
CreatedDate omitnull.Val[time.Time] `db:"created_date" `
LastEditedUser omitnull.Val[string] `db:"last_edited_user" `
LastEditedDate omitnull.Val[time.Time] `db:"last_edited_date" `
Inspsampleid omitnull.Val[uuid.UUID] `db:"inspsampleid" `
Mosquitoinspid omitnull.Val[uuid.UUID] `db:"mosquitoinspid" `
Treatmentid omitnull.Val[uuid.UUID] `db:"treatmentid" `
Containertype omitnull.Val[string] `db:"containertype" `
Creationdate omitnull.Val[time.Time] `db:"creationdate" `
Creator omitnull.Val[string] `db:"creator" `
Editdate omitnull.Val[time.Time] `db:"editdate" `
Editor omitnull.Val[string] `db:"editor" `
Geometry omit.Val[types.JSON[json.RawMessage]] `db:"geometry" `
Geospatial omitnull.Val[string] `db:"geospatial" `
Version omit.Val[int32] `db:"version,pk" `
OrganizationID omit.Val[int32] `db:"organization_id" `
}
func (s FieldseekerContainerrelateSetter) SetColumns() []string {
vals := make([]string, 0, 15)
vals := make([]string, 0, 18)
if s.Objectid.IsValue() {
vals = append(vals, "objectid")
}
@ -170,9 +205,18 @@ func (s FieldseekerContainerrelateSetter) SetColumns() []string {
if !s.Editor.IsUnset() {
vals = append(vals, "editor")
}
if s.Geometry.IsValue() {
vals = append(vals, "geometry")
}
if !s.Geospatial.IsUnset() {
vals = append(vals, "geospatial")
}
if s.Version.IsValue() {
vals = append(vals, "version")
}
if s.OrganizationID.IsValue() {
vals = append(vals, "organization_id")
}
return vals
}
@ -219,9 +263,18 @@ func (s FieldseekerContainerrelateSetter) Overwrite(t *FieldseekerContainerrelat
if !s.Editor.IsUnset() {
t.Editor = s.Editor.MustGetNull()
}
if s.Geometry.IsValue() {
t.Geometry = s.Geometry.MustGet()
}
if !s.Geospatial.IsUnset() {
t.Geospatial = s.Geospatial.MustGetNull()
}
if s.Version.IsValue() {
t.Version = s.Version.MustGet()
}
if s.OrganizationID.IsValue() {
t.OrganizationID = s.OrganizationID.MustGet()
}
}
func (s *FieldseekerContainerrelateSetter) Apply(q *dialect.InsertQuery) {
@ -230,7 +283,7 @@ func (s *FieldseekerContainerrelateSetter) Apply(q *dialect.InsertQuery) {
})
q.AppendValues(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) {
vals := make([]bob.Expression, 15)
vals := make([]bob.Expression, 18)
if s.Objectid.IsValue() {
vals[0] = psql.Arg(s.Objectid.MustGet())
} else {
@ -315,12 +368,30 @@ func (s *FieldseekerContainerrelateSetter) Apply(q *dialect.InsertQuery) {
vals[13] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[14] = psql.Arg(s.Version.MustGet())
if s.Geometry.IsValue() {
vals[14] = psql.Arg(s.Geometry.MustGet())
} else {
vals[14] = psql.Raw("DEFAULT")
}
if !s.Geospatial.IsUnset() {
vals[15] = psql.Arg(s.Geospatial.MustGetNull())
} else {
vals[15] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[16] = psql.Arg(s.Version.MustGet())
} else {
vals[16] = psql.Raw("DEFAULT")
}
if s.OrganizationID.IsValue() {
vals[17] = psql.Arg(s.OrganizationID.MustGet())
} else {
vals[17] = psql.Raw("DEFAULT")
}
return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "")
}))
}
@ -330,7 +401,7 @@ func (s FieldseekerContainerrelateSetter) UpdateMod() bob.Mod[*dialect.UpdateQue
}
func (s FieldseekerContainerrelateSetter) Expressions(prefix ...string) []bob.Expression {
exprs := make([]bob.Expression, 0, 15)
exprs := make([]bob.Expression, 0, 18)
if s.Objectid.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
@ -430,6 +501,20 @@ func (s FieldseekerContainerrelateSetter) Expressions(prefix ...string) []bob.Ex
}})
}
if s.Geometry.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "geometry")...),
psql.Arg(s.Geometry),
}})
}
if !s.Geospatial.IsUnset() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "geospatial")...),
psql.Arg(s.Geospatial),
}})
}
if s.Version.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "version")...),
@ -437,6 +522,13 @@ func (s FieldseekerContainerrelateSetter) Expressions(prefix ...string) []bob.Ex
}})
}
if s.OrganizationID.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
psql.Quote(append(prefix, "organization_id")...),
psql.Arg(s.OrganizationID),
}})
}
return exprs
}
@ -504,6 +596,7 @@ func (o *FieldseekerContainerrelate) Update(ctx context.Context, exec bob.Execut
return err
}
o.R = v.R
*o = *v
return nil
@ -524,7 +617,7 @@ func (o *FieldseekerContainerrelate) Reload(ctx context.Context, exec bob.Execut
if err != nil {
return err
}
o2.R = o.R
*o = *o2
return nil
@ -574,7 +667,7 @@ func (o FieldseekerContainerrelateSlice) copyMatchingRows(from ...*FieldseekerCo
if new.Version != old.Version {
continue
}
new.R = old.R
o[i] = new
break
}
@ -672,6 +765,78 @@ func (o FieldseekerContainerrelateSlice) ReloadAll(ctx context.Context, exec bob
return nil
}
// Organization starts a query for related objects on organization
func (o *FieldseekerContainerrelate) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
return Organizations.Query(append(mods,
sm.Where(Organizations.Columns.ID.EQ(psql.Arg(o.OrganizationID))),
)...)
}
func (os FieldseekerContainerrelateSlice) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
pkOrganizationID := make(pgtypes.Array[int32], 0, len(os))
for _, o := range os {
if o == nil {
continue
}
pkOrganizationID = append(pkOrganizationID, o.OrganizationID)
}
PKArgExpr := psql.Select(sm.Columns(
psql.F("unnest", psql.Cast(psql.Arg(pkOrganizationID), "integer[]")),
))
return Organizations.Query(append(mods,
sm.Where(psql.Group(Organizations.Columns.ID).OP("IN", PKArgExpr)),
)...)
}
func attachFieldseekerContainerrelateOrganization0(ctx context.Context, exec bob.Executor, count int, fieldseekerContainerrelate0 *FieldseekerContainerrelate, organization1 *Organization) (*FieldseekerContainerrelate, error) {
setter := &FieldseekerContainerrelateSetter{
OrganizationID: omit.From(organization1.ID),
}
err := fieldseekerContainerrelate0.Update(ctx, exec, setter)
if err != nil {
return nil, fmt.Errorf("attachFieldseekerContainerrelateOrganization0: %w", err)
}
return fieldseekerContainerrelate0, nil
}
func (fieldseekerContainerrelate0 *FieldseekerContainerrelate) InsertOrganization(ctx context.Context, exec bob.Executor, related *OrganizationSetter) error {
var err error
organization1, err := Organizations.Insert(related).One(ctx, exec)
if err != nil {
return fmt.Errorf("inserting related objects: %w", err)
}
_, err = attachFieldseekerContainerrelateOrganization0(ctx, exec, 1, fieldseekerContainerrelate0, organization1)
if err != nil {
return err
}
fieldseekerContainerrelate0.R.Organization = organization1
organization1.R.Containerrelates = append(organization1.R.Containerrelates, fieldseekerContainerrelate0)
return nil
}
func (fieldseekerContainerrelate0 *FieldseekerContainerrelate) AttachOrganization(ctx context.Context, exec bob.Executor, organization1 *Organization) error {
var err error
_, err = attachFieldseekerContainerrelateOrganization0(ctx, exec, 1, fieldseekerContainerrelate0, organization1)
if err != nil {
return err
}
fieldseekerContainerrelate0.R.Organization = organization1
organization1.R.Containerrelates = append(organization1.R.Containerrelates, fieldseekerContainerrelate0)
return nil
}
type fieldseekerContainerrelateWhere[Q psql.Filterable] struct {
Objectid psql.WhereMod[Q, int64]
Globalid psql.WhereNullMod[Q, uuid.UUID]
@ -682,12 +847,15 @@ type fieldseekerContainerrelateWhere[Q psql.Filterable] struct {
Inspsampleid psql.WhereNullMod[Q, uuid.UUID]
Mosquitoinspid psql.WhereNullMod[Q, uuid.UUID]
Treatmentid psql.WhereNullMod[Q, uuid.UUID]
Containertype psql.WhereNullMod[Q, enums.FieldseekerContainerrelateMosquitocontainertypeEnum]
Containertype psql.WhereNullMod[Q, string]
Creationdate psql.WhereNullMod[Q, time.Time]
Creator psql.WhereNullMod[Q, string]
Editdate psql.WhereNullMod[Q, time.Time]
Editor psql.WhereNullMod[Q, string]
Geometry psql.WhereMod[Q, types.JSON[json.RawMessage]]
Geospatial psql.WhereNullMod[Q, string]
Version psql.WhereMod[Q, int32]
OrganizationID psql.WhereMod[Q, int32]
}
func (fieldseekerContainerrelateWhere[Q]) AliasedAs(alias string) fieldseekerContainerrelateWhere[Q] {
@ -705,11 +873,159 @@ func buildFieldseekerContainerrelateWhere[Q psql.Filterable](cols fieldseekerCon
Inspsampleid: psql.WhereNull[Q, uuid.UUID](cols.Inspsampleid),
Mosquitoinspid: psql.WhereNull[Q, uuid.UUID](cols.Mosquitoinspid),
Treatmentid: psql.WhereNull[Q, uuid.UUID](cols.Treatmentid),
Containertype: psql.WhereNull[Q, enums.FieldseekerContainerrelateMosquitocontainertypeEnum](cols.Containertype),
Containertype: psql.WhereNull[Q, string](cols.Containertype),
Creationdate: psql.WhereNull[Q, time.Time](cols.Creationdate),
Creator: psql.WhereNull[Q, string](cols.Creator),
Editdate: psql.WhereNull[Q, time.Time](cols.Editdate),
Editor: psql.WhereNull[Q, string](cols.Editor),
Geometry: psql.Where[Q, types.JSON[json.RawMessage]](cols.Geometry),
Geospatial: psql.WhereNull[Q, string](cols.Geospatial),
Version: psql.Where[Q, int32](cols.Version),
OrganizationID: psql.Where[Q, int32](cols.OrganizationID),
}
}
func (o *FieldseekerContainerrelate) Preload(name string, retrieved any) error {
if o == nil {
return nil
}
switch name {
case "Organization":
rel, ok := retrieved.(*Organization)
if !ok {
return fmt.Errorf("fieldseekerContainerrelate cannot load %T as %q", retrieved, name)
}
o.R.Organization = rel
if rel != nil {
rel.R.Containerrelates = FieldseekerContainerrelateSlice{o}
}
return nil
default:
return fmt.Errorf("fieldseekerContainerrelate has no relationship %q", name)
}
}
type fieldseekerContainerrelatePreloader struct {
Organization func(...psql.PreloadOption) psql.Preloader
}
func buildFieldseekerContainerrelatePreloader() fieldseekerContainerrelatePreloader {
return fieldseekerContainerrelatePreloader{
Organization: func(opts ...psql.PreloadOption) psql.Preloader {
return psql.Preload[*Organization, OrganizationSlice](psql.PreloadRel{
Name: "Organization",
Sides: []psql.PreloadSide{
{
From: FieldseekerContainerrelates,
To: Organizations,
FromColumns: []string{"organization_id"},
ToColumns: []string{"id"},
},
},
}, Organizations.Columns.Names(), opts...)
},
}
}
type fieldseekerContainerrelateThenLoader[Q orm.Loadable] struct {
Organization func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q]
}
func buildFieldseekerContainerrelateThenLoader[Q orm.Loadable]() fieldseekerContainerrelateThenLoader[Q] {
type OrganizationLoadInterface interface {
LoadOrganization(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error
}
return fieldseekerContainerrelateThenLoader[Q]{
Organization: thenLoadBuilder[Q](
"Organization",
func(ctx context.Context, exec bob.Executor, retrieved OrganizationLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error {
return retrieved.LoadOrganization(ctx, exec, mods...)
},
),
}
}
// LoadOrganization loads the fieldseekerContainerrelate's Organization into the .R struct
func (o *FieldseekerContainerrelate) LoadOrganization(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error {
if o == nil {
return nil
}
// Reset the relationship
o.R.Organization = nil
related, err := o.Organization(mods...).One(ctx, exec)
if err != nil {
return err
}
related.R.Containerrelates = FieldseekerContainerrelateSlice{o}
o.R.Organization = related
return nil
}
// LoadOrganization loads the fieldseekerContainerrelate's Organization into the .R struct
func (os FieldseekerContainerrelateSlice) LoadOrganization(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error {
if len(os) == 0 {
return nil
}
organizations, err := os.Organization(mods...).All(ctx, exec)
if err != nil {
return err
}
for _, o := range os {
if o == nil {
continue
}
for _, rel := range organizations {
if !(o.OrganizationID == rel.ID) {
continue
}
rel.R.Containerrelates = append(rel.R.Containerrelates, o)
o.R.Organization = rel
break
}
}
return nil
}
type fieldseekerContainerrelateJoins[Q dialect.Joinable] struct {
typ string
Organization modAs[Q, organizationColumns]
}
func (j fieldseekerContainerrelateJoins[Q]) aliasedAs(alias string) fieldseekerContainerrelateJoins[Q] {
return buildFieldseekerContainerrelateJoins[Q](buildFieldseekerContainerrelateColumns(alias), j.typ)
}
func buildFieldseekerContainerrelateJoins[Q dialect.Joinable](cols fieldseekerContainerrelateColumns, typ string) fieldseekerContainerrelateJoins[Q] {
return fieldseekerContainerrelateJoins[Q]{
typ: typ,
Organization: modAs[Q, organizationColumns]{
c: Organizations.Columns,
f: func(to organizationColumns) bob.Mod[Q] {
mods := make(mods.QueryMods[Q], 0, 1)
{
mods = append(mods, dialect.Join[Q](typ, Organizations.Name().As(to.Alias())).On(
to.ID.EQ(cols.OrganizationID),
))
}
return mods
},
},
}
}