WIP

mtojek · mtojek · commit 5215c92f966c · 2024-09-17T11:54:16.000+02:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3002,8 +3002,8 @@ func (q *FakeQuerier) GetNotificationMessagesByStatus(_ context.Context, arg dat
 	return out, nil
 }
 
-func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Context, arg uuid.UUID) (database.NotificationReportGeneratorLog, error) {
-	err := validateDatabaseType(arg)
+func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Context, templateID uuid.UUID) (database.NotificationReportGeneratorLog, error) {
+	err := validateDatabaseType(templateID)
 	if err != nil {
 		return database.NotificationReportGeneratorLog{}, err
 	}
@@ -3012,7 +3012,7 @@ func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Cont
 	defer q.mutex.RUnlock()
 
 	for _, record := range q.notificationReportGeneratorLogs {
-		if record.UserID == arg.UserID && record.NotificationTemplateID == arg.NotificationTemplateID {
+		if record.NotificationTemplateID == templateID {
 			return record, nil
 		}
 	}
diff --git a/coderd/database/queries/notifications.sql b/coderd/database/queries/notifications.sql
@@ -182,7 +182,7 @@ SELECT
 FROM
 	notification_report_generator_logs
 WHERE
-	notification_template_id = $1;
+	notification_template_id = @template_id::uuid;
 
 -- name: UpsertNotificationReportGeneratorLog :exec
 -- Insert or update notification report generator logs with recent activity.
diff --git a/coderd/notifications/reports/generator.go b/coderd/notifications/reports/generator.go
@@ -137,10 +137,7 @@ func reportFailedWorkspaceBuilds(ctx context.Context, logger slog.Logger, db dat
 		}
 
 		for _, templateAdmin := range templateAdmins {
-			reportLog, err := db.GetNotificationReportGeneratorLogByTemplate(ctx, database.GetNotificationReportGeneratorLogByTemplateParams{
-				UserID:                 templateAdmin.ID,
-				NotificationTemplateID: notifications.TemplateWorkspaceBuildsFailedReport,
-			})
+			reportLog, err := db.GetNotificationReportGeneratorLogByTemplate(ctx, notifications.TemplateWorkspaceBuildsFailedReport)
 			if err != nil && !xerrors.Is(err, sql.ErrNoRows) { // sql.ErrNoRows: report not generated yet
 				continue
 			}
@@ -178,7 +175,6 @@ func reportFailedWorkspaceBuilds(ctx context.Context, logger slog.Logger, db dat
 
 	for u := range processedUsers {
 		err = db.UpsertNotificationReportGeneratorLog(ctx, database.UpsertNotificationReportGeneratorLogParams{
-			UserID:                 u,
 			NotificationTemplateID: notifications.TemplateWorkspaceBuildsFailedReport,
 			LastGeneratedAt:        dbtime.Time(now).UTC(),
 		})

Original file line number	Diff line number	Diff line change
`@@ -3002,8 +3002,8 @@ func (q *FakeQuerier) GetNotificationMessagesByStatus(_ context.Context, arg dat`
`3002`	`3002`	`return out, nil`
`3003`	`3003`	`}`
`3004`	`3004`
`3005`		`-func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Context, arg uuid.UUID) (database.NotificationReportGeneratorLog, error) {`
`3006`		`- err := validateDatabaseType(arg)`
	`3005`	`+func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Context, templateID uuid.UUID) (database.NotificationReportGeneratorLog, error) {`
	`3006`	`+ err := validateDatabaseType(templateID)`
`3007`	`3007`	`if err != nil {`
`3008`	`3008`	`return database.NotificationReportGeneratorLog{}, err`
`3009`	`3009`	`}`
`@@ -3012,7 +3012,7 @@ func (q *FakeQuerier) GetNotificationReportGeneratorLogByTemplate(_ context.Cont`
`3012`	`3012`	`defer q.mutex.RUnlock()`
`3013`	`3013`
`3014`	`3014`	`for _, record := range q.notificationReportGeneratorLogs {`
`3015`		`- if record.UserID == arg.UserID && record.NotificationTemplateID == arg.NotificationTemplateID {`
	`3015`	`+ if record.NotificationTemplateID == templateID {`
`3016`	`3016`	`return record, nil`
`3017`	`3017`	`}`
`3018`	`3018`	`}`