Skip to content

Commit afad1c1

Browse files
mtojekmtojek
committed
WIP
1 parent 8e8ab49 commit afad1c1

File tree

6 files changed

+12
-14
lines changed

6 files changed

+12
-14
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,11 +1713,9 @@ func (q *FakeQuerier) DeleteOldReportGeneratorLogs(_ context.Context, params dat
17131713
q.mutex.Lock()
17141714
defer q.mutex.Unlock()
17151715

1716-
now := dbtime.Now()
1717-
17181716
var validLogs []database.ReportGeneratorLog
17191717
for _, record := range q.reportGeneratorLogs {
1720-
if record.NotificationTemplateID != params.NotificationTemplateID || record.LastGeneratedAt.Before(now.Add(-time.Duration(params.FrequencyDays)*24*time.Hour)) {
1718+
if record.NotificationTemplateID != params.NotificationTemplateID || record.LastGeneratedAt.Before(params.Before) {
17211719
validLogs = append(validLogs, record)
17221720
}
17231721
}

‎coderd/database/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/notifications.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,5 +191,5 @@ ON CONFLICT (user_id, notification_template_id) DO UPDATE set last_generated_at
191191
WHERE report_generator_logs.user_id = EXCLUDED.user_id AND report_generator_logs.notification_template_id = EXCLUDED.notification_template_id;
192192

193193
-- name: DeleteOldReportGeneratorLogs :exec
194-
-- Delete report generator logs that have been created at least a <frequency_days> +1h ago.
195-
DELETE FROM report_generator_logs WHERE last_generated_at < (NOW() - CONCAT(@frequency_days::int, ' days')::interval - INTERVAL '1 hour') AND notification_template_id = @notification_template_id;
194+
-- Delete report generator logs that have been created at least a @before date.
195+
DELETE FROM report_generator_logs WHERE last_generated_at < @before::timestamptz AND notification_template_id = @notification_template_id;

‎coderd/notifications/reports/generator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func reportFailedWorkspaceBuilds(ctx context.Context, logger slog.Logger, db dat
197197

198198
err = db.DeleteOldReportGeneratorLogs(ctx, database.DeleteOldReportGeneratorLogsParams{
199199
NotificationTemplateID: notifications.TemplateWorkspaceBuildsFailedReport,
200-
FrequencyDays: failedWorkspaceBuildsReportFrequencyDays,
200+
Before: dbtime.Time(clk.Now().Add(-failedWorkspaceBuildsReportFrequencyDays*24*time.Hour - time.Hour)).UTC(),
201201
})
202202
if err != nil {
203203
return xerrors.Errorf("unable to delete old report generator logs: %w", err)

0 commit comments

Comments
 (0)