Gleipnir/nidus-sync
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Remove old FieldSeeker tables, use v2 generated tables.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

389
db/models/fieldseeker.fieldscoutinglog.bob.go
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,24 +21,41 @@ 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"
)
// FieldseekerFieldscoutinglog is an object representing the database table.
type FieldseekerFieldscoutinglog struct {
Objectid int64 `db:"objectid,pk" `
// Status
Status null.Val[enums.FieldseekerFieldscoutinglogFieldscoutingsymbologyEnum] `db:"status" `
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" `
LastEditedDate null.Val[time.Time] `db:"last_edited_date" `
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 STATUS
Status null.Val[int16] `db:"status" `
// 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" `
// 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 fieldseekerFieldscoutinglogR `db:"-" `
}
// FieldseekerFieldscoutinglogSlice is an alias for a slice of pointers to FieldseekerFieldscoutinglog.
@ -50,10 +68,15 @@ var FieldseekerFieldscoutinglogs = psql.NewTablex[*FieldseekerFieldscoutinglog,
// FieldseekerFieldscoutinglogsQuery is a query on the fieldscoutinglog table
type FieldseekerFieldscoutinglogsQuery = *psql.ViewQuery[*FieldseekerFieldscoutinglog, FieldseekerFieldscoutinglogSlice]
// fieldseekerFieldscoutinglogR is where relationships are stored.
type fieldseekerFieldscoutinglogR struct {
Organization *Organization // fieldseeker.fieldscoutinglog.fieldscoutinglog_organization_id_fkey
}
func buildFieldseekerFieldscoutinglogColumns(alias string) fieldseekerFieldscoutinglogColumns {
return fieldseekerFieldscoutinglogColumns{
ColumnsExpr: expr.NewColumnsExpr(
"objectid", "status", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "creationdate", "creator", "editdate", "editor", "version",
"objectid", "status", "globalid", "created_user", "created_date", "last_edited_user", "last_edited_date", "creationdate", "creator", "editdate", "editor", "geometry", "geospatial", "version", "organization_id",
).WithParent("fieldseeker.fieldscoutinglog"),
tableAlias: alias,
Objectid: psql.Quote(alias, "objectid"),
@ -67,7 +90,10 @@ func buildFieldseekerFieldscoutinglogColumns(alias string) fieldseekerFieldscout
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"),
}
}
@ -85,7 +111,10 @@ type fieldseekerFieldscoutinglogColumns struct {
Creator psql.Expression
Editdate psql.Expression
Editor psql.Expression
Geometry psql.Expression
Geospatial psql.Expression
Version psql.Expression
OrganizationID psql.Expression
}
func (c fieldseekerFieldscoutinglogColumns) Alias() string {
@ -100,22 +129,25 @@ func (fieldseekerFieldscoutinglogColumns) AliasedAs(alias string) fieldseekerFie
// All values are optional, and do not have to be set
// Generated columns are not included
type FieldseekerFieldscoutinglogSetter struct {
Objectid omit.Val[int64] `db:"objectid,pk" `
Status omitnull.Val[enums.FieldseekerFieldscoutinglogFieldscoutingsymbologyEnum] `db:"status" `
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" `
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" `
Status omitnull.Val[int16] `db:"status" `
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" `
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 FieldseekerFieldscoutinglogSetter) SetColumns() []string {
vals := make([]string, 0, 12)
vals := make([]string, 0, 15)
if s.Objectid.IsValue() {
vals = append(vals, "objectid")
}
@ -149,9 +181,18 @@ func (s FieldseekerFieldscoutinglogSetter) 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
}
@ -189,9 +230,18 @@ func (s FieldseekerFieldscoutinglogSetter) Overwrite(t *FieldseekerFieldscouting
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 *FieldseekerFieldscoutinglogSetter) Apply(q *dialect.InsertQuery) {
@ -200,7 +250,7 @@ func (s *FieldseekerFieldscoutinglogSetter) 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, 12)
vals := make([]bob.Expression, 15)
if s.Objectid.IsValue() {
vals[0] = psql.Arg(s.Objectid.MustGet())
} else {
@ -267,12 +317,30 @@ func (s *FieldseekerFieldscoutinglogSetter) Apply(q *dialect.InsertQuery) {
vals[10] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[11] = psql.Arg(s.Version.MustGet())
if s.Geometry.IsValue() {
vals[11] = psql.Arg(s.Geometry.MustGet())
} else {
vals[11] = psql.Raw("DEFAULT")
}
if !s.Geospatial.IsUnset() {
vals[12] = psql.Arg(s.Geospatial.MustGetNull())
} else {
vals[12] = psql.Raw("DEFAULT")
}
if s.Version.IsValue() {
vals[13] = psql.Arg(s.Version.MustGet())
} else {
vals[13] = psql.Raw("DEFAULT")
}
if s.OrganizationID.IsValue() {
vals[14] = psql.Arg(s.OrganizationID.MustGet())
} else {
vals[14] = psql.Raw("DEFAULT")
}
return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "")
}))
}
@ -282,7 +350,7 @@ func (s FieldseekerFieldscoutinglogSetter) UpdateMod() bob.Mod[*dialect.UpdateQu
}
func (s FieldseekerFieldscoutinglogSetter) Expressions(prefix ...string) []bob.Expression {
exprs := make([]bob.Expression, 0, 12)
exprs := make([]bob.Expression, 0, 15)
if s.Objectid.IsValue() {
exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{
@ -361,6 +429,20 @@ func (s FieldseekerFieldscoutinglogSetter) Expressions(prefix ...string) []bob.E
}})
}
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")...),
@ -368,6 +450,13 @@ func (s FieldseekerFieldscoutinglogSetter) Expressions(prefix ...string) []bob.E
}})
}
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
}
@ -435,6 +524,7 @@ func (o *FieldseekerFieldscoutinglog) Update(ctx context.Context, exec bob.Execu
return err
}
o.R = v.R
*o = *v
return nil
@ -455,7 +545,7 @@ func (o *FieldseekerFieldscoutinglog) Reload(ctx context.Context, exec bob.Execu
if err != nil {
return err
}
o2.R = o.R
*o = *o2
return nil
@ -505,7 +595,7 @@ func (o FieldseekerFieldscoutinglogSlice) copyMatchingRows(from ...*FieldseekerF
if new.Version != old.Version {
continue
}
new.R = old.R
o[i] = new
break
}
@ -603,9 +693,81 @@ func (o FieldseekerFieldscoutinglogSlice) ReloadAll(ctx context.Context, exec bo
return nil
}
// Organization starts a query for related objects on organization
func (o *FieldseekerFieldscoutinglog) Organization(mods ...bob.Mod[*dialect.SelectQuery]) OrganizationsQuery {
return Organizations.Query(append(mods,
sm.Where(Organizations.Columns.ID.EQ(psql.Arg(o.OrganizationID))),
)...)
}
func (os FieldseekerFieldscoutinglogSlice) 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 attachFieldseekerFieldscoutinglogOrganization0(ctx context.Context, exec bob.Executor, count int, fieldseekerFieldscoutinglog0 *FieldseekerFieldscoutinglog, organization1 *Organization) (*FieldseekerFieldscoutinglog, error) {
setter := &FieldseekerFieldscoutinglogSetter{
OrganizationID: omit.From(organization1.ID),
}
err := fieldseekerFieldscoutinglog0.Update(ctx, exec, setter)
if err != nil {
return nil, fmt.Errorf("attachFieldseekerFieldscoutinglogOrganization0: %w", err)
}
return fieldseekerFieldscoutinglog0, nil
}
func (fieldseekerFieldscoutinglog0 *FieldseekerFieldscoutinglog) 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 = attachFieldseekerFieldscoutinglogOrganization0(ctx, exec, 1, fieldseekerFieldscoutinglog0, organization1)
if err != nil {
return err
}
fieldseekerFieldscoutinglog0.R.Organization = organization1
organization1.R.Fieldscoutinglogs = append(organization1.R.Fieldscoutinglogs, fieldseekerFieldscoutinglog0)
return nil
}
func (fieldseekerFieldscoutinglog0 *FieldseekerFieldscoutinglog) AttachOrganization(ctx context.Context, exec bob.Executor, organization1 *Organization) error {
var err error
_, err = attachFieldseekerFieldscoutinglogOrganization0(ctx, exec, 1, fieldseekerFieldscoutinglog0, organization1)
if err != nil {
return err
}
fieldseekerFieldscoutinglog0.R.Organization = organization1
organization1.R.Fieldscoutinglogs = append(organization1.R.Fieldscoutinglogs, fieldseekerFieldscoutinglog0)
return nil
}
type fieldseekerFieldscoutinglogWhere[Q psql.Filterable] struct {
Objectid psql.WhereMod[Q, int64]
Status psql.WhereNullMod[Q, enums.FieldseekerFieldscoutinglogFieldscoutingsymbologyEnum]
Status psql.WhereNullMod[Q, int16]
Globalid psql.WhereNullMod[Q, uuid.UUID]
CreatedUser psql.WhereNullMod[Q, string]
CreatedDate psql.WhereNullMod[Q, time.Time]
@ -615,7 +777,10 @@ type fieldseekerFieldscoutinglogWhere[Q psql.Filterable] struct {
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 (fieldseekerFieldscoutinglogWhere[Q]) AliasedAs(alias string) fieldseekerFieldscoutinglogWhere[Q] {
@ -625,7 +790,7 @@ func (fieldseekerFieldscoutinglogWhere[Q]) AliasedAs(alias string) fieldseekerFi
func buildFieldseekerFieldscoutinglogWhere[Q psql.Filterable](cols fieldseekerFieldscoutinglogColumns) fieldseekerFieldscoutinglogWhere[Q] {
return fieldseekerFieldscoutinglogWhere[Q]{
Objectid: psql.Where[Q, int64](cols.Objectid),
Status: psql.WhereNull[Q, enums.FieldseekerFieldscoutinglogFieldscoutingsymbologyEnum](cols.Status),
Status: psql.WhereNull[Q, int16](cols.Status),
Globalid: psql.WhereNull[Q, uuid.UUID](cols.Globalid),
CreatedUser: psql.WhereNull[Q, string](cols.CreatedUser),
CreatedDate: psql.WhereNull[Q, time.Time](cols.CreatedDate),
@ -635,6 +800,154 @@ func buildFieldseekerFieldscoutinglogWhere[Q psql.Filterable](cols fieldseekerFi
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 *FieldseekerFieldscoutinglog) Preload(name string, retrieved any) error {
if o == nil {
return nil
}
switch name {
case "Organization":
rel, ok := retrieved.(*Organization)
if !ok {
return fmt.Errorf("fieldseekerFieldscoutinglog cannot load %T as %q", retrieved, name)
}
o.R.Organization = rel
if rel != nil {
rel.R.Fieldscoutinglogs = FieldseekerFieldscoutinglogSlice{o}
}
return nil
default:
return fmt.Errorf("fieldseekerFieldscoutinglog has no relationship %q", name)
}
}
type fieldseekerFieldscoutinglogPreloader struct {
Organization func(...psql.PreloadOption) psql.Preloader
}
func buildFieldseekerFieldscoutinglogPreloader() fieldseekerFieldscoutinglogPreloader {
return fieldseekerFieldscoutinglogPreloader{
Organization: func(opts ...psql.PreloadOption) psql.Preloader {
return psql.Preload[*Organization, OrganizationSlice](psql.PreloadRel{
Name: "Organization",
Sides: []psql.PreloadSide{
{
From: FieldseekerFieldscoutinglogs,
To: Organizations,
FromColumns: []string{"organization_id"},
ToColumns: []string{"id"},
},
},
}, Organizations.Columns.Names(), opts...)
},
}
}
type fieldseekerFieldscoutinglogThenLoader[Q orm.Loadable] struct {
Organization func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q]
}
func buildFieldseekerFieldscoutinglogThenLoader[Q orm.Loadable]() fieldseekerFieldscoutinglogThenLoader[Q] {
type OrganizationLoadInterface interface {
LoadOrganization(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error
}
return fieldseekerFieldscoutinglogThenLoader[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 fieldseekerFieldscoutinglog's Organization into the .R struct
func (o *FieldseekerFieldscoutinglog) 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.Fieldscoutinglogs = FieldseekerFieldscoutinglogSlice{o}
o.R.Organization = related
return nil
}
// LoadOrganization loads the fieldseekerFieldscoutinglog's Organization into the .R struct
func (os FieldseekerFieldscoutinglogSlice) 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.Fieldscoutinglogs = append(rel.R.Fieldscoutinglogs, o)
o.R.Organization = rel
break
}
}
return nil
}
type fieldseekerFieldscoutinglogJoins[Q dialect.Joinable] struct {
typ string
Organization modAs[Q, organizationColumns]
}
func (j fieldseekerFieldscoutinglogJoins[Q]) aliasedAs(alias string) fieldseekerFieldscoutinglogJoins[Q] {
return buildFieldseekerFieldscoutinglogJoins[Q](buildFieldseekerFieldscoutinglogColumns(alias), j.typ)
}
func buildFieldseekerFieldscoutinglogJoins[Q dialect.Joinable](cols fieldseekerFieldscoutinglogColumns, typ string) fieldseekerFieldscoutinglogJoins[Q] {
return fieldseekerFieldscoutinglogJoins[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
},
},
}
}