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

Set organization (district) for compliance reports from mailer

Browse source
This commit is contained in:
Eli Ribble 2026-04-22 19:54:06 +00:00
parent 78458760ec
commit b5923137a7
No known key found for this signature in database
3 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
platform/compliance.go
View file

@ -6,6 +6,7 @@ import (
"strconv"
"time"
"github.com/Gleipnir-Technology/bob"
"github.com/Gleipnir-Technology/bob/dialect/psql"
"github.com/Gleipnir-Technology/bob/dialect/psql/sm"
"github.com/Gleipnir-Technology/nidus-sync/db"
@ -16,6 +17,7 @@ import (
"github.com/aarondl/opt/omit"
"github.com/aarondl/opt/omitnull"
//"github.com/rs/zerolog/log"
"github.com/stephenafamo/scan"
)
func ComplianceRequestMailerCreate(ctx context.Context, user User, site_id int32) (int32, error) {
@ -133,3 +135,23 @@ func ComplianceReportRequestFromPublicID(ctx context.Context, public_id string)
}
return types.ComplianceReportRequestFromModel(row), nil
}
func OrganizationIDForComplianceReportRequest(ctx context.Context, public_id string) (int32, error) {
type _Row struct {
ID int32 `db:"organization_id"`
}
row, err := bob.One(ctx, db.PGInstance.BobDB, psql.Select(
sm.Columns(
models.Sites.Columns.OrganizationID,
),
sm.From(models.ComplianceReportRequests.NameAs()),
sm.InnerJoin(models.Leads.NameAs()).On(
models.ComplianceReportRequests.Columns.LeadID.EQ(models.Leads.Columns.ID)),
sm.InnerJoin(models.Sites.NameAs()).On(
models.Leads.Columns.SiteID.EQ(models.Sites.Columns.ID)),
sm.Where(models.ComplianceReportRequests.Columns.PublicID.EQ(psql.Arg(public_id))),
), scan.StructMapper[_Row]())
if err != nil {
return 0, fmt.Errorf("query compliance report request")
}
return row.ID, nil
}

3
platform/publicreport/compliance.go
View file

@ -29,7 +29,8 @@ func compliance(ctx context.Context, public_id string, report *types.PublicRepor
models.PublicreportCompliances.Columns.ReportPhoneCanText,
models.PublicreportCompliances.Columns.WantsScheduled,
),
sm.From(psql.Quote("publicreport", "compliance")).As("publicreport.compliance"),
//sm.From(psql.Quote("publicreport", "compliance")).As("publicreport.compliance"),
sm.From(models.PublicreportCompliances.NameAs()),
sm.Where(models.PublicreportCompliances.Columns.ReportID.EQ(
psql.Arg(report.ID),
)),