refac: removed ugly multi-line method chaining

This commit is contained in:
fsylvain committed 2026-10-10 20:49:05 +02:00
1 parent e8dff6bb5f
commit ce9c876db6
6 files changed
+72 -67

No files matched your search

@@ -131,21 +131,21 @@ type countsRow struct {
func (a *AuditEventRepository) countsBetween(from time.Time, to time.Time) (countsRow, error) {
var row countsRow
err := a.db.Model(&entity.AuditEvent{}).
Select("COUNT(*) AS total, "+
"COALESCE(SUM(CASE WHEN outcome = ? THEN 1 ELSE 0 END), 0) AS failed, "+
"COALESCE(SUM(CASE WHEN security = ? THEN 1 ELSE 0 END), 0) AS security", string(audit.OutcomeFailed), true).
Where("created_at >= ? AND created_at < ?", from.UTC(), to.UTC()).
Scan(&row).Error
query := a.db.Model(&entity.AuditEvent{})
query = query.Select("COUNT(*) AS total, "+
"COALESCE(SUM(CASE WHEN outcome = ? THEN 1 ELSE 0 END), 0) AS failed, "+
"COALESCE(SUM(CASE WHEN security = ? THEN 1 ELSE 0 END), 0) AS security", string(audit.OutcomeFailed), true)
query = query.Where("created_at >= ? AND created_at < ?", from.UTC(), to.UTC())
err := query.Scan(&row).Error
return row, err
}
func (a *AuditEventRepository) distinctActors(actorType audit.ActorType, from time.Time, to time.Time) (int, error) {
var count int64
err := a.db.Model(&entity.AuditEvent{}).
Where("actor_type = ? AND created_at >= ? AND created_at < ?", string(actorType), from.UTC(), to.UTC()).
Distinct("actor_id").
Count(&count).Error
query := a.db.Model(&entity.AuditEvent{})
query = query.Where("actor_type = ? AND created_at >= ? AND created_at < ?", string(actorType), from.UTC(), to.UTC())
query = query.Distinct("actor_id")
err := query.Count(&count).Error
return int(count), err
}
@@ -215,11 +215,11 @@ func (a *AuditEventRepository) DeleteOldest(limit int, before time.Time) (int, e
return 0, nil
}
var ids []uint64
err := a.db.Model(&entity.AuditEvent{}).
Where("created_at < ?", before.UTC()).
Order("created_at ASC, id ASC").
Limit(limit).
Pluck("id", &ids).Error
query := a.db.Model(&entity.AuditEvent{})
query = query.Where("created_at < ?", before.UTC())
query = query.Order("created_at ASC, id ASC")
query = query.Limit(limit)
err := query.Pluck("id", &ids).Error
if err != nil {
return 0, err
}