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

Fix creation of signal for mailer

Browse source
This commit is contained in:
Eli Ribble 2026-04-16 10:47:13 +00:00
parent f444bf39fb
commit 6b90edf053
No known key found for this signature in database
2 changed files with 66 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

28
platform/lead.go
View file

@ -6,16 +6,13 @@ import (
"time" "time"
"github.com/Gleipnir-Technology/bob" "github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/bob/dialect/psql"
"github.com/Gleipnir-Technology/bob/dialect/psql/um"
"github.com/Gleipnir-Technology/nidus-sync/db" "github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/enums" "github.com/Gleipnir-Technology/nidus-sync/db/enums"
"github.com/Gleipnir-Technology/nidus-sync/db/models" "github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/platform/geom"
"github.com/Gleipnir-Technology/nidus-sync/platform/types" "github.com/Gleipnir-Technology/nidus-sync/platform/types"
"github.com/aarondl/opt/omit" "github.com/aarondl/opt/omit"
"github.com/aarondl/opt/omitnull" "github.com/aarondl/opt/omitnull"
"github.com/rs/zerolog/log" //"github.com/rs/zerolog/log"
) )
// Create a lead from the given signal and site // Create a lead from the given signal and site
@ -46,28 +43,5 @@ func leadCreate(ctx context.Context, txn bob.Executor, user User, signal_id int3
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to create lead: %w", err) return nil, fmt.Errorf("failed to create lead: %w", err)
} }
_, err = psql.Update(
um.Table("signal"),
um.SetCol("addressed").ToArg(time.Now()),
um.SetCol("addressor").ToArg(user.ID),
um.Where(psql.Quote("id").EQ(psql.Arg(signal_id))),
).Exec(ctx, txn)
if err != nil {
return nil, fmt.Errorf("failed to update signal %d: %w", signal_id, err)
}
if pool_location != nil {
log.Info().Float64("lat", pool_location.Latitude).Float64("lng", pool_location.Longitude).Msg("got pool location")
geom_query := geom.PostgisPointQuery(*pool_location)
_, err = psql.Update(
um.Table("pool"),
um.SetCol("geometry").To(geom_query),
um.From("signal_pool"),
um.Where(psql.Quote("signal_pool", "pool_id").EQ(psql.Quote("pool", "id"))),
um.Where(psql.Quote("signal_pool", "signal_id").EQ(psql.Arg(signal_id))),
).Exec(ctx, txn)
if err != nil {
return nil, fmt.Errorf("failed to update pool through signal %d: %w", signal_id, err)
}
}
return &lead.ID, nil return &lead.ID, nil
} }

88
platform/signal.go
View file

@ -9,6 +9,7 @@ import (
"github.com/Gleipnir-Technology/bob" "github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/bob/dialect/psql" "github.com/Gleipnir-Technology/bob/dialect/psql"
"github.com/Gleipnir-Technology/bob/dialect/psql/im"
"github.com/Gleipnir-Technology/bob/dialect/psql/sm" "github.com/Gleipnir-Technology/bob/dialect/psql/sm"
"github.com/Gleipnir-Technology/bob/dialect/psql/um" "github.com/Gleipnir-Technology/bob/dialect/psql/um"
"github.com/Gleipnir-Technology/nidus-sync/db" "github.com/Gleipnir-Technology/nidus-sync/db"
@ -39,34 +40,75 @@ type Signal struct {
Type string `db:"type" json:"type"` Type string `db:"type" json:"type"`
} }
type _rowWithID struct {
ID int32 `db:"id"`
}
func SignalCreateFromPool(ctx context.Context, txn bob.Executor, user User, site_id int32, feature_id int32, location types.Location) (*int32, error) { func SignalCreateFromPool(ctx context.Context, txn bob.Executor, user User, site_id int32, feature_id int32, location types.Location) (*int32, error) {
setter := models.SignalSetter{ /*
Addressed: omitnull.FromPtr[time.Time](nil), setter := models.SignalSetter{
Addressor: omitnull.FromPtr[int32](nil), Addressed: omitnull.FromPtr[time.Time](nil),
Created: omit.From(time.Now()), Addressor: omitnull.FromPtr[int32](nil),
Creator: omit.From(int32(user.ID)), Created: omit.From(time.Now()),
//ID Creator: omit.From(int32(user.ID)),
OrganizationID: omit.From(user.Organization.ID), //ID
Species: omitnull.FromPtr[enums.Mosquitospecies](nil), OrganizationID: omit.From(user.Organization.ID),
Type: omit.From(enums.SignaltypeFlyoverPool), Species: omitnull.FromPtr[enums.Mosquitospecies](nil),
SiteID: omitnull.From(site_id), Type: omit.From(enums.SignaltypeFlyoverPool),
//Location: SiteID: omitnull.From(site_id),
//LocationType null.Val[string] `db:"location_type,generated" ` Location: omit.From(""),
FeaturePoolFeatureID: omitnull.From(feature_id), //Location:
ReportID: omitnull.FromPtr[int32](nil), //LocationType null.Val[string] `db:"location_type,generated" `
} FeaturePoolFeatureID: omitnull.From(feature_id),
signal, err := models.Signals.Insert(&setter).One(ctx, db.PGInstance.BobDB) ReportID: omitnull.FromPtr[int32](nil),
}
signal, err := models.Signals.Insert(&setter).One(ctx, db.PGInstance.BobDB)
*/
query := psql.Insert(
im.Into("signal",
"addressed",
"addressor",
"created",
"creator",
"feature_pool_feature_id",
"id",
"location",
"organization_id",
"report_id",
"site_id",
"species",
"type_",
),
im.Values(
psql.Raw("NULL"),
psql.Raw("NULL"),
psql.Arg(time.Now()),
psql.Arg(user.ID),
psql.Arg(feature_id),
psql.Raw("DEFAULT"),
psql.F("ST_Point", location.Longitude, location.Latitude, 4326),
psql.Arg(user.Organization.ID),
psql.Raw("NULL"),
psql.Arg(site_id),
psql.Raw("NULL"),
psql.Arg("flyover pool"),
),
im.Returning("id"),
)
row, err := bob.One(ctx, txn, query, scan.StructMapper[_rowWithID]())
if err != nil { if err != nil {
return nil, fmt.Errorf("insert signal: %w", err) return nil, fmt.Errorf("insert signal: %w", err)
} }
geom_query, _ := location.GeometryQuery() /*
_, err = psql.Update( geom_query, _ := location.GeometryQuery()
um.Table(models.Signals.Name()), _, err = psql.Update(
um.SetCol(models.Signals.Columns.Location.String()).To(geom_query), um.Table(models.Signals.Name()),
um.Where(models.Signals.Columns.ID.EQ(psql.Arg(signal.ID))), um.SetCol(models.Signals.Columns.Location.String()).To(geom_query),
).Exec(ctx, txn) um.Where(models.Signals.Columns.ID.EQ(psql.Arg(row.ID))),
).Exec(ctx, txn)
*/
return &signal.ID, nil return &row.ID, nil
} }
// Create a lead from the given signal and site // Create a lead from the given signal and site