Only count publicreports that haven't been reviewed

This commit is contained in:
Eli Ribble 2026-03-14 16:58:25 +00:00
parent a20c8918f8
commit 94b2ff2e21
No known key found for this signature in database

View file

@ -111,15 +111,19 @@ func NotificationCountsForUser(ctx context.Context, u User) (*UserNotificationCo
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get home notification count: %w", err) return nil, fmt.Errorf("Failed to get home notification count: %w", err)
} }
count_nuisance, err := u.Organization.model.Nuisances().Count(ctx, db.PGInstance.BobDB) count_nuisance, err := u.Organization.model.Nuisances(
models.SelectWhere.PublicreportNuisances.Reviewed.IsNull(),
).Count(ctx, db.PGInstance.BobDB)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get nuisance notification count: %w", err) return nil, fmt.Errorf("Failed to get nuisance notification count: %w", err)
} }
count_water, err := u.Organization.model.Waters().Count(ctx, db.PGInstance.BobDB) count_water, err := u.Organization.model.Waters(
models.SelectWhere.PublicreportWaters.Reviewed.IsNull(),
).Count(ctx, db.PGInstance.BobDB)
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to get water notification count: %w", err) return nil, fmt.Errorf("Failed to get water notification count: %w", err)
} }
//log.Debug().Int64("nuisance", count_nuisance).Int64("water", count_water).Int64("home", count_home).Int("user", u.ID).Msg("calculated notification counts") log.Debug().Int64("nuisance", count_nuisance).Int64("water", count_water).Int64("home", count_home).Int("user", u.ID).Msg("calculated notification counts")
return &UserNotificationCounts{ return &UserNotificationCounts{
Communications: uint(count_nuisance + count_water), Communications: uint(count_nuisance + count_water),
Home: uint(count_home), Home: uint(count_home),