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,25 +21,43 @@ 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"
)
// FieldseekerHabitatrelate is an object representing the database table.
type FieldseekerHabitatrelate struct {
Objectid int64 `db:"objectid,pk" `
ForeignID null.Val[uuid.UUID] `db:"foreign_id" `
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 FOREIGN_ID
ForeignID null.Val[uuid.UUID] `db:"foreign_id" `
// 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" `
// Habitat Type
Habitattype null.Val[enums.FieldseekerHabitatrelateHabitatrelateHabitattype2e81cf2f550e400783cf284] `db:"habitattype" `
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 HABITATTYPE
Habitattype null.Val[string] `db:"habitattype" `
// 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 fieldseekerHabitatrelateR `db:"-" `
}
// FieldseekerHabitatrelateSlice is an alias for a slice of pointers to FieldseekerHabitatrelate.
@ -51,10 +70,15 @@ var FieldseekerHabitatrelates = psql.NewTablex[*FieldseekerHabitatrelate, Fields
// FieldseekerHabitatrelatesQuery is a query on the habitatrelate table
type FieldseekerHabitatrelatesQuery = *psql.ViewQuery[*FieldseekerHabitatrelate, FieldseekerHabitatrelateSlice]
// fieldseekerHabitatrelateR is where relationships are stored.
type fieldseekerHabitatrelateR struct {
Organization *Organization // fieldseeker.habitatrelate.habitatrelate_organization_id_fkey
}
func buildFieldseekerHabitatrelateColumns(alias string) fieldseekerHabitatrelateColumns {
return fieldseekerHabitatrelateColumns{
ColumnsExpr: expr.NewColumnsExpr(
"objectid", "foreign_id", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "habitattype", "creationdate", "creator", "editdate", "editor", "version",
"objectid", "foreign_id", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "habitattype", "creationdate", "creator", "editdate", "editor", "geometry", "geospatial", "version", "organization_id",
).WithParent("fieldseeker.habitatrelate"),
tableAlias: alias,
Objectid: psql.Quote(alias, "objectid"),
@ -69,7 +93,10 @@ func buildFieldseekerHabitatrelateColumns(alias string) fieldseekerHabitatrelate
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"),
}
}
@ -88,7 +115,10 @@ type fieldseekerHabitatrelateColumns struct {
Creator psql.Expression
Editdate psql.Expression
Editor psql.Expression
Geometry psql.Expression
Geospatial psql.Expression
Version psql.Expression
OrganizationID psql.Expression
}
func (c fieldseekerHabitatrelateColumns) Alias() string {
@ -103,23 +133,26 @@ func (fieldseekerHabitatrelateColumns) AliasedAs(alias string) fieldseekerHabita
// All values are optional, and do not have to be set
// Generated columns are not included
type FieldseekerHabitatrelateSetter struct {
Objectid omit.Val[int64] `db:"objectid,pk" `
ForeignID omitnull.Val[uuid.UUID] `db:"foreign_id" `
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" `
Habitattype omitnull.Val[enums.FieldseekerHabitatrelateHabitatrelateHabitattype2e81cf2f550e400783cf284] `db:"habitattype" `
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" `
ForeignID omitnull.Val[uuid.UUID] `db:"foreign_id" `
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" `
Habitattype omitnull.Val[string] `db:"habitattype" `
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 FieldseekerHabitatrelateSetter) SetColumns() []string {
vals := make([]string, 0, 13)
vals := make([]string, 0, 16)
if s.Objectid.IsValue() {
vals = append(vals, "objectid")
}
@ -156,9 +189,18 @@ func (s FieldseekerHabitatrelateSetter) 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
}
@ -199,9 +241,18 @@ func (s FieldseekerHabitatrelateSetter) Overwrite(t *FieldseekerHabitatrelate) {
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 *FieldseekerHabitatrelateSetter) Apply(q *dialect.InsertQuery) {
@ -210,7 +261,7 @@ func (s *FieldseekerHabitatrelateSetter) 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, 13)
vals := make([]bob.Expression, 16)
if s.Objectid.IsValue() {
vals[0] = psql.Arg(s.Objectid.MustGet())
} else {
@ -283,12 +334,30 @@ func (s *FieldseekerHabitatrelateSetter) Apply(q *dialect.InsertQuery) {
vals[11] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[12] = psql.Arg(s.Version.MustGet())
if s.Geometry.IsValue() {
vals[12] = psql.Arg(s.Geometry.MustGet())
} else {
vals[12] = psql.Raw("DEFAULT")
}
if !s.Geospatial.IsUnset() {
vals[13] = psql.Arg(s.Geospatial.MustGetNull())
} else {
vals[13] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[14] = psql.Arg(s.Version.MustGet())
} else {
vals[14] = psql.Raw("DEFAULT")
}
if s.OrganizationID.IsValue() {
vals[15] = psql.Arg(s.OrganizationID.MustGet())
} else {
vals[15] = psql.Raw("DEFAULT")
}
return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "")
}))
}
@ -298,7 +367,7 @@ func (s FieldseekerHabitatrelateSetter) UpdateMod() bob.Mod[*dialect.UpdateQuery
}
func (s FieldseekerHabitatrelateSetter) Expressions(prefix ...string) []bob.Expression {
exprs := make([]bob.Expression, 0, 13)
exprs := make([]bob.Expression, 0, 16)
if s.Objectid.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
@ -384,6 +453,20 @@ func (s FieldseekerHabitatrelateSetter) Expressions(prefix ...string) []bob.Expr
}})
}
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")...),
@ -391,6 +474,13 @@ func (s FieldseekerHabitatrelateSetter) Expressions(prefix ...string) []bob.Expr
}})
}
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
}
@ -458,6 +548,7 @@ func (o *FieldseekerHabitatrelate) Update(ctx context.Context, exec bob.Executor
return err
}
o.R = v.R
*o = *v
return nil
@ -478,7 +569,7 @@ func (o *FieldseekerHabitatrelate) Reload(ctx context.Context, exec bob.Executor
if err != nil {
return err
}
o2.R = o.R
*o = *o2
return nil
@ -528,7 +619,7 @@ func (o FieldseekerHabitatrelateSlice) copyMatchingRows(from ...*FieldseekerHabi
if new.Version != old.Version {
continue
}
new.R = old.R
o[i] = new
break
}
@ -626,6 +717,78 @@ func (o FieldseekerHabitatrelateSlice) ReloadAll(ctx context.Context, exec bob.E
return nil
}
// Organization starts a query for related objects on organization
func (o *FieldseekerHabitatrelate) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
return Organizations.Query(append(mods,
sm.Where(Organizations.Columns.ID.EQ(psql.Arg(o.OrganizationID))),
)...)
}
func (os FieldseekerHabitatrelateSlice) 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 attachFieldseekerHabitatrelateOrganization0(ctx context.Context, exec bob.Executor, count int, fieldseekerHabitatrelate0 *FieldseekerHabitatrelate, organization1 *Organization) (*FieldseekerHabitatrelate, error) {
setter := &FieldseekerHabitatrelateSetter{
OrganizationID: omit.From(organization1.ID),
}
err := fieldseekerHabitatrelate0.Update(ctx, exec, setter)
if err != nil {
return nil, fmt.Errorf("attachFieldseekerHabitatrelateOrganization0: %w", err)
}
return fieldseekerHabitatrelate0, nil
}
func (fieldseekerHabitatrelate0 *FieldseekerHabitatrelate) 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 = attachFieldseekerHabitatrelateOrganization0(ctx, exec, 1, fieldseekerHabitatrelate0, organization1)
if err != nil {
return err
}
fieldseekerHabitatrelate0.R.Organization = organization1
organization1.R.Habitatrelates = append(organization1.R.Habitatrelates, fieldseekerHabitatrelate0)
return nil
}
func (fieldseekerHabitatrelate0 *FieldseekerHabitatrelate) AttachOrganization(ctx context.Context, exec bob.Executor, organization1 *Organization) error {
var err error
_, err = attachFieldseekerHabitatrelateOrganization0(ctx, exec, 1, fieldseekerHabitatrelate0, organization1)
if err != nil {
return err
}
fieldseekerHabitatrelate0.R.Organization = organization1
organization1.R.Habitatrelates = append(organization1.R.Habitatrelates, fieldseekerHabitatrelate0)
return nil
}
type fieldseekerHabitatrelateWhere[Q psql.Filterable] struct {
Objectid psql.WhereMod[Q, int64]
ForeignID psql.WhereNullMod[Q, uuid.UUID]
@ -634,12 +797,15 @@ type fieldseekerHabitatrelateWhere[Q psql.Filterable] struct {
CreatedDate psql.WhereNullMod[Q, time.Time]
LastEditedUser psql.WhereNullMod[Q, string]
LastEditedDate psql.WhereNullMod[Q, time.Time]
Habitattype psql.WhereNullMod[Q, enums.FieldseekerHabitatrelateHabitatrelateHabitattype2e81cf2f550e400783cf284]
Habitattype 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 (fieldseekerHabitatrelateWhere[Q]) AliasedAs(alias string) fieldseekerHabitatrelateWhere[Q] {
@ -655,11 +821,159 @@ func buildFieldseekerHabitatrelateWhere[Q psql.Filterable](cols fieldseekerHabit
CreatedDate: psql.WhereNull[Q, time.Time](cols.CreatedDate),
LastEditedUser: psql.WhereNull[Q, string](cols.LastEditedUser),
LastEditedDate: psql.WhereNull[Q, time.Time](cols.LastEditedDate),
Habitattype: psql.WhereNull[Q, enums.FieldseekerHabitatrelateHabitatrelateHabitattype2e81cf2f550e400783cf284](cols.Habitattype),
Habitattype: psql.WhereNull[Q, string](cols.Habitattype),
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 *FieldseekerHabitatrelate) Preload(name string, retrieved any) error {
if o == nil {
return nil
}
switch name {
case "Organization":
rel, ok := retrieved.(*Organization)
if !ok {
return fmt.Errorf("fieldseekerHabitatrelate cannot load %T as %q", retrieved, name)
}
o.R.Organization = rel
if rel != nil {
rel.R.Habitatrelates = FieldseekerHabitatrelateSlice{o}
}
return nil
default:
return fmt.Errorf("fieldseekerHabitatrelate has no relationship %q", name)
}
}
type fieldseekerHabitatrelatePreloader struct {
Organization func(...psql.PreloadOption) psql.Preloader
}
func buildFieldseekerHabitatrelatePreloader() fieldseekerHabitatrelatePreloader {
return fieldseekerHabitatrelatePreloader{
Organization: func(opts ...psql.PreloadOption) psql.Preloader {
return psql.Preload[*Organization, OrganizationSlice](psql.PreloadRel{
Name: "Organization",
Sides: []psql.PreloadSide{
{
From: FieldseekerHabitatrelates,
To: Organizations,
FromColumns: []string{"organization_id"},
ToColumns: []string{"id"},
},
},
}, Organizations.Columns.Names(), opts...)
},
}
}
type fieldseekerHabitatrelateThenLoader[Q orm.Loadable] struct {
Organization func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q]
}
func buildFieldseekerHabitatrelateThenLoader[Q orm.Loadable]() fieldseekerHabitatrelateThenLoader[Q] {
type OrganizationLoadInterface interface {
LoadOrganization(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error
}
return fieldseekerHabitatrelateThenLoader[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 fieldseekerHabitatrelate's Organization into the .R struct
func (o *FieldseekerHabitatrelate) 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.Habitatrelates = FieldseekerHabitatrelateSlice{o}
o.R.Organization = related
return nil
}
// LoadOrganization loads the fieldseekerHabitatrelate's Organization into the .R struct
func (os FieldseekerHabitatrelateSlice) 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.Habitatrelates = append(rel.R.Habitatrelates, o)
o.R.Organization = rel
break
}
}
return nil
}
type fieldseekerHabitatrelateJoins[Q dialect.Joinable] struct {
typ string
Organization modAs[Q, organizationColumns]
}
func (j fieldseekerHabitatrelateJoins[Q]) aliasedAs(alias string) fieldseekerHabitatrelateJoins[Q] {
return buildFieldseekerHabitatrelateJoins[Q](buildFieldseekerHabitatrelateColumns(alias), j.typ)
}
func buildFieldseekerHabitatrelateJoins[Q dialect.Joinable](cols fieldseekerHabitatrelateColumns, typ string) fieldseekerHabitatrelateJoins[Q] {
return fieldseekerHabitatrelateJoins[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
},
},
}
}