diff --git a/db/query/public/communication.go b/db/query/public/communication.go index e64efabc..15a36b31 100644 --- a/db/query/public/communication.go +++ b/db/query/public/communication.go @@ -15,7 +15,7 @@ func CommunicationInsert(ctx context.Context, txn db.Tx, m model.Communication) statement := table.Communication.INSERT(table.Communication.MutableColumns). MODEL(m). RETURNING(table.Communication.AllColumns) - return db.ExecuteOne[model.Communication](ctx, statement) + return db.ExecuteOneTx[model.Communication](ctx, txn, statement) } func CommunicationFromID(ctx context.Context, comm_id int64) (model.Communication, error) { statement := table.Communication.SELECT( diff --git a/db/query/publicreport/nuisance.go b/db/query/publicreport/nuisance.go index c392daca..bc097d46 100644 --- a/db/query/publicreport/nuisance.go +++ b/db/query/publicreport/nuisance.go @@ -11,7 +11,7 @@ import ( ) func NuisanceInsert(ctx context.Context, txn db.Ex, m model.Nuisance) (model.Nuisance, error) { - statement := table.Nuisance.INSERT(table.Nuisance.MutableColumns). + statement := table.Nuisance.INSERT(table.Nuisance.AllColumns). MODEL(m). RETURNING(table.Nuisance.AllColumns) return db.ExecuteOneTx[model.Nuisance](ctx, txn, statement) diff --git a/db/query/publicreport/water.go b/db/query/publicreport/water.go index 483f879d..8a4005d4 100644 --- a/db/query/publicreport/water.go +++ b/db/query/publicreport/water.go @@ -11,7 +11,7 @@ import ( ) func WaterInsert(ctx context.Context, txn db.Ex, m model.Water) (model.Water, error) { - statement := table.Water.INSERT(table.Water.MutableColumns). + statement := table.Water.INSERT(table.Water.AllColumns). MODEL(m). RETURNING(table.Water.AllColumns) return db.ExecuteOneTx[model.Water](ctx, txn, statement) diff --git a/platform/publicreport.go b/platform/publicreport.go index c2674487..8321c1b2 100644 --- a/platform/publicreport.go +++ b/platform/publicreport.go @@ -155,7 +155,7 @@ func PublicReportUpdateCompliance(ctx context.Context, public_id string, report_ return fmt.Errorf("create txn: %w", err) } defer lint.LogOnErrRollback(txn.Rollback, ctx, "rollback") - report, err := querypublicreport.ReportFromPublicID(ctx, db.PGInstance.PGXPool, public_id) + report, err := querypublicreport.ReportFromPublicID(ctx, txn, public_id) if err != nil { return fmt.Errorf("query report existence: %w", err) } @@ -170,8 +170,14 @@ func PublicReportUpdateCompliance(ctx context.Context, public_id string, report_ compliance_updates.Unset(tablepublicreport.Compliance.Submitted) } else { comm := model.Communication{ - OrganizationID: report.OrganizationID, - SourceReportID: &report.ID, + Created: time.Now(), + OrganizationID: report.OrganizationID, + ResponseEmailLogID: nil, + ResponseTextLogID: nil, + SourceEmailLogID: nil, + SourceReportID: &report.ID, + SourceTextLogID: nil, + Status: model.Communicationstatus_New, } comm, err = querypublic.CommunicationInsert(ctx, txn, comm) if err != nil { @@ -404,8 +410,15 @@ func publicReportCreate(ctx context.Context, setter_report modelpublicreport.Rep report_type := setter_report.ReportType if report_type != modelpublicreport.Reporttype_Compliance { comm := model.Communication{ - OrganizationID: result.OrganizationID, - SourceReportID: &result.ID, + Created: time.Now(), + + OrganizationID: result.OrganizationID, + ResponseEmailLogID: nil, + ResponseTextLogID: nil, + SourceEmailLogID: nil, + SourceReportID: &result.ID, + SourceTextLogID: nil, + Status: model.Communicationstatus_New, } comm, err = querypublic.CommunicationInsert(ctx, txn, comm) if err != nil {