From a6f939676070c56b9b1507d2a347c2720fc08c5f Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Thu, 16 Apr 2026 19:49:18 +0000 Subject: [PATCH] Add first draft of mailer integration This adds a bunch of stuff, including setting the organization's Lob sender address ID, inserting mailer/compliance_report relationships, adding external id from Lob (or maybe some other provider) and attempting to load up the pool feature for a site. --- api/routes.go | 3 +- .../compliance_report_request_mailer.bob.go | 9 + db/dbinfo/comms.mailer.bob.go | 22 +- .../compliance_report_request_mailer.bob.go | 38 +- db/dbinfo/organization.bob.go | 12 +- .../00139_organization_lob_address.sql | 4 + .../00140_comms_mailer_external_id.sql | 4 + ...41_compliance_report_request_mailer_id.sql | 7 + db/models/comms.mailer.bob.go | 251 ++++++++----- db/models/compliance_report_request.bob.go | 182 +++++---- .../compliance_report_request_mailer.bob.go | 353 +++++++++++++++++- db/models/organization.bob.go | 33 +- platform/feature.go | 10 +- platform/file/base.go | 23 +- platform/file/enum.go | 1 + platform/file/image.go | 4 +- platform/file/userfile.go | 4 +- platform/mailer/mailer.go | 121 ++++++ platform/subprocess/audio.go | 6 +- platform/tile.go | 147 ++++---- resource/compliance.go | 79 +++- 21 files changed, 1050 insertions(+), 263 deletions(-) create mode 100644 db/migrations/00139_organization_lob_address.sql create mode 100644 db/migrations/00140_comms_mailer_external_id.sql create mode 100644 db/migrations/00141_compliance_report_request_mailer_id.sql diff --git a/api/routes.go b/api/routes.go index 3feab45c..fbc7ff59 100644 --- a/api/routes.go +++ b/api/routes.go @@ -25,6 +25,8 @@ func AddRoutes(r *mux.Router) { r.Handle("/communication", authenticatedHandlerJSON(communication.List)).Methods("GET") compliance_request := resource.ComplianceRequest(router) r.Handle("/compliance-request/mailer", authenticatedHandlerJSONPost(compliance_request.CreateMailer)).Methods("POST") + r.HandleFunc("/compliance-request/image/pool/{public_id}", compliance_request.ImagePoolGet).Methods("GET") + //r.HandleFunc("/compliance-request/image/pool/{public_id}", getComplianceRequestImagePool).Methods("GET") r.Handle("/configuration/integration/arcgis", authenticatedHandlerJSONPost(postConfigurationIntegrationArcgis)).Methods("POST") r.Handle("/events", auth.NewEnsureAuth(streamEvents)).Methods("GET") r.Handle("/image/{uuid}", auth.NewEnsureAuth(apiImagePost)).Methods("POST") @@ -101,7 +103,6 @@ func AddRoutes(r *mux.Router) { //r.HandleFunc("/district", apiGetDistrict).Methods("GET") r.HandleFunc("/district/{slug}/logo", apiGetDistrictLogo).Methods("GET").Name("district.logo.BySlug") - r.HandleFunc("/compliance-request/image/pool/{public_id}", getComplianceRequestImagePool).Methods("GET") r.HandleFunc("/twilio/call", twilioCallPost).Methods("POST") r.HandleFunc("/twilio/call/status", twilioCallStatusPost).Methods("POST") r.HandleFunc("/twilio/message", twilioMessagePost).Methods("POST") diff --git a/db/dberrors/compliance_report_request_mailer.bob.go b/db/dberrors/compliance_report_request_mailer.bob.go index da2d4242..b7798424 100644 --- a/db/dberrors/compliance_report_request_mailer.bob.go +++ b/db/dberrors/compliance_report_request_mailer.bob.go @@ -4,6 +4,13 @@ package dberrors var ComplianceReportRequestMailerErrors = &complianceReportRequestMailerErrors{ + ErrUniqueComplianceReportRequestMailerPkey: &UniqueConstraintError{ + schema: "", + table: "compliance_report_request_mailer", + columns: []string{"id"}, + s: "compliance_report_request_mailer_pkey", + }, + ErrUniqueComplianceReportRequestMaiComplianceReportRequestId_Key: &UniqueConstraintError{ schema: "", table: "compliance_report_request_mailer", @@ -13,5 +20,7 @@ var ComplianceReportRequestMailerErrors = &complianceReportRequestMailerErrors{ } type complianceReportRequestMailerErrors struct { + ErrUniqueComplianceReportRequestMailerPkey *UniqueConstraintError + ErrUniqueComplianceReportRequestMaiComplianceReportRequestId_Key *UniqueConstraintError } diff --git a/db/dbinfo/comms.mailer.bob.go b/db/dbinfo/comms.mailer.bob.go index 17a62f27..c60300e4 100644 --- a/db/dbinfo/comms.mailer.bob.go +++ b/db/dbinfo/comms.mailer.bob.go @@ -60,6 +60,15 @@ var CommsMailers = Table[ Generated: false, AutoIncr: false, }, + ExternalID: column{ + Name: "external_id", + DBType: "text", + Default: "", + Comment: "", + Nullable: false, + Generated: false, + AutoIncr: false, + }, }, Indexes: commsMailerIndexes{ MailerPkey: index{ @@ -101,16 +110,17 @@ var CommsMailers = Table[ } type commsMailerColumns struct { - AddressID column - Created column - ID column - Recipient column - UUID column + AddressID column + Created column + ID column + Recipient column + UUID column + ExternalID column } func (c commsMailerColumns) AsSlice() []column { return []column{ - c.AddressID, c.Created, c.ID, c.Recipient, c.UUID, + c.AddressID, c.Created, c.ID, c.Recipient, c.UUID, c.ExternalID, } } diff --git a/db/dbinfo/compliance_report_request_mailer.bob.go b/db/dbinfo/compliance_report_request_mailer.bob.go index 61147a6b..38680aae 100644 --- a/db/dbinfo/compliance_report_request_mailer.bob.go +++ b/db/dbinfo/compliance_report_request_mailer.bob.go @@ -33,8 +33,34 @@ var ComplianceReportRequestMailers = Table[ Generated: false, AutoIncr: false, }, + ID: column{ + Name: "id", + DBType: "integer", + Default: "nextval('compliance_report_request_mailer_id_seq'::regclass)", + Comment: "", + Nullable: false, + Generated: false, + AutoIncr: false, + }, }, Indexes: complianceReportRequestMailerIndexes{ + ComplianceReportRequestMailerPkey: index{ + Type: "btree", + Name: "compliance_report_request_mailer_pkey", + Columns: []indexColumn{ + { + Name: "id", + Desc: null.FromCond(false, true), + IsExpression: false, + }, + }, + Unique: true, + Comment: "", + NullsFirst: []bool{false}, + NullsDistinct: false, + Where: "", + Include: []string{}, + }, ComplianceReportRequestMaiComplianceReportRequestIDKey: index{ Type: "btree", Name: "compliance_report_request_mai_compliance_report_request_id__key", @@ -58,7 +84,11 @@ var ComplianceReportRequestMailers = Table[ Include: []string{}, }, }, - + PrimaryKey: &constraint{ + Name: "compliance_report_request_mailer_pkey", + Columns: []string{"id"}, + Comment: "", + }, ForeignKeys: complianceReportRequestMailerForeignKeys{ ComplianceReportRequestMailerComplianceReportRequestMaiComplianceReportRequestIDFkey: foreignKey{ constraint: constraint{ @@ -93,21 +123,23 @@ var ComplianceReportRequestMailers = Table[ type complianceReportRequestMailerColumns struct { ComplianceReportRequestID column MailerID column + ID column } func (c complianceReportRequestMailerColumns) AsSlice() []column { return []column{ - c.ComplianceReportRequestID, c.MailerID, + c.ComplianceReportRequestID, c.MailerID, c.ID, } } type complianceReportRequestMailerIndexes struct { + ComplianceReportRequestMailerPkey index ComplianceReportRequestMaiComplianceReportRequestIDKey index } func (i complianceReportRequestMailerIndexes) AsSlice() []index { return []index{ - i.ComplianceReportRequestMaiComplianceReportRequestIDKey, + i.ComplianceReportRequestMailerPkey, i.ComplianceReportRequestMaiComplianceReportRequestIDKey, } } diff --git a/db/dbinfo/organization.bob.go b/db/dbinfo/organization.bob.go index 1619bef3..30364edd 100644 --- a/db/dbinfo/organization.bob.go +++ b/db/dbinfo/organization.bob.go @@ -321,6 +321,15 @@ var Organizations = Table[ Generated: false, AutoIncr: false, }, + LobAddressID: column{ + Name: "lob_address_id", + DBType: "text", + Default: "NULL", + Comment: "", + Nullable: true, + Generated: false, + AutoIncr: false, + }, }, Indexes: organizationIndexes{ OrganizationPkey: index{ @@ -486,11 +495,12 @@ type organizationColumns struct { FieldseekerServiceFeatureItemID column ArcgisMapServiceID column IsCatchall column + LobAddressID column } func (c organizationColumns) AsSlice() []column { return []column{ - c.ID, c.Name, c.ImportDistrictGid, c.Website, c.LogoUUID, c.Slug, c.GeneralManagerName, c.MailingAddressCity, c.MailingAddressPostalCode, c.MailingAddressStreet, c.OfficeAddressCity, c.OfficeAddressPostalCode, c.OfficeAddressStreet, c.ServiceAreaGeometry, c.ServiceAreaSquareMeters, c.ServiceAreaCentroid, c.ServiceAreaExtent, c.OfficeFax, c.OfficePhone, c.ServiceAreaXmin, c.ServiceAreaYmin, c.ServiceAreaXmax, c.ServiceAreaYmax, c.ServiceAreaCentroidGeojson, c.ServiceAreaCentroidX, c.ServiceAreaCentroidY, c.MailingAddressCountry, c.MailingAddressState, c.OfficeAddressCountry, c.OfficeAddressState, c.ArcgisAccountID, c.FieldseekerServiceFeatureItemID, c.ArcgisMapServiceID, c.IsCatchall, + c.ID, c.Name, c.ImportDistrictGid, c.Website, c.LogoUUID, c.Slug, c.GeneralManagerName, c.MailingAddressCity, c.MailingAddressPostalCode, c.MailingAddressStreet, c.OfficeAddressCity, c.OfficeAddressPostalCode, c.OfficeAddressStreet, c.ServiceAreaGeometry, c.ServiceAreaSquareMeters, c.ServiceAreaCentroid, c.ServiceAreaExtent, c.OfficeFax, c.OfficePhone, c.ServiceAreaXmin, c.ServiceAreaYmin, c.ServiceAreaXmax, c.ServiceAreaYmax, c.ServiceAreaCentroidGeojson, c.ServiceAreaCentroidX, c.ServiceAreaCentroidY, c.MailingAddressCountry, c.MailingAddressState, c.OfficeAddressCountry, c.OfficeAddressState, c.ArcgisAccountID, c.FieldseekerServiceFeatureItemID, c.ArcgisMapServiceID, c.IsCatchall, c.LobAddressID, } } diff --git a/db/migrations/00139_organization_lob_address.sql b/db/migrations/00139_organization_lob_address.sql new file mode 100644 index 00000000..f2ede423 --- /dev/null +++ b/db/migrations/00139_organization_lob_address.sql @@ -0,0 +1,4 @@ +-- +goose Up +ALTER TABLE organization ADD COLUMN lob_address_id TEXT; +-- +goose Down +ALTER TABLE organization DROP COLUMN lob_address_id; diff --git a/db/migrations/00140_comms_mailer_external_id.sql b/db/migrations/00140_comms_mailer_external_id.sql new file mode 100644 index 00000000..3dc3fdc7 --- /dev/null +++ b/db/migrations/00140_comms_mailer_external_id.sql @@ -0,0 +1,4 @@ +-- +goose Up +ALTER TABLE comms.mailer ADD COLUMN external_id TEXT NOT NULL; +-- +goose Down +ALTER TABLE comms.mailer DROP COLUMN external_id; diff --git a/db/migrations/00141_compliance_report_request_mailer_id.sql b/db/migrations/00141_compliance_report_request_mailer_id.sql new file mode 100644 index 00000000..c11956ea --- /dev/null +++ b/db/migrations/00141_compliance_report_request_mailer_id.sql @@ -0,0 +1,7 @@ +-- +goose Up +ALTER TABLE compliance_report_request_mailer + ADD COLUMN id SERIAL PRIMARY KEY; +-- +goose Down +ALTER TABLE compliance_report_request_mailer + DROP COLUMN id; + diff --git a/db/models/comms.mailer.bob.go b/db/models/comms.mailer.bob.go index c6ee6262..a631c4e5 100644 --- a/db/models/comms.mailer.bob.go +++ b/db/models/comms.mailer.bob.go @@ -20,16 +20,16 @@ import ( "github.com/Gleipnir-Technology/bob/types/pgtypes" "github.com/aarondl/opt/omit" "github.com/google/uuid" - "github.com/stephenafamo/scan" ) // CommsMailer is an object representing the database table. type CommsMailer struct { - AddressID int32 `db:"address_id" ` - Created time.Time `db:"created" ` - ID int32 `db:"id,pk" ` - Recipient string `db:"recipient" ` - UUID uuid.UUID `db:"uuid" ` + AddressID int32 `db:"address_id" ` + Created time.Time `db:"created" ` + ID int32 `db:"id,pk" ` + Recipient string `db:"recipient" ` + UUID uuid.UUID `db:"uuid" ` + ExternalID string `db:"external_id" ` R commsMailerR `db:"-" ` } @@ -46,14 +46,14 @@ type CommsMailersQuery = *psql.ViewQuery[*CommsMailer, CommsMailerSlice] // commsMailerR is where relationships are stored. type commsMailerR struct { - Address *Address // comms.mailer.mailer_address_id_fkey - ComplianceReportRequests ComplianceReportRequestSlice // compliance_report_request_mailer.compliance_report_request_mai_compliance_report_request_id_fkeycompliance_report_request_mailer.compliance_report_request_mailer_mailer_id_fkey + Address *Address // comms.mailer.mailer_address_id_fkey + ComplianceReportRequestMailers ComplianceReportRequestMailerSlice // compliance_report_request_mailer.compliance_report_request_mailer_mailer_id_fkey } func buildCommsMailerColumns(alias string) commsMailerColumns { return commsMailerColumns{ ColumnsExpr: expr.NewColumnsExpr( - "address_id", "created", "id", "recipient", "uuid", + "address_id", "created", "id", "recipient", "uuid", "external_id", ).WithParent("comms.mailer"), tableAlias: alias, AddressID: psql.Quote(alias, "address_id"), @@ -61,6 +61,7 @@ func buildCommsMailerColumns(alias string) commsMailerColumns { ID: psql.Quote(alias, "id"), Recipient: psql.Quote(alias, "recipient"), UUID: psql.Quote(alias, "uuid"), + ExternalID: psql.Quote(alias, "external_id"), } } @@ -72,6 +73,7 @@ type commsMailerColumns struct { ID psql.Expression Recipient psql.Expression UUID psql.Expression + ExternalID psql.Expression } func (c commsMailerColumns) Alias() string { @@ -86,15 +88,16 @@ func (commsMailerColumns) AliasedAs(alias string) commsMailerColumns { // All values are optional, and do not have to be set // Generated columns are not included type CommsMailerSetter struct { - AddressID omit.Val[int32] `db:"address_id" ` - Created omit.Val[time.Time] `db:"created" ` - ID omit.Val[int32] `db:"id,pk" ` - Recipient omit.Val[string] `db:"recipient" ` - UUID omit.Val[uuid.UUID] `db:"uuid" ` + AddressID omit.Val[int32] `db:"address_id" ` + Created omit.Val[time.Time] `db:"created" ` + ID omit.Val[int32] `db:"id,pk" ` + Recipient omit.Val[string] `db:"recipient" ` + UUID omit.Val[uuid.UUID] `db:"uuid" ` + ExternalID omit.Val[string] `db:"external_id" ` } func (s CommsMailerSetter) SetColumns() []string { - vals := make([]string, 0, 5) + vals := make([]string, 0, 6) if s.AddressID.IsValue() { vals = append(vals, "address_id") } @@ -110,6 +113,9 @@ func (s CommsMailerSetter) SetColumns() []string { if s.UUID.IsValue() { vals = append(vals, "uuid") } + if s.ExternalID.IsValue() { + vals = append(vals, "external_id") + } return vals } @@ -129,6 +135,9 @@ func (s CommsMailerSetter) Overwrite(t *CommsMailer) { if s.UUID.IsValue() { t.UUID = s.UUID.MustGet() } + if s.ExternalID.IsValue() { + t.ExternalID = s.ExternalID.MustGet() + } } func (s *CommsMailerSetter) Apply(q *dialect.InsertQuery) { @@ -137,7 +146,7 @@ func (s *CommsMailerSetter) 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, 5) + vals := make([]bob.Expression, 6) if s.AddressID.IsValue() { vals[0] = psql.Arg(s.AddressID.MustGet()) } else { @@ -168,6 +177,12 @@ func (s *CommsMailerSetter) Apply(q *dialect.InsertQuery) { vals[4] = psql.Raw("DEFAULT") } + if s.ExternalID.IsValue() { + vals[5] = psql.Arg(s.ExternalID.MustGet()) + } else { + vals[5] = psql.Raw("DEFAULT") + } + return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "") })) } @@ -177,7 +192,7 @@ func (s CommsMailerSetter) UpdateMod() bob.Mod[*dialect.UpdateQuery] { } func (s CommsMailerSetter) Expressions(prefix ...string) []bob.Expression { - exprs := make([]bob.Expression, 0, 5) + exprs := make([]bob.Expression, 0, 6) if s.AddressID.IsValue() { exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ @@ -214,6 +229,13 @@ func (s CommsMailerSetter) Expressions(prefix ...string) []bob.Expression { }}) } + if s.ExternalID.IsValue() { + exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ + psql.Quote(append(prefix, "external_id")...), + psql.Arg(s.ExternalID), + }}) + } + return exprs } @@ -464,16 +486,14 @@ func (os CommsMailerSlice) Address(mods ...bob.Mod[*dialect.SelectQuery]) Addres )...) } -// ComplianceReportRequests starts a query for related objects on compliance_report_request -func (o *CommsMailer) ComplianceReportRequests(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestsQuery { - return ComplianceReportRequests.Query(append(mods, - sm.InnerJoin(ComplianceReportRequestMailers.NameAs()).On( - ComplianceReportRequests.Columns.ID.EQ(ComplianceReportRequestMailers.Columns.ComplianceReportRequestID)), +// ComplianceReportRequestMailers starts a query for related objects on compliance_report_request_mailer +func (o *CommsMailer) ComplianceReportRequestMailers(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestMailersQuery { + return ComplianceReportRequestMailers.Query(append(mods, sm.Where(ComplianceReportRequestMailers.Columns.MailerID.EQ(psql.Arg(o.ID))), )...) } -func (os CommsMailerSlice) ComplianceReportRequests(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestsQuery { +func (os CommsMailerSlice) ComplianceReportRequestMailers(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestMailersQuery { pkID := make(pgtypes.Array[int32], 0, len(os)) for _, o := range os { if o == nil { @@ -485,10 +505,7 @@ func (os CommsMailerSlice) ComplianceReportRequests(mods ...bob.Mod[*dialect.Sel psql.F("unnest", psql.Cast(psql.Arg(pkID), "integer[]")), )) - return ComplianceReportRequests.Query(append(mods, - sm.InnerJoin(ComplianceReportRequestMailers.NameAs()).On( - ComplianceReportRequests.Columns.ID.EQ(ComplianceReportRequestMailers.Columns.ComplianceReportRequestID), - ), + return ComplianceReportRequestMailers.Query(append(mods, sm.Where(psql.Group(ComplianceReportRequestMailers.Columns.MailerID).OP("IN", PKArgExpr)), )...) } @@ -541,12 +558,81 @@ func (commsMailer0 *CommsMailer) AttachAddress(ctx context.Context, exec bob.Exe return nil } +func insertCommsMailerComplianceReportRequestMailers0(ctx context.Context, exec bob.Executor, complianceReportRequestMailers1 []*ComplianceReportRequestMailerSetter, commsMailer0 *CommsMailer) (ComplianceReportRequestMailerSlice, error) { + for i := range complianceReportRequestMailers1 { + complianceReportRequestMailers1[i].MailerID = omit.From(commsMailer0.ID) + } + + ret, err := ComplianceReportRequestMailers.Insert(bob.ToMods(complianceReportRequestMailers1...)).All(ctx, exec) + if err != nil { + return ret, fmt.Errorf("insertCommsMailerComplianceReportRequestMailers0: %w", err) + } + + return ret, nil +} + +func attachCommsMailerComplianceReportRequestMailers0(ctx context.Context, exec bob.Executor, count int, complianceReportRequestMailers1 ComplianceReportRequestMailerSlice, commsMailer0 *CommsMailer) (ComplianceReportRequestMailerSlice, error) { + setter := &ComplianceReportRequestMailerSetter{ + MailerID: omit.From(commsMailer0.ID), + } + + err := complianceReportRequestMailers1.UpdateAll(ctx, exec, *setter) + if err != nil { + return nil, fmt.Errorf("attachCommsMailerComplianceReportRequestMailers0: %w", err) + } + + return complianceReportRequestMailers1, nil +} + +func (commsMailer0 *CommsMailer) InsertComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, related ...*ComplianceReportRequestMailerSetter) error { + if len(related) == 0 { + return nil + } + + var err error + + complianceReportRequestMailers1, err := insertCommsMailerComplianceReportRequestMailers0(ctx, exec, related, commsMailer0) + if err != nil { + return err + } + + commsMailer0.R.ComplianceReportRequestMailers = append(commsMailer0.R.ComplianceReportRequestMailers, complianceReportRequestMailers1...) + + for _, rel := range complianceReportRequestMailers1 { + rel.R.Mailer = commsMailer0 + } + return nil +} + +func (commsMailer0 *CommsMailer) AttachComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, related ...*ComplianceReportRequestMailer) error { + if len(related) == 0 { + return nil + } + + var err error + complianceReportRequestMailers1 := ComplianceReportRequestMailerSlice(related) + + _, err = attachCommsMailerComplianceReportRequestMailers0(ctx, exec, len(related), complianceReportRequestMailers1, commsMailer0) + if err != nil { + return err + } + + commsMailer0.R.ComplianceReportRequestMailers = append(commsMailer0.R.ComplianceReportRequestMailers, complianceReportRequestMailers1...) + + for _, rel := range related { + rel.R.Mailer = commsMailer0 + } + + return nil +} + type commsMailerWhere[Q psql.Filterable] struct { - AddressID psql.WhereMod[Q, int32] - Created psql.WhereMod[Q, time.Time] - ID psql.WhereMod[Q, int32] - Recipient psql.WhereMod[Q, string] - UUID psql.WhereMod[Q, uuid.UUID] + AddressID psql.WhereMod[Q, int32] + Created psql.WhereMod[Q, time.Time] + ID psql.WhereMod[Q, int32] + Recipient psql.WhereMod[Q, string] + UUID psql.WhereMod[Q, uuid.UUID] + ExternalID psql.WhereMod[Q, string] } func (commsMailerWhere[Q]) AliasedAs(alias string) commsMailerWhere[Q] { @@ -555,11 +641,12 @@ func (commsMailerWhere[Q]) AliasedAs(alias string) commsMailerWhere[Q] { func buildCommsMailerWhere[Q psql.Filterable](cols commsMailerColumns) commsMailerWhere[Q] { return commsMailerWhere[Q]{ - AddressID: psql.Where[Q, int32](cols.AddressID), - Created: psql.Where[Q, time.Time](cols.Created), - ID: psql.Where[Q, int32](cols.ID), - Recipient: psql.Where[Q, string](cols.Recipient), - UUID: psql.Where[Q, uuid.UUID](cols.UUID), + AddressID: psql.Where[Q, int32](cols.AddressID), + Created: psql.Where[Q, time.Time](cols.Created), + ID: psql.Where[Q, int32](cols.ID), + Recipient: psql.Where[Q, string](cols.Recipient), + UUID: psql.Where[Q, uuid.UUID](cols.UUID), + ExternalID: psql.Where[Q, string](cols.ExternalID), } } @@ -581,17 +668,17 @@ func (o *CommsMailer) Preload(name string, retrieved any) error { rel.R.Mailers = CommsMailerSlice{o} } return nil - case "ComplianceReportRequests": - rels, ok := retrieved.(ComplianceReportRequestSlice) + case "ComplianceReportRequestMailers": + rels, ok := retrieved.(ComplianceReportRequestMailerSlice) if !ok { return fmt.Errorf("commsMailer cannot load %T as %q", retrieved, name) } - o.R.ComplianceReportRequests = rels + o.R.ComplianceReportRequestMailers = rels for _, rel := range rels { if rel != nil { - rel.R.Mailers = CommsMailerSlice{o} + rel.R.Mailer = o } } return nil @@ -623,16 +710,16 @@ func buildCommsMailerPreloader() commsMailerPreloader { } type commsMailerThenLoader[Q orm.Loadable] struct { - Address func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] - ComplianceReportRequests func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] + Address func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] + ComplianceReportRequestMailers func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] } func buildCommsMailerThenLoader[Q orm.Loadable]() commsMailerThenLoader[Q] { type AddressLoadInterface interface { LoadAddress(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error } - type ComplianceReportRequestsLoadInterface interface { - LoadComplianceReportRequests(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error + type ComplianceReportRequestMailersLoadInterface interface { + LoadComplianceReportRequestMailers(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error } return commsMailerThenLoader[Q]{ @@ -642,10 +729,10 @@ func buildCommsMailerThenLoader[Q orm.Loadable]() commsMailerThenLoader[Q] { return retrieved.LoadAddress(ctx, exec, mods...) }, ), - ComplianceReportRequests: thenLoadBuilder[Q]( - "ComplianceReportRequests", - func(ctx context.Context, exec bob.Executor, retrieved ComplianceReportRequestsLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error { - return retrieved.LoadComplianceReportRequests(ctx, exec, mods...) + ComplianceReportRequestMailers: thenLoadBuilder[Q]( + "ComplianceReportRequestMailers", + func(ctx context.Context, exec bob.Executor, retrieved ComplianceReportRequestMailersLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error { + return retrieved.LoadComplianceReportRequestMailers(ctx, exec, mods...) }, ), } @@ -703,81 +790,61 @@ func (os CommsMailerSlice) LoadAddress(ctx context.Context, exec bob.Executor, m return nil } -// LoadComplianceReportRequests loads the commsMailer's ComplianceReportRequests into the .R struct -func (o *CommsMailer) LoadComplianceReportRequests(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { +// LoadComplianceReportRequestMailers loads the commsMailer's ComplianceReportRequestMailers into the .R struct +func (o *CommsMailer) LoadComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { if o == nil { return nil } // Reset the relationship - o.R.ComplianceReportRequests = nil + o.R.ComplianceReportRequestMailers = nil - related, err := o.ComplianceReportRequests(mods...).All(ctx, exec) + related, err := o.ComplianceReportRequestMailers(mods...).All(ctx, exec) if err != nil { return err } for _, rel := range related { - rel.R.Mailers = CommsMailerSlice{o} + rel.R.Mailer = o } - o.R.ComplianceReportRequests = related + o.R.ComplianceReportRequestMailers = related return nil } -// LoadComplianceReportRequests loads the commsMailer's ComplianceReportRequests into the .R struct -func (os CommsMailerSlice) LoadComplianceReportRequests(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { +// LoadComplianceReportRequestMailers loads the commsMailer's ComplianceReportRequestMailers into the .R struct +func (os CommsMailerSlice) LoadComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { if len(os) == 0 { return nil } - // since we are changing the columns, we need to check if the original columns were set or add the defaults - sq := dialect.SelectQuery{} - for _, mod := range mods { - mod.Apply(&sq) - } - - if len(sq.SelectList.Columns) == 0 { - mods = append(mods, sm.Columns(ComplianceReportRequests.Columns)) - } - - q := os.ComplianceReportRequests(append( - mods, - sm.Columns(ComplianceReportRequestMailers.Columns.MailerID.As("related_comms.mailer.ID")), - )...) - - IDSlice := []int32{} - - mapper := scan.Mod(scan.StructMapper[*ComplianceReportRequest](), func(ctx context.Context, cols []string) (scan.BeforeFunc, func(any, any) error) { - return func(row *scan.Row) (any, error) { - IDSlice = append(IDSlice, *new(int32)) - row.ScheduleScanByName("related_comms.mailer.ID", &IDSlice[len(IDSlice)-1]) - - return nil, nil - }, - func(any, any) error { - return nil - } - }) - - complianceReportRequests, err := bob.Allx[bob.SliceTransformer[*ComplianceReportRequest, ComplianceReportRequestSlice]](ctx, exec, q, mapper) + complianceReportRequestMailers, err := os.ComplianceReportRequestMailers(mods...).All(ctx, exec) if err != nil { return err } for _, o := range os { - o.R.ComplianceReportRequests = nil + if o == nil { + continue + } + + o.R.ComplianceReportRequestMailers = nil } for _, o := range os { - for i, rel := range complianceReportRequests { - if !(o.ID == IDSlice[i]) { + if o == nil { + continue + } + + for _, rel := range complianceReportRequestMailers { + + if !(o.ID == rel.MailerID) { continue } - rel.R.Mailers = append(rel.R.Mailers, o) + rel.R.Mailer = o - o.R.ComplianceReportRequests = append(o.R.ComplianceReportRequests, rel) + o.R.ComplianceReportRequestMailers = append(o.R.ComplianceReportRequestMailers, rel) } } diff --git a/db/models/compliance_report_request.bob.go b/db/models/compliance_report_request.bob.go index c3351560..b8335c36 100644 --- a/db/models/compliance_report_request.bob.go +++ b/db/models/compliance_report_request.bob.go @@ -21,7 +21,6 @@ import ( "github.com/aarondl/opt/null" "github.com/aarondl/opt/omit" "github.com/aarondl/opt/omitnull" - "github.com/stephenafamo/scan" ) // ComplianceReportRequest is an object representing the database table. @@ -47,9 +46,9 @@ type ComplianceReportRequestsQuery = *psql.ViewQuery[*ComplianceReportRequest, C // complianceReportRequestR is where relationships are stored. type complianceReportRequestR struct { - CreatorUser *User // compliance_report_request.compliance_report_request_creator_fkey - Lead *Lead // compliance_report_request.compliance_report_request_lead_id_fkey - Mailers CommsMailerSlice // compliance_report_request_mailer.compliance_report_request_mai_compliance_report_request_id_fkeycompliance_report_request_mailer.compliance_report_request_mailer_mailer_id_fkey + CreatorUser *User // compliance_report_request.compliance_report_request_creator_fkey + Lead *Lead // compliance_report_request.compliance_report_request_lead_id_fkey + ComplianceReportRequestMailers ComplianceReportRequestMailerSlice // compliance_report_request_mailer.compliance_report_request_mai_compliance_report_request_id_fkey } func buildComplianceReportRequestColumns(alias string) complianceReportRequestColumns { @@ -490,16 +489,14 @@ func (os ComplianceReportRequestSlice) Lead(mods ...bob.Mod[*dialect.SelectQuery )...) } -// Mailers starts a query for related objects on comms.mailer -func (o *ComplianceReportRequest) Mailers(mods ...bob.Mod[*dialect.SelectQuery]) CommsMailersQuery { - return CommsMailers.Query(append(mods, - sm.InnerJoin(ComplianceReportRequestMailers.NameAs()).On( - CommsMailers.Columns.ID.EQ(ComplianceReportRequestMailers.Columns.MailerID)), +// ComplianceReportRequestMailers starts a query for related objects on compliance_report_request_mailer +func (o *ComplianceReportRequest) ComplianceReportRequestMailers(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestMailersQuery { + return ComplianceReportRequestMailers.Query(append(mods, sm.Where(ComplianceReportRequestMailers.Columns.ComplianceReportRequestID.EQ(psql.Arg(o.ID))), )...) } -func (os ComplianceReportRequestSlice) Mailers(mods ...bob.Mod[*dialect.SelectQuery]) CommsMailersQuery { +func (os ComplianceReportRequestSlice) ComplianceReportRequestMailers(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestMailersQuery { pkID := make(pgtypes.Array[int32], 0, len(os)) for _, o := range os { if o == nil { @@ -511,10 +508,7 @@ func (os ComplianceReportRequestSlice) Mailers(mods ...bob.Mod[*dialect.SelectQu psql.F("unnest", psql.Cast(psql.Arg(pkID), "integer[]")), )) - return CommsMailers.Query(append(mods, - sm.InnerJoin(ComplianceReportRequestMailers.NameAs()).On( - CommsMailers.Columns.ID.EQ(ComplianceReportRequestMailers.Columns.MailerID), - ), + return ComplianceReportRequestMailers.Query(append(mods, sm.Where(psql.Group(ComplianceReportRequestMailers.Columns.ComplianceReportRequestID).OP("IN", PKArgExpr)), )...) } @@ -615,6 +609,74 @@ func (complianceReportRequest0 *ComplianceReportRequest) AttachLead(ctx context. return nil } +func insertComplianceReportRequestComplianceReportRequestMailers0(ctx context.Context, exec bob.Executor, complianceReportRequestMailers1 []*ComplianceReportRequestMailerSetter, complianceReportRequest0 *ComplianceReportRequest) (ComplianceReportRequestMailerSlice, error) { + for i := range complianceReportRequestMailers1 { + complianceReportRequestMailers1[i].ComplianceReportRequestID = omit.From(complianceReportRequest0.ID) + } + + ret, err := ComplianceReportRequestMailers.Insert(bob.ToMods(complianceReportRequestMailers1...)).All(ctx, exec) + if err != nil { + return ret, fmt.Errorf("insertComplianceReportRequestComplianceReportRequestMailers0: %w", err) + } + + return ret, nil +} + +func attachComplianceReportRequestComplianceReportRequestMailers0(ctx context.Context, exec bob.Executor, count int, complianceReportRequestMailers1 ComplianceReportRequestMailerSlice, complianceReportRequest0 *ComplianceReportRequest) (ComplianceReportRequestMailerSlice, error) { + setter := &ComplianceReportRequestMailerSetter{ + ComplianceReportRequestID: omit.From(complianceReportRequest0.ID), + } + + err := complianceReportRequestMailers1.UpdateAll(ctx, exec, *setter) + if err != nil { + return nil, fmt.Errorf("attachComplianceReportRequestComplianceReportRequestMailers0: %w", err) + } + + return complianceReportRequestMailers1, nil +} + +func (complianceReportRequest0 *ComplianceReportRequest) InsertComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, related ...*ComplianceReportRequestMailerSetter) error { + if len(related) == 0 { + return nil + } + + var err error + + complianceReportRequestMailers1, err := insertComplianceReportRequestComplianceReportRequestMailers0(ctx, exec, related, complianceReportRequest0) + if err != nil { + return err + } + + complianceReportRequest0.R.ComplianceReportRequestMailers = append(complianceReportRequest0.R.ComplianceReportRequestMailers, complianceReportRequestMailers1...) + + for _, rel := range complianceReportRequestMailers1 { + rel.R.ComplianceReportRequest = complianceReportRequest0 + } + return nil +} + +func (complianceReportRequest0 *ComplianceReportRequest) AttachComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, related ...*ComplianceReportRequestMailer) error { + if len(related) == 0 { + return nil + } + + var err error + complianceReportRequestMailers1 := ComplianceReportRequestMailerSlice(related) + + _, err = attachComplianceReportRequestComplianceReportRequestMailers0(ctx, exec, len(related), complianceReportRequestMailers1, complianceReportRequest0) + if err != nil { + return err + } + + complianceReportRequest0.R.ComplianceReportRequestMailers = append(complianceReportRequest0.R.ComplianceReportRequestMailers, complianceReportRequestMailers1...) + + for _, rel := range related { + rel.R.ComplianceReportRequest = complianceReportRequest0 + } + + return nil +} + type complianceReportRequestWhere[Q psql.Filterable] struct { Created psql.WhereMod[Q, time.Time] Creator psql.WhereMod[Q, int32] @@ -667,17 +729,17 @@ func (o *ComplianceReportRequest) Preload(name string, retrieved any) error { rel.R.ComplianceReportRequests = ComplianceReportRequestSlice{o} } return nil - case "Mailers": - rels, ok := retrieved.(CommsMailerSlice) + case "ComplianceReportRequestMailers": + rels, ok := retrieved.(ComplianceReportRequestMailerSlice) if !ok { return fmt.Errorf("complianceReportRequest cannot load %T as %q", retrieved, name) } - o.R.Mailers = rels + o.R.ComplianceReportRequestMailers = rels for _, rel := range rels { if rel != nil { - rel.R.ComplianceReportRequests = ComplianceReportRequestSlice{o} + rel.R.ComplianceReportRequest = o } } return nil @@ -723,9 +785,9 @@ func buildComplianceReportRequestPreloader() complianceReportRequestPreloader { } type complianceReportRequestThenLoader[Q orm.Loadable] struct { - CreatorUser func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] - Lead func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] - Mailers func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] + CreatorUser func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] + Lead func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] + ComplianceReportRequestMailers func(...bob.Mod[*dialect.SelectQuery]) orm.Loader[Q] } func buildComplianceReportRequestThenLoader[Q orm.Loadable]() complianceReportRequestThenLoader[Q] { @@ -735,8 +797,8 @@ func buildComplianceReportRequestThenLoader[Q orm.Loadable]() complianceReportRe type LeadLoadInterface interface { LoadLead(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error } - type MailersLoadInterface interface { - LoadMailers(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error + type ComplianceReportRequestMailersLoadInterface interface { + LoadComplianceReportRequestMailers(context.Context, bob.Executor, ...bob.Mod[*dialect.SelectQuery]) error } return complianceReportRequestThenLoader[Q]{ @@ -752,10 +814,10 @@ func buildComplianceReportRequestThenLoader[Q orm.Loadable]() complianceReportRe return retrieved.LoadLead(ctx, exec, mods...) }, ), - Mailers: thenLoadBuilder[Q]( - "Mailers", - func(ctx context.Context, exec bob.Executor, retrieved MailersLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error { - return retrieved.LoadMailers(ctx, exec, mods...) + ComplianceReportRequestMailers: thenLoadBuilder[Q]( + "ComplianceReportRequestMailers", + func(ctx context.Context, exec bob.Executor, retrieved ComplianceReportRequestMailersLoadInterface, mods ...bob.Mod[*dialect.SelectQuery]) error { + return retrieved.LoadComplianceReportRequestMailers(ctx, exec, mods...) }, ), } @@ -868,81 +930,61 @@ func (os ComplianceReportRequestSlice) LoadLead(ctx context.Context, exec bob.Ex return nil } -// LoadMailers loads the complianceReportRequest's Mailers into the .R struct -func (o *ComplianceReportRequest) LoadMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { +// LoadComplianceReportRequestMailers loads the complianceReportRequest's ComplianceReportRequestMailers into the .R struct +func (o *ComplianceReportRequest) LoadComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { if o == nil { return nil } // Reset the relationship - o.R.Mailers = nil + o.R.ComplianceReportRequestMailers = nil - related, err := o.Mailers(mods...).All(ctx, exec) + related, err := o.ComplianceReportRequestMailers(mods...).All(ctx, exec) if err != nil { return err } for _, rel := range related { - rel.R.ComplianceReportRequests = ComplianceReportRequestSlice{o} + rel.R.ComplianceReportRequest = o } - o.R.Mailers = related + o.R.ComplianceReportRequestMailers = related return nil } -// LoadMailers loads the complianceReportRequest's Mailers into the .R struct -func (os ComplianceReportRequestSlice) LoadMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { +// LoadComplianceReportRequestMailers loads the complianceReportRequest's ComplianceReportRequestMailers into the .R struct +func (os ComplianceReportRequestSlice) LoadComplianceReportRequestMailers(ctx context.Context, exec bob.Executor, mods ...bob.Mod[*dialect.SelectQuery]) error { if len(os) == 0 { return nil } - // since we are changing the columns, we need to check if the original columns were set or add the defaults - sq := dialect.SelectQuery{} - for _, mod := range mods { - mod.Apply(&sq) - } - - if len(sq.SelectList.Columns) == 0 { - mods = append(mods, sm.Columns(CommsMailers.Columns)) - } - - q := os.Mailers(append( - mods, - sm.Columns(ComplianceReportRequestMailers.Columns.ComplianceReportRequestID.As("related_compliance_report_request.ID")), - )...) - - IDSlice := []int32{} - - mapper := scan.Mod(scan.StructMapper[*CommsMailer](), func(ctx context.Context, cols []string) (scan.BeforeFunc, func(any, any) error) { - return func(row *scan.Row) (any, error) { - IDSlice = append(IDSlice, *new(int32)) - row.ScheduleScanByName("related_compliance_report_request.ID", &IDSlice[len(IDSlice)-1]) - - return nil, nil - }, - func(any, any) error { - return nil - } - }) - - commsMailers, err := bob.Allx[bob.SliceTransformer[*CommsMailer, CommsMailerSlice]](ctx, exec, q, mapper) + complianceReportRequestMailers, err := os.ComplianceReportRequestMailers(mods...).All(ctx, exec) if err != nil { return err } for _, o := range os { - o.R.Mailers = nil + if o == nil { + continue + } + + o.R.ComplianceReportRequestMailers = nil } for _, o := range os { - for i, rel := range commsMailers { - if !(o.ID == IDSlice[i]) { + if o == nil { + continue + } + + for _, rel := range complianceReportRequestMailers { + + if !(o.ID == rel.ComplianceReportRequestID) { continue } - rel.R.ComplianceReportRequests = append(rel.R.ComplianceReportRequests, o) + rel.R.ComplianceReportRequest = o - o.R.Mailers = append(o.R.Mailers, rel) + o.R.ComplianceReportRequestMailers = append(o.R.ComplianceReportRequestMailers, rel) } } diff --git a/db/models/compliance_report_request_mailer.bob.go b/db/models/compliance_report_request_mailer.bob.go index e279efe2..33a4c755 100644 --- a/db/models/compliance_report_request_mailer.bob.go +++ b/db/models/compliance_report_request_mailer.bob.go @@ -11,6 +11,7 @@ import ( "github.com/Gleipnir-Technology/bob" "github.com/Gleipnir-Technology/bob/dialect/psql" "github.com/Gleipnir-Technology/bob/dialect/psql/dialect" + "github.com/Gleipnir-Technology/bob/dialect/psql/dm" "github.com/Gleipnir-Technology/bob/dialect/psql/sm" "github.com/Gleipnir-Technology/bob/dialect/psql/um" "github.com/Gleipnir-Technology/bob/expr" @@ -23,6 +24,7 @@ import ( type ComplianceReportRequestMailer struct { ComplianceReportRequestID int32 `db:"compliance_report_request_id" ` MailerID int32 `db:"mailer_id" ` + ID int32 `db:"id,pk" ` R complianceReportRequestMailerR `db:"-" ` } @@ -31,10 +33,10 @@ type ComplianceReportRequestMailer struct { // This should almost always be used instead of []*ComplianceReportRequestMailer. type ComplianceReportRequestMailerSlice []*ComplianceReportRequestMailer -// ComplianceReportRequestMailers contains methods to work with the compliance_report_request_mailer view -var ComplianceReportRequestMailers = psql.NewViewx[*ComplianceReportRequestMailer, ComplianceReportRequestMailerSlice]("", "compliance_report_request_mailer", buildComplianceReportRequestMailerColumns("compliance_report_request_mailer")) +// ComplianceReportRequestMailers contains methods to work with the compliance_report_request_mailer table +var ComplianceReportRequestMailers = psql.NewTablex[*ComplianceReportRequestMailer, ComplianceReportRequestMailerSlice, *ComplianceReportRequestMailerSetter]("", "compliance_report_request_mailer", buildComplianceReportRequestMailerColumns("compliance_report_request_mailer")) -// ComplianceReportRequestMailersQuery is a query on the compliance_report_request_mailer view +// ComplianceReportRequestMailersQuery is a query on the compliance_report_request_mailer table type ComplianceReportRequestMailersQuery = *psql.ViewQuery[*ComplianceReportRequestMailer, ComplianceReportRequestMailerSlice] // complianceReportRequestMailerR is where relationships are stored. @@ -46,11 +48,12 @@ type complianceReportRequestMailerR struct { func buildComplianceReportRequestMailerColumns(alias string) complianceReportRequestMailerColumns { return complianceReportRequestMailerColumns{ ColumnsExpr: expr.NewColumnsExpr( - "compliance_report_request_id", "mailer_id", + "compliance_report_request_id", "mailer_id", "id", ).WithParent("compliance_report_request_mailer"), tableAlias: alias, ComplianceReportRequestID: psql.Quote(alias, "compliance_report_request_id"), MailerID: psql.Quote(alias, "mailer_id"), + ID: psql.Quote(alias, "id"), } } @@ -59,6 +62,7 @@ type complianceReportRequestMailerColumns struct { tableAlias string ComplianceReportRequestID psql.Expression MailerID psql.Expression + ID psql.Expression } func (c complianceReportRequestMailerColumns) Alias() string { @@ -75,16 +79,20 @@ func (complianceReportRequestMailerColumns) AliasedAs(alias string) complianceRe type ComplianceReportRequestMailerSetter struct { ComplianceReportRequestID omit.Val[int32] `db:"compliance_report_request_id" ` MailerID omit.Val[int32] `db:"mailer_id" ` + ID omit.Val[int32] `db:"id,pk" ` } func (s ComplianceReportRequestMailerSetter) SetColumns() []string { - vals := make([]string, 0, 2) + vals := make([]string, 0, 3) if s.ComplianceReportRequestID.IsValue() { vals = append(vals, "compliance_report_request_id") } if s.MailerID.IsValue() { vals = append(vals, "mailer_id") } + if s.ID.IsValue() { + vals = append(vals, "id") + } return vals } @@ -95,11 +103,18 @@ func (s ComplianceReportRequestMailerSetter) Overwrite(t *ComplianceReportReques if s.MailerID.IsValue() { t.MailerID = s.MailerID.MustGet() } + if s.ID.IsValue() { + t.ID = s.ID.MustGet() + } } func (s *ComplianceReportRequestMailerSetter) Apply(q *dialect.InsertQuery) { + q.AppendHooks(func(ctx context.Context, exec bob.Executor) (context.Context, error) { + return ComplianceReportRequestMailers.BeforeInsertHooks.RunHooks(ctx, exec, s) + }) + q.AppendValues(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) { - vals := make([]bob.Expression, 2) + vals := make([]bob.Expression, 3) if s.ComplianceReportRequestID.IsValue() { vals[0] = psql.Arg(s.ComplianceReportRequestID.MustGet()) } else { @@ -112,6 +127,12 @@ func (s *ComplianceReportRequestMailerSetter) Apply(q *dialect.InsertQuery) { vals[1] = psql.Raw("DEFAULT") } + if s.ID.IsValue() { + vals[2] = psql.Arg(s.ID.MustGet()) + } else { + vals[2] = psql.Raw("DEFAULT") + } + return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "") })) } @@ -121,7 +142,7 @@ func (s ComplianceReportRequestMailerSetter) UpdateMod() bob.Mod[*dialect.Update } func (s ComplianceReportRequestMailerSetter) Expressions(prefix ...string) []bob.Expression { - exprs := make([]bob.Expression, 0, 2) + exprs := make([]bob.Expression, 0, 3) if s.ComplianceReportRequestID.IsValue() { exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ @@ -137,9 +158,38 @@ func (s ComplianceReportRequestMailerSetter) Expressions(prefix ...string) []bob }}) } + if s.ID.IsValue() { + exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ + psql.Quote(append(prefix, "id")...), + psql.Arg(s.ID), + }}) + } + return exprs } +// FindComplianceReportRequestMailer retrieves a single record by primary key +// If cols is empty Find will return all columns. +func FindComplianceReportRequestMailer(ctx context.Context, exec bob.Executor, IDPK int32, cols ...string) (*ComplianceReportRequestMailer, error) { + if len(cols) == 0 { + return ComplianceReportRequestMailers.Query( + sm.Where(ComplianceReportRequestMailers.Columns.ID.EQ(psql.Arg(IDPK))), + ).One(ctx, exec) + } + + return ComplianceReportRequestMailers.Query( + sm.Where(ComplianceReportRequestMailers.Columns.ID.EQ(psql.Arg(IDPK))), + sm.Columns(ComplianceReportRequestMailers.Columns.Only(cols...)), + ).One(ctx, exec) +} + +// ComplianceReportRequestMailerExists checks the presence of a single record by primary key +func ComplianceReportRequestMailerExists(ctx context.Context, exec bob.Executor, IDPK int32) (bool, error) { + return ComplianceReportRequestMailers.Query( + sm.Where(ComplianceReportRequestMailers.Columns.ID.EQ(psql.Arg(IDPK))), + ).Exists(ctx, exec) +} + // AfterQueryHook is called after ComplianceReportRequestMailer is retrieved from the database func (o *ComplianceReportRequestMailer) AfterQueryHook(ctx context.Context, exec bob.Executor, queryType bob.QueryType) error { var err error @@ -147,11 +197,61 @@ func (o *ComplianceReportRequestMailer) AfterQueryHook(ctx context.Context, exec switch queryType { case bob.QueryTypeSelect: ctx, err = ComplianceReportRequestMailers.AfterSelectHooks.RunHooks(ctx, exec, ComplianceReportRequestMailerSlice{o}) + case bob.QueryTypeInsert: + ctx, err = ComplianceReportRequestMailers.AfterInsertHooks.RunHooks(ctx, exec, ComplianceReportRequestMailerSlice{o}) + case bob.QueryTypeUpdate: + ctx, err = ComplianceReportRequestMailers.AfterUpdateHooks.RunHooks(ctx, exec, ComplianceReportRequestMailerSlice{o}) + case bob.QueryTypeDelete: + ctx, err = ComplianceReportRequestMailers.AfterDeleteHooks.RunHooks(ctx, exec, ComplianceReportRequestMailerSlice{o}) } return err } +// primaryKeyVals returns the primary key values of the ComplianceReportRequestMailer +func (o *ComplianceReportRequestMailer) primaryKeyVals() bob.Expression { + return psql.Arg(o.ID) +} + +func (o *ComplianceReportRequestMailer) pkEQ() dialect.Expression { + return psql.Quote("compliance_report_request_mailer", "id").EQ(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) { + return o.primaryKeyVals().WriteSQL(ctx, w, d, start) + })) +} + +// Update uses an executor to update the ComplianceReportRequestMailer +func (o *ComplianceReportRequestMailer) Update(ctx context.Context, exec bob.Executor, s *ComplianceReportRequestMailerSetter) error { + v, err := ComplianceReportRequestMailers.Update(s.UpdateMod(), um.Where(o.pkEQ())).One(ctx, exec) + if err != nil { + return err + } + + o.R = v.R + *o = *v + + return nil +} + +// Delete deletes a single ComplianceReportRequestMailer record with an executor +func (o *ComplianceReportRequestMailer) Delete(ctx context.Context, exec bob.Executor) error { + _, err := ComplianceReportRequestMailers.Delete(dm.Where(o.pkEQ())).Exec(ctx, exec) + return err +} + +// Reload refreshes the ComplianceReportRequestMailer using the executor +func (o *ComplianceReportRequestMailer) Reload(ctx context.Context, exec bob.Executor) error { + o2, err := ComplianceReportRequestMailers.Query( + sm.Where(ComplianceReportRequestMailers.Columns.ID.EQ(psql.Arg(o.ID))), + ).One(ctx, exec) + if err != nil { + return err + } + o2.R = o.R + *o = *o2 + + return nil +} + // AfterQueryHook is called after ComplianceReportRequestMailerSlice is retrieved from the database func (o ComplianceReportRequestMailerSlice) AfterQueryHook(ctx context.Context, exec bob.Executor, queryType bob.QueryType) error { var err error @@ -159,11 +259,138 @@ func (o ComplianceReportRequestMailerSlice) AfterQueryHook(ctx context.Context, switch queryType { case bob.QueryTypeSelect: ctx, err = ComplianceReportRequestMailers.AfterSelectHooks.RunHooks(ctx, exec, o) + case bob.QueryTypeInsert: + ctx, err = ComplianceReportRequestMailers.AfterInsertHooks.RunHooks(ctx, exec, o) + case bob.QueryTypeUpdate: + ctx, err = ComplianceReportRequestMailers.AfterUpdateHooks.RunHooks(ctx, exec, o) + case bob.QueryTypeDelete: + ctx, err = ComplianceReportRequestMailers.AfterDeleteHooks.RunHooks(ctx, exec, o) } return err } +func (o ComplianceReportRequestMailerSlice) pkIN() dialect.Expression { + if len(o) == 0 { + return psql.Raw("NULL") + } + + return psql.Quote("compliance_report_request_mailer", "id").In(bob.ExpressionFunc(func(ctx context.Context, w io.StringWriter, d bob.Dialect, start int) ([]any, error) { + pkPairs := make([]bob.Expression, len(o)) + for i, row := range o { + pkPairs[i] = row.primaryKeyVals() + } + return bob.ExpressSlice(ctx, w, d, start, pkPairs, "", ", ", "") + })) +} + +// copyMatchingRows finds models in the given slice that have the same primary key +// then it first copies the existing relationships from the old model to the new model +// and then replaces the old model in the slice with the new model +func (o ComplianceReportRequestMailerSlice) copyMatchingRows(from ...*ComplianceReportRequestMailer) { + for i, old := range o { + for _, new := range from { + if new.ID != old.ID { + continue + } + new.R = old.R + o[i] = new + break + } + } +} + +// UpdateMod modifies an update query with "WHERE primary_key IN (o...)" +func (o ComplianceReportRequestMailerSlice) UpdateMod() bob.Mod[*dialect.UpdateQuery] { + return bob.ModFunc[*dialect.UpdateQuery](func(q *dialect.UpdateQuery) { + q.AppendHooks(func(ctx context.Context, exec bob.Executor) (context.Context, error) { + return ComplianceReportRequestMailers.BeforeUpdateHooks.RunHooks(ctx, exec, o) + }) + + q.AppendLoader(bob.LoaderFunc(func(ctx context.Context, exec bob.Executor, retrieved any) error { + var err error + switch retrieved := retrieved.(type) { + case *ComplianceReportRequestMailer: + o.copyMatchingRows(retrieved) + case []*ComplianceReportRequestMailer: + o.copyMatchingRows(retrieved...) + case ComplianceReportRequestMailerSlice: + o.copyMatchingRows(retrieved...) + default: + // If the retrieved value is not a ComplianceReportRequestMailer or a slice of ComplianceReportRequestMailer + // then run the AfterUpdateHooks on the slice + _, err = ComplianceReportRequestMailers.AfterUpdateHooks.RunHooks(ctx, exec, o) + } + + return err + })) + + q.AppendWhere(o.pkIN()) + }) +} + +// DeleteMod modifies an delete query with "WHERE primary_key IN (o...)" +func (o ComplianceReportRequestMailerSlice) DeleteMod() bob.Mod[*dialect.DeleteQuery] { + return bob.ModFunc[*dialect.DeleteQuery](func(q *dialect.DeleteQuery) { + q.AppendHooks(func(ctx context.Context, exec bob.Executor) (context.Context, error) { + return ComplianceReportRequestMailers.BeforeDeleteHooks.RunHooks(ctx, exec, o) + }) + + q.AppendLoader(bob.LoaderFunc(func(ctx context.Context, exec bob.Executor, retrieved any) error { + var err error + switch retrieved := retrieved.(type) { + case *ComplianceReportRequestMailer: + o.copyMatchingRows(retrieved) + case []*ComplianceReportRequestMailer: + o.copyMatchingRows(retrieved...) + case ComplianceReportRequestMailerSlice: + o.copyMatchingRows(retrieved...) + default: + // If the retrieved value is not a ComplianceReportRequestMailer or a slice of ComplianceReportRequestMailer + // then run the AfterDeleteHooks on the slice + _, err = ComplianceReportRequestMailers.AfterDeleteHooks.RunHooks(ctx, exec, o) + } + + return err + })) + + q.AppendWhere(o.pkIN()) + }) +} + +func (o ComplianceReportRequestMailerSlice) UpdateAll(ctx context.Context, exec bob.Executor, vals ComplianceReportRequestMailerSetter) error { + if len(o) == 0 { + return nil + } + + _, err := ComplianceReportRequestMailers.Update(vals.UpdateMod(), o.UpdateMod()).All(ctx, exec) + return err +} + +func (o ComplianceReportRequestMailerSlice) DeleteAll(ctx context.Context, exec bob.Executor) error { + if len(o) == 0 { + return nil + } + + _, err := ComplianceReportRequestMailers.Delete(o.DeleteMod()).Exec(ctx, exec) + return err +} + +func (o ComplianceReportRequestMailerSlice) ReloadAll(ctx context.Context, exec bob.Executor) error { + if len(o) == 0 { + return nil + } + + o2, err := ComplianceReportRequestMailers.Query(sm.Where(o.pkIN())).All(ctx, exec) + if err != nil { + return err + } + + o.copyMatchingRows(o2...) + + return nil +} + // ComplianceReportRequest starts a query for related objects on compliance_report_request func (o *ComplianceReportRequestMailer) ComplianceReportRequest(mods ...bob.Mod[*dialect.SelectQuery]) ComplianceReportRequestsQuery { return ComplianceReportRequests.Query(append(mods, @@ -212,9 +439,106 @@ func (os ComplianceReportRequestMailerSlice) Mailer(mods ...bob.Mod[*dialect.Sel )...) } +func attachComplianceReportRequestMailerComplianceReportRequest0(ctx context.Context, exec bob.Executor, count int, complianceReportRequestMailer0 *ComplianceReportRequestMailer, complianceReportRequest1 *ComplianceReportRequest) (*ComplianceReportRequestMailer, error) { + setter := &ComplianceReportRequestMailerSetter{ + ComplianceReportRequestID: omit.From(complianceReportRequest1.ID), + } + + err := complianceReportRequestMailer0.Update(ctx, exec, setter) + if err != nil { + return nil, fmt.Errorf("attachComplianceReportRequestMailerComplianceReportRequest0: %w", err) + } + + return complianceReportRequestMailer0, nil +} + +func (complianceReportRequestMailer0 *ComplianceReportRequestMailer) InsertComplianceReportRequest(ctx context.Context, exec bob.Executor, related *ComplianceReportRequestSetter) error { + var err error + + complianceReportRequest1, err := ComplianceReportRequests.Insert(related).One(ctx, exec) + if err != nil { + return fmt.Errorf("inserting related objects: %w", err) + } + + _, err = attachComplianceReportRequestMailerComplianceReportRequest0(ctx, exec, 1, complianceReportRequestMailer0, complianceReportRequest1) + if err != nil { + return err + } + + complianceReportRequestMailer0.R.ComplianceReportRequest = complianceReportRequest1 + + complianceReportRequest1.R.ComplianceReportRequestMailers = append(complianceReportRequest1.R.ComplianceReportRequestMailers, complianceReportRequestMailer0) + + return nil +} + +func (complianceReportRequestMailer0 *ComplianceReportRequestMailer) AttachComplianceReportRequest(ctx context.Context, exec bob.Executor, complianceReportRequest1 *ComplianceReportRequest) error { + var err error + + _, err = attachComplianceReportRequestMailerComplianceReportRequest0(ctx, exec, 1, complianceReportRequestMailer0, complianceReportRequest1) + if err != nil { + return err + } + + complianceReportRequestMailer0.R.ComplianceReportRequest = complianceReportRequest1 + + complianceReportRequest1.R.ComplianceReportRequestMailers = append(complianceReportRequest1.R.ComplianceReportRequestMailers, complianceReportRequestMailer0) + + return nil +} + +func attachComplianceReportRequestMailerMailer0(ctx context.Context, exec bob.Executor, count int, complianceReportRequestMailer0 *ComplianceReportRequestMailer, commsMailer1 *CommsMailer) (*ComplianceReportRequestMailer, error) { + setter := &ComplianceReportRequestMailerSetter{ + MailerID: omit.From(commsMailer1.ID), + } + + err := complianceReportRequestMailer0.Update(ctx, exec, setter) + if err != nil { + return nil, fmt.Errorf("attachComplianceReportRequestMailerMailer0: %w", err) + } + + return complianceReportRequestMailer0, nil +} + +func (complianceReportRequestMailer0 *ComplianceReportRequestMailer) InsertMailer(ctx context.Context, exec bob.Executor, related *CommsMailerSetter) error { + var err error + + commsMailer1, err := CommsMailers.Insert(related).One(ctx, exec) + if err != nil { + return fmt.Errorf("inserting related objects: %w", err) + } + + _, err = attachComplianceReportRequestMailerMailer0(ctx, exec, 1, complianceReportRequestMailer0, commsMailer1) + if err != nil { + return err + } + + complianceReportRequestMailer0.R.Mailer = commsMailer1 + + commsMailer1.R.ComplianceReportRequestMailers = append(commsMailer1.R.ComplianceReportRequestMailers, complianceReportRequestMailer0) + + return nil +} + +func (complianceReportRequestMailer0 *ComplianceReportRequestMailer) AttachMailer(ctx context.Context, exec bob.Executor, commsMailer1 *CommsMailer) error { + var err error + + _, err = attachComplianceReportRequestMailerMailer0(ctx, exec, 1, complianceReportRequestMailer0, commsMailer1) + if err != nil { + return err + } + + complianceReportRequestMailer0.R.Mailer = commsMailer1 + + commsMailer1.R.ComplianceReportRequestMailers = append(commsMailer1.R.ComplianceReportRequestMailers, complianceReportRequestMailer0) + + return nil +} + type complianceReportRequestMailerWhere[Q psql.Filterable] struct { ComplianceReportRequestID psql.WhereMod[Q, int32] MailerID psql.WhereMod[Q, int32] + ID psql.WhereMod[Q, int32] } func (complianceReportRequestMailerWhere[Q]) AliasedAs(alias string) complianceReportRequestMailerWhere[Q] { @@ -225,6 +549,7 @@ func buildComplianceReportRequestMailerWhere[Q psql.Filterable](cols complianceR return complianceReportRequestMailerWhere[Q]{ ComplianceReportRequestID: psql.Where[Q, int32](cols.ComplianceReportRequestID), MailerID: psql.Where[Q, int32](cols.MailerID), + ID: psql.Where[Q, int32](cols.ID), } } @@ -242,6 +567,9 @@ func (o *ComplianceReportRequestMailer) Preload(name string, retrieved any) erro o.R.ComplianceReportRequest = rel + if rel != nil { + rel.R.ComplianceReportRequestMailers = ComplianceReportRequestMailerSlice{o} + } return nil case "Mailer": rel, ok := retrieved.(*CommsMailer) @@ -251,6 +579,9 @@ func (o *ComplianceReportRequestMailer) Preload(name string, retrieved any) erro o.R.Mailer = rel + if rel != nil { + rel.R.ComplianceReportRequestMailers = ComplianceReportRequestMailerSlice{o} + } return nil default: return fmt.Errorf("complianceReportRequestMailer has no relationship %q", name) @@ -336,6 +667,8 @@ func (o *ComplianceReportRequestMailer) LoadComplianceReportRequest(ctx context. return err } + related.R.ComplianceReportRequestMailers = ComplianceReportRequestMailerSlice{o} + o.R.ComplianceReportRequest = related return nil } @@ -362,6 +695,8 @@ func (os ComplianceReportRequestMailerSlice) LoadComplianceReportRequest(ctx con continue } + rel.R.ComplianceReportRequestMailers = append(rel.R.ComplianceReportRequestMailers, o) + o.R.ComplianceReportRequest = rel break } @@ -384,6 +719,8 @@ func (o *ComplianceReportRequestMailer) LoadMailer(ctx context.Context, exec bob return err } + related.R.ComplianceReportRequestMailers = ComplianceReportRequestMailerSlice{o} + o.R.Mailer = related return nil } @@ -410,6 +747,8 @@ func (os ComplianceReportRequestMailerSlice) LoadMailer(ctx context.Context, exe continue } + rel.R.ComplianceReportRequestMailers = append(rel.R.ComplianceReportRequestMailers, o) + o.R.Mailer = rel break } diff --git a/db/models/organization.bob.go b/db/models/organization.bob.go index 53ecd585..8905ccf2 100644 --- a/db/models/organization.bob.go +++ b/db/models/organization.bob.go @@ -61,6 +61,7 @@ type Organization struct { FieldseekerServiceFeatureItemID null.Val[string] `db:"fieldseeker_service_feature_item_id" ` ArcgisMapServiceID null.Val[string] `db:"arcgis_map_service_id" ` IsCatchall bool `db:"is_catchall" ` + LobAddressID null.Val[string] `db:"lob_address_id" ` R organizationR `db:"-" ` } @@ -130,7 +131,7 @@ type organizationR struct { func buildOrganizationColumns(alias string) organizationColumns { return organizationColumns{ ColumnsExpr: expr.NewColumnsExpr( - "id", "name", "import_district_gid", "website", "logo_uuid", "slug", "general_manager_name", "mailing_address_city", "mailing_address_postal_code", "mailing_address_street", "office_address_city", "office_address_postal_code", "office_address_street", "service_area_geometry", "service_area_square_meters", "service_area_centroid", "service_area_extent", "office_fax", "office_phone", "service_area_xmin", "service_area_ymin", "service_area_xmax", "service_area_ymax", "service_area_centroid_geojson", "service_area_centroid_x", "service_area_centroid_y", "mailing_address_country", "mailing_address_state", "office_address_country", "office_address_state", "arcgis_account_id", "fieldseeker_service_feature_item_id", "arcgis_map_service_id", "is_catchall", + "id", "name", "import_district_gid", "website", "logo_uuid", "slug", "general_manager_name", "mailing_address_city", "mailing_address_postal_code", "mailing_address_street", "office_address_city", "office_address_postal_code", "office_address_street", "service_area_geometry", "service_area_square_meters", "service_area_centroid", "service_area_extent", "office_fax", "office_phone", "service_area_xmin", "service_area_ymin", "service_area_xmax", "service_area_ymax", "service_area_centroid_geojson", "service_area_centroid_x", "service_area_centroid_y", "mailing_address_country", "mailing_address_state", "office_address_country", "office_address_state", "arcgis_account_id", "fieldseeker_service_feature_item_id", "arcgis_map_service_id", "is_catchall", "lob_address_id", ).WithParent("organization"), tableAlias: alias, ID: psql.Quote(alias, "id"), @@ -167,6 +168,7 @@ func buildOrganizationColumns(alias string) organizationColumns { FieldseekerServiceFeatureItemID: psql.Quote(alias, "fieldseeker_service_feature_item_id"), ArcgisMapServiceID: psql.Quote(alias, "arcgis_map_service_id"), IsCatchall: psql.Quote(alias, "is_catchall"), + LobAddressID: psql.Quote(alias, "lob_address_id"), } } @@ -207,6 +209,7 @@ type organizationColumns struct { FieldseekerServiceFeatureItemID psql.Expression ArcgisMapServiceID psql.Expression IsCatchall psql.Expression + LobAddressID psql.Expression } func (c organizationColumns) Alias() string { @@ -245,10 +248,11 @@ type OrganizationSetter struct { FieldseekerServiceFeatureItemID omitnull.Val[string] `db:"fieldseeker_service_feature_item_id" ` ArcgisMapServiceID omitnull.Val[string] `db:"arcgis_map_service_id" ` IsCatchall omit.Val[bool] `db:"is_catchall" ` + LobAddressID omitnull.Val[string] `db:"lob_address_id" ` } func (s OrganizationSetter) SetColumns() []string { - vals := make([]string, 0, 24) + vals := make([]string, 0, 25) if s.ID.IsValue() { vals = append(vals, "id") } @@ -321,6 +325,9 @@ func (s OrganizationSetter) SetColumns() []string { if s.IsCatchall.IsValue() { vals = append(vals, "is_catchall") } + if !s.LobAddressID.IsUnset() { + vals = append(vals, "lob_address_id") + } return vals } @@ -397,6 +404,9 @@ func (s OrganizationSetter) Overwrite(t *Organization) { if s.IsCatchall.IsValue() { t.IsCatchall = s.IsCatchall.MustGet() } + if !s.LobAddressID.IsUnset() { + t.LobAddressID = s.LobAddressID.MustGetNull() + } } func (s *OrganizationSetter) Apply(q *dialect.InsertQuery) { @@ -405,7 +415,7 @@ func (s *OrganizationSetter) 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, 24) + vals := make([]bob.Expression, 25) if s.ID.IsValue() { vals[0] = psql.Arg(s.ID.MustGet()) } else { @@ -550,6 +560,12 @@ func (s *OrganizationSetter) Apply(q *dialect.InsertQuery) { vals[23] = psql.Raw("DEFAULT") } + if !s.LobAddressID.IsUnset() { + vals[24] = psql.Arg(s.LobAddressID.MustGetNull()) + } else { + vals[24] = psql.Raw("DEFAULT") + } + return bob.ExpressSlice(ctx, w, d, start, vals, "", ", ", "") })) } @@ -559,7 +575,7 @@ func (s OrganizationSetter) UpdateMod() bob.Mod[*dialect.UpdateQuery] { } func (s OrganizationSetter) Expressions(prefix ...string) []bob.Expression { - exprs := make([]bob.Expression, 0, 24) + exprs := make([]bob.Expression, 0, 25) if s.ID.IsValue() { exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ @@ -729,6 +745,13 @@ func (s OrganizationSetter) Expressions(prefix ...string) []bob.Expression { }}) } + if !s.LobAddressID.IsUnset() { + exprs = append(exprs, expr.Join{Sep: " = ", Exprs: []bob.Expression{ + psql.Quote(append(prefix, "lob_address_id")...), + psql.Arg(s.LobAddressID), + }}) + } + return exprs } @@ -5350,6 +5373,7 @@ type organizationWhere[Q psql.Filterable] struct { FieldseekerServiceFeatureItemID psql.WhereNullMod[Q, string] ArcgisMapServiceID psql.WhereNullMod[Q, string] IsCatchall psql.WhereMod[Q, bool] + LobAddressID psql.WhereNullMod[Q, string] } func (organizationWhere[Q]) AliasedAs(alias string) organizationWhere[Q] { @@ -5392,6 +5416,7 @@ func buildOrganizationWhere[Q psql.Filterable](cols organizationColumns) organiz FieldseekerServiceFeatureItemID: psql.WhereNull[Q, string](cols.FieldseekerServiceFeatureItemID), ArcgisMapServiceID: psql.WhereNull[Q, string](cols.ArcgisMapServiceID), IsCatchall: psql.Where[Q, bool](cols.IsCatchall), + LobAddressID: psql.WhereNull[Q, string](cols.LobAddressID), } } diff --git a/platform/feature.go b/platform/feature.go index 7b05a919..2a235617 100644 --- a/platform/feature.go +++ b/platform/feature.go @@ -15,6 +15,14 @@ import ( "github.com/stephenafamo/scan" ) +func FeaturesForSite(ctx context.Context, site_id int32) ([]types.Feature, error) { + features, err := featuresBySiteID(ctx, []int32{site_id}) + if err != nil { + return nil, fmt.Errorf("features by site ID: %w", err) + } + return features[site_id], nil +} + func featuresBySiteID(ctx context.Context, site_ids []int32) (map[int32][]types.Feature, error) { rows, err := bob.All(ctx, db.PGInstance.BobDB, psql.Select( sm.Columns( @@ -30,7 +38,7 @@ func featuresBySiteID(ctx context.Context, site_ids []int32) (map[int32][]types. psql.Quote("feature_pool", "feature_id"), ), sm.Where( - models.Features.Columns.ID.EQ(psql.Any(site_ids)), + models.Features.Columns.SiteID.EQ(psql.Any(site_ids)), ), ), scan.StructMapper[types.Feature]()) if err != nil { diff --git a/platform/file/base.go b/platform/file/base.go index 1b94cebf..2f8d3bf6 100644 --- a/platform/file/base.go +++ b/platform/file/base.go @@ -22,6 +22,7 @@ var collectionToExtension map[Collection]string = map[Collection]string{ CollectionAvatar: "png", CollectionCSV: "csv", CollectionLogo: "png", + CollectionMailerPDF: "pdf", CollectionPublicImage: "img", CollectionImageRaw: "raw", } @@ -32,20 +33,34 @@ var collectionToSubdir map[Collection]string = map[Collection]string{ CollectionAvatar: "avatar", CollectionCSV: "csv", CollectionLogo: "logo", + CollectionMailerPDF: "mailer", CollectionPublicImage: "public-image", CollectionImageRaw: "image-raw", } -func ContentPath(collection Collection, uid uuid.UUID) string { - return fileContentPath(collection, uid) +func ContentPath(collection Collection, id string) string { + return fileContentPath(collection, id) } -func fileContentPath(collection Collection, uid uuid.UUID) string { +func ContentPathUUID(collection Collection, uid uuid.UUID) string { + return fileContentPathUUID(collection, uid) +} +func collectionName(collection Collection) string { + n, ok := collectionToSubdir[collection] + if !ok { + return "unknown" + } + return n +} +func fileContentPath(collection Collection, id string) string { subdir, ok := collectionToSubdir[collection] if !ok { panic(fmt.Sprintf("No subdir for collection %d", int(collection))) } extension, ok := collectionToExtension[collection] - return fmt.Sprintf("%s/%s/%s.%s", config.FilesDirectory, subdir, uid.String(), extension) + return fmt.Sprintf("%s/%s/%s.%s", config.FilesDirectory, subdir, id, extension) +} +func fileContentPathUUID(collection Collection, uid uuid.UUID) string { + return fileContentPath(collection, uid.String()) } /* diff --git a/platform/file/enum.go b/platform/file/enum.go index 1bdf19d9..b4fbc577 100644 --- a/platform/file/enum.go +++ b/platform/file/enum.go @@ -10,5 +10,6 @@ const ( CollectionCSV CollectionImageRaw CollectionLogo + CollectionMailerPDF CollectionPublicImage ) diff --git a/platform/file/image.go b/platform/file/image.go index 1f6d3e58..22635276 100644 --- a/platform/file/image.go +++ b/platform/file/image.go @@ -11,7 +11,7 @@ import ( ) func ImageFileFromReader(collection Collection, uid uuid.UUID, body io.Reader) error { - filepath := fileContentPath(collection, uid) + filepath := fileContentPathUUID(collection, uid) // Create file in configured directory dst, err := os.Create(filepath) @@ -29,6 +29,6 @@ func ImageFileFromReader(collection Collection, uid uuid.UUID, body io.Reader) e return nil } func ImageFileToWriter(collection Collection, uid uuid.UUID, w http.ResponseWriter) { - image_path := fileContentPath(collection, uid) + image_path := fileContentPathUUID(collection, uid) writeFileContent(w, image_path) } diff --git a/platform/file/userfile.go b/platform/file/userfile.go index 22a270df..077eca6c 100644 --- a/platform/file/userfile.go +++ b/platform/file/userfile.go @@ -27,7 +27,7 @@ func CreateDirectories() error { } func FileContentWrite(body io.Reader, collection Collection, uid uuid.UUID) error { // Create file in configured directory - filepath := fileContentPath(collection, uid) + filepath := fileContentPathUUID(collection, uid) dst, err := os.Create(filepath) if err != nil { log.Error().Err(err).Str("filepath", filepath).Msg("Failed to create upload file") @@ -45,6 +45,6 @@ func FileContentWrite(body io.Reader, collection Collection, uid uuid.UUID) erro } func NewFileReader(collection Collection, uid uuid.UUID) (io.Reader, error) { - path := fileContentPath(collection, uid) + path := fileContentPathUUID(collection, uid) return os.Open(path) } diff --git a/platform/mailer/mailer.go b/platform/mailer/mailer.go index b67cb388..7457cc0d 100644 --- a/platform/mailer/mailer.go +++ b/platform/mailer/mailer.go @@ -1,11 +1,19 @@ package mailer import ( + "bytes" "context" "fmt" + "time" "github.com/Gleipnir-Technology/bob" + "github.com/Gleipnir-Technology/nidus-sync/config" "github.com/Gleipnir-Technology/nidus-sync/db/models" + "github.com/Gleipnir-Technology/nidus-sync/platform/file" + "github.com/Gleipnir-Technology/nidus-sync/platform/pdf" + "github.com/aarondl/opt/omit" + "github.com/google/uuid" + lob "github.com/lob/lob-go" "github.com/rs/zerolog/log" ) @@ -15,5 +23,118 @@ func ComplianceSend(ctx context.Context, txn bob.Executor, row_id int32) error { return fmt.Errorf("find compliance report: %w", err) } log.Debug().Int32("id", row_id).Str("public_id", compliance_req.PublicID).Msg("working on mailer") + + if compliance_req.LeadID.IsNull() { + return fmt.Errorf("no lead for compliance req %d", compliance_req.ID) + } + lead_id := compliance_req.LeadID.MustGet() + lead, err := models.FindLead(ctx, txn, lead_id) + if err != nil { + return fmt.Errorf("find lead: %w", err) + } + + if lead.SiteID.IsNull() { + return fmt.Errorf("no site for lead %d", lead.ID) + } + site_id := lead.SiteID.MustGet() + site, err := models.FindSite(ctx, txn, site_id) + if err != nil { + return fmt.Errorf("find site: %w", err) + } + + address, err := models.FindAddress(ctx, txn, site.AddressID) + if err != nil { + return fmt.Errorf("find address: %w", err) + } + + organization, err := models.FindOrganization(ctx, txn, site.OrganizationID) + if err != nil { + return fmt.Errorf("find address: %w", err) + } + if organization.LobAddressID.IsNull() { + return fmt.Errorf("organization %d has no Lob Address ID", organization.ID) + } + + content, err := pdf.GeneratePDF(ctx, compliance_req.PublicID) + if err != nil { + return fmt.Errorf("generate pdf: %w", err) + } + err = file.MailerFromReader(compliance_req.PublicID, bytes.NewReader(content)) + if err != nil { + return fmt.Errorf("save pdf: %w", err) + } + + // Do the part where we actually send to the mailer service + if organization.LobAddressID.IsNull() { + return fmt.Errorf("lob address for %d is null", organization.ID) + } + lob_address := organization.LobAddressID.MustGet() + letter, err := sendMail(ctx, lob_address, compliance_req.PublicID, site, address) + if err != nil { + return fmt.Errorf("send mail: %w", err) + } + + mailer_uuid, err := uuid.NewUUID() + if err != nil { + return fmt.Errorf("generate uuid: %w", err) + } + mailer, err := models.CommsMailers.Insert(&models.CommsMailerSetter{ + AddressID: omit.From(address.ID), + Created: omit.From(time.Now()), + ExternalID: omit.From(letter.Id), + // ID + Recipient: omit.From(site.OwnerName), + UUID: omit.From(mailer_uuid), + }).One(ctx, txn) + if err != nil { + return fmt.Errorf("create comms mailer: %w", err) + } + + crrm, err := models.ComplianceReportRequestMailers.Insert(&models.ComplianceReportRequestMailerSetter{ + ComplianceReportRequestID: omit.From(compliance_req.ID), + // ID + MailerID: omit.From(mailer.ID), + }).One(ctx, txn) + if err != nil { + return fmt.Errorf("create crrm: %w", err) + } + log.Info().Int32("id", crrm.ID).Msg("Created compliance report request mailer") return nil } + +func sendMail(ctx context.Context, org_address_id string, public_id string, site *models.Site, address *models.Address) (*lob.Letter, error) { + ctx_lob := context.WithValue(ctx, lob.ContextBasicAuth, lob.BasicAuth{UserName: config.LobAPIKey}) + config := lob.NewConfiguration() + client := lob.NewAPIClient(config) + + from_addr, _, err := client.AddressesApi.Get(ctx_lob, org_address_id).Execute() + if err != nil { + return nil, fmt.Errorf("get from address '%s': %w", org_address_id) + } + + var to_addr = *lob.NewAddressEditable() + line1 := address.Number + " " + address.Street + to_addr.SetAddressLine1(line1) + to_addr.SetAddressLine2("") + to_addr.SetAddressCity(address.Locality) + to_addr.SetAddressState(address.Region) + to_addr.SetAddressZip(address.PostalCode) + to_addr.SetAddressCountry(lob.COUNTRYEXTENDED_US) + addr_desc := fmt.Sprintf("site %d - %s", site.ID, site.OwnerName) + to_addr.SetDescription(addr_desc) + to_addr.SetName(site.OwnerName) + + var use_type lob.LtrUseType = lob.LTRUSETYPE_OPERATIONAL + + content_path := file.MailerPath(public_id) + var ltr = lob.NewLetterEditable(true, to_addr, from_addr, content_path, *lob.NewNullableLtrUseType(&use_type)) + desc := fmt.Sprintf("Compliance request %s", public_id) + ltr.SetDescription(desc) + result, _, err := client.LettersApi.Create(ctx_lob).LetterEditable(*ltr).Execute() + + if err != nil { + return nil, fmt.Errorf("create letter: %w", err) + } + log.Info().Str("id", result.Id).Msg("Created Lob letter") + return result, nil +} diff --git a/platform/subprocess/audio.go b/platform/subprocess/audio.go index 845c6768..e5f91be0 100644 --- a/platform/subprocess/audio.go +++ b/platform/subprocess/audio.go @@ -13,11 +13,11 @@ import ( func fileContentPathAudioNormalized(u uuid.UUID) string { //destination := AudioFileContentPathNormalized(audioUUID.String()) - return file.ContentPath(file.CollectionAudioNormalized, u) + return file.ContentPathUUID(file.CollectionAudioNormalized, u) } func NormalizeAudio(audioUUID uuid.UUID) error { //source := AudioFileContentPathRaw(audioUUID.String()) - source := file.ContentPath(file.CollectionAudioRaw, audioUUID) + source := file.ContentPathUUID(file.CollectionAudioRaw, audioUUID) _, err := os.Stat(source) if errors.Is(err, os.ErrNotExist) { log.Warn().Str("source", source).Msg("file doesn't exist, skipping normalization") @@ -47,7 +47,7 @@ func TranscodeToOgg(audioUUID uuid.UUID) error { } log.Info().Str("source", source).Msg("Transcoding to ogg") //destination := userfile.AudioFileContentPathOgg(audioUUID.String()) - destination := file.ContentPath(file.CollectionAudioTranscoded, audioUUID) + destination := file.ContentPathUUID(file.CollectionAudioTranscoded, audioUUID) // Use "ffmpeg" directly, assuming it's in the system PATH cmd := exec.Command("ffmpeg", "-i", source, "-vn", "-acodec", "libvorbis", destination) out, err := cmd.CombinedOutput() diff --git a/platform/tile.go b/platform/tile.go index bffc0f5e..52ff0117 100644 --- a/platform/tile.go +++ b/platform/tile.go @@ -28,76 +28,19 @@ import ( var emptyTileFS embed.FS func GetTile(ctx context.Context, w http.ResponseWriter, org Organization, z, y, x uint) error { - if org.model.ArcgisMapServiceID.IsNull() { - return fmt.Errorf("no map service ID set") - } - map_service_id := org.model.ArcgisMapServiceID.MustGet() - tile_path := tilePath(map_service_id, z, y, x) - tile_row, err := models.TileCachedImages.Query( - models.SelectWhere.TileCachedImages.ArcgisID.EQ(map_service_id), - models.SelectWhere.TileCachedImages.X.EQ(int32(x)), - models.SelectWhere.TileCachedImages.Y.EQ(int32(y)), - models.SelectWhere.TileCachedImages.Z.EQ(int32(z)), - ).One(ctx, db.PGInstance.BobDB) - if err == nil { - var tile *TileRaster - if tile_row.IsEmpty { - tile = TileRasterPlaceholder() - } else { - tile, err = loadTileFromDisk(tile_path) - if err != nil { - return fmt.Errorf("load tile from disk: %w", err) - } - } - log.Debug().Uint("z", z).Uint("y", y).Uint("x", x).Bool("is empty", tile_row.IsEmpty).Msg("tile from cache") - return writeTile(w, tile) - } - if err.Error() != "sql: no rows in result set" { - return fmt.Errorf("query db: %w", err) - } - image, err := ImageAtTile(ctx, org.model, uint(z), uint(y), uint(x)) - if err != nil { - return fmt.Errorf("image at tile: %w", err) - } - if !image.IsPlaceholder { - err = saveTileToDisk(image, tile_path) - if err != nil { - return fmt.Errorf("save tile: %w", err) - } - } - _, err = models.TileCachedImages.Insert(&models.TileCachedImageSetter{ - ArcgisID: omit.From(map_service_id), - X: omit.From(int32(x)), - Y: omit.From(int32(y)), - Z: omit.From(int32(z)), - IsEmpty: omit.From(image.IsPlaceholder), - }).One(ctx, db.PGInstance.BobDB) - if err != nil { - return fmt.Errorf("save to db: %w", err) - } - log.Debug().Uint("z", z).Uint("y", y).Uint("x", x).Bool("placeholder", image.IsPlaceholder).Msg("caching tile") - return writeTile(w, image) + return getTile(ctx, w, org.model, z, y, x) } func ImageAtPoint(ctx context.Context, org Organization, level uint, lat, lng float64) (*TileRaster, error) { - fssync, err := getFieldseeker(ctx, org.model) + return imageAtPoint(ctx, org.model, level, lat, lng) +} + +func WriteTile(ctx context.Context, w http.ResponseWriter, org *models.Organization, level uint, lat, lng float64) error { + image, err := imageAtPoint(ctx, org, level, lat, lng) if err != nil { - return nil, fmt.Errorf("create fssync: %w", err) + return fmt.Errorf("image at point: %w", err) } - map_service, err := aerialImageService(ctx, fssync.Arcgis) - if err != nil { - return nil, fmt.Errorf("no map service: %w", err) - } - data, e := map_service.TileGPS(ctx, level, lat, lng) - if e != nil { - return nil, fmt.Errorf("tilegps: %w", e) - } - if len(data) == 0 { - return TileRasterPlaceholder(), nil - } - return &TileRaster{ - Content: data, - IsPlaceholder: false, - }, nil + writeTile(w, image) + return nil } // Writes a random tile from the cache. This is a very odd thing to do, it's for testing @@ -123,6 +66,78 @@ func WriteTileRandom(ctx context.Context, w http.ResponseWriter) error { log.Debug().Int32("z", tile_row.Z).Int32("y", tile_row.Y).Int32("x", tile_row.X).Bool("is empty", tile_row.IsEmpty).Msg("random tile") return writeTile(w, tile) } +func getTile(ctx context.Context, w http.ResponseWriter, org *models.Organization, z, y, x uint) error { + if org.ArcgisMapServiceID.IsNull() { + return fmt.Errorf("no map service ID set") + } + map_service_id := org.ArcgisMapServiceID.MustGet() + tile_path := tilePath(map_service_id, z, y, x) + tile_row, err := models.TileCachedImages.Query( + models.SelectWhere.TileCachedImages.ArcgisID.EQ(map_service_id), + models.SelectWhere.TileCachedImages.X.EQ(int32(x)), + models.SelectWhere.TileCachedImages.Y.EQ(int32(y)), + models.SelectWhere.TileCachedImages.Z.EQ(int32(z)), + ).One(ctx, db.PGInstance.BobDB) + if err == nil { + var tile *TileRaster + if tile_row.IsEmpty { + tile = TileRasterPlaceholder() + } else { + tile, err = loadTileFromDisk(tile_path) + if err != nil { + return fmt.Errorf("load tile from disk: %w", err) + } + } + log.Debug().Uint("z", z).Uint("y", y).Uint("x", x).Bool("is empty", tile_row.IsEmpty).Msg("tile from cache") + return writeTile(w, tile) + } + if err.Error() != "sql: no rows in result set" { + return fmt.Errorf("query db: %w", err) + } + image, err := ImageAtTile(ctx, org, uint(z), uint(y), uint(x)) + if err != nil { + return fmt.Errorf("image at tile: %w", err) + } + if !image.IsPlaceholder { + err = saveTileToDisk(image, tile_path) + if err != nil { + return fmt.Errorf("save tile: %w", err) + } + } + _, err = models.TileCachedImages.Insert(&models.TileCachedImageSetter{ + ArcgisID: omit.From(map_service_id), + X: omit.From(int32(x)), + Y: omit.From(int32(y)), + Z: omit.From(int32(z)), + IsEmpty: omit.From(image.IsPlaceholder), + }).One(ctx, db.PGInstance.BobDB) + if err != nil { + return fmt.Errorf("save to db: %w", err) + } + log.Debug().Uint("z", z).Uint("y", y).Uint("x", x).Bool("placeholder", image.IsPlaceholder).Msg("caching tile") + return writeTile(w, image) +} +func imageAtPoint(ctx context.Context, org *models.Organization, level uint, lat, lng float64) (*TileRaster, error) { + fssync, err := getFieldseeker(ctx, org) + if err != nil { + return nil, fmt.Errorf("create fssync: %w", err) + } + map_service, err := aerialImageService(ctx, fssync.Arcgis) + if err != nil { + return nil, fmt.Errorf("no map service: %w", err) + } + data, e := map_service.TileGPS(ctx, level, lat, lng) + if e != nil { + return nil, fmt.Errorf("tilegps: %w", e) + } + if len(data) == 0 { + return TileRasterPlaceholder(), nil + } + return &TileRaster{ + Content: data, + IsPlaceholder: false, + }, nil +} func loadTileFromDisk(tile_path string) (*TileRaster, error) { file, err := os.Open(tile_path) if err != nil { diff --git a/resource/compliance.go b/resource/compliance.go index 24794c33..8a25bdd8 100644 --- a/resource/compliance.go +++ b/resource/compliance.go @@ -2,9 +2,16 @@ package resource import ( "context" + "fmt" + "net/http" + + "github.com/Gleipnir-Technology/nidus-sync/db" + "github.com/Gleipnir-Technology/nidus-sync/db/models" nhttp "github.com/Gleipnir-Technology/nidus-sync/http" "github.com/Gleipnir-Technology/nidus-sync/platform" - "net/http" + "github.com/Gleipnir-Technology/nidus-sync/platform/types" + "github.com/gorilla/mux" + "github.com/rs/zerolog/log" ) func ComplianceRequest(r *router) *complianceRequestR { @@ -32,3 +39,73 @@ func (res *complianceRequestR) CreateMailer(ctx context.Context, r *http.Request ID: id, }, nil } +func (res *complianceRequestR) ImagePoolGet(w http.ResponseWriter, r *http.Request) { + vars := mux.Vars(r) + public_id := vars["public_id"] + if public_id == "" { + http.Error(w, "need public ID", http.StatusNotFound) + return + } + + ctx := r.Context() + err := imagePoolGet(ctx, w, public_id) + if err != nil { + log.Error().Err(err).Msg("failed to get image") + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } +} + +func imagePoolGet(ctx context.Context, w http.ResponseWriter, public_id string) error { + txn := db.PGInstance.BobDB + compliance_req, err := models.ComplianceReportRequests.Query( + models.SelectWhere.ComplianceReportRequests.PublicID.EQ(public_id), + ).One(ctx, txn) + if err != nil { + return fmt.Errorf("find compliance report: %w", err) + } + + if compliance_req.LeadID.IsNull() { + return fmt.Errorf("no lead for compliance req %d", compliance_req.ID) + } + lead_id := compliance_req.LeadID.MustGet() + lead, err := models.FindLead(ctx, txn, lead_id) + if err != nil { + return fmt.Errorf("find lead: %w", err) + } + + if lead.SiteID.IsNull() { + return fmt.Errorf("no site for lead %d", lead.ID) + } + site_id := lead.SiteID.MustGet() + site, err := models.FindSite(ctx, txn, site_id) + if err != nil { + return fmt.Errorf("find site: %w", err) + } + organization, err := models.FindOrganization(ctx, txn, site.OrganizationID) + if err != nil { + return fmt.Errorf("find address: %w", err) + } + features, err := platform.FeaturesForSite(ctx, site.ID) + if err != nil { + return fmt.Errorf("get features: %w", err) + } + log.Debug().Int("len", len(features)).Int32("site", site.ID).Msg("got features for site") + var pool_feature *types.Feature + for _, f := range features { + if f.Type == "pool" { + pool_feature = &f + } + } + if pool_feature == nil { + return fmt.Errorf("no pool feature") + } + + level := uint(15) + err = platform.WriteTile(ctx, w, organization, level, pool_feature.Location.Latitude, pool_feature.Location.Longitude) + if err != nil { + return fmt.Errorf("write tile at %d, %f %f: %w", level, pool_feature.Location.Longitude, pool_feature.Location.Latitude, err) + } + w.WriteHeader(http.StatusOK) + return nil +}