Skip to content

Commit 01409ca

Browse files
mtojekmtojek
committed
WIP
1 parent f115973 commit 01409ca

File tree

12 files changed

+76
-2453
lines changed

12 files changed

+76
-2453
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,11 +1144,11 @@ func (q *querier) DeleteOldProvisionerDaemons(ctx context.Context) error {
11441144
return q.db.DeleteOldProvisionerDaemons(ctx)
11451145
}
11461146

1147-
func (q *querier) DeleteOldReportGeneratorLogs(ctx context.Context, arg database.DeleteOldReportGeneratorLogsParams) error {
1147+
func (q *querier) DeleteOldNotificationReportGeneratorLogs(ctx context.Context, arg database.DeleteOldNotificationReportGeneratorLogsParams) error {
11481148
if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceSystem); err != nil {
11491149
return err
11501150
}
1151-
return q.db.DeleteOldReportGeneratorLogs(ctx, arg)
1151+
return q.db.DeleteOldNotificationReportGeneratorLogs(ctx, arg)
11521152
}
11531153

11541154
func (q *querier) DeleteOldWorkspaceAgentLogs(ctx context.Context, threshold time.Time) error {
@@ -1877,11 +1877,11 @@ func (q *querier) GetReplicasUpdatedAfter(ctx context.Context, updatedAt time.Ti
18771877
return q.db.GetReplicasUpdatedAfter(ctx, updatedAt)
18781878
}
18791879

1880-
func (q *querier) GetReportGeneratorLogByUserAndTemplate(ctx context.Context, arg database.GetReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {
1880+
func (q *querier) GetNotificationReportGeneratorLogByUserAndTemplate(ctx context.Context, arg database.GetNotificationReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {
18811881
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
18821882
return database.ReportGeneratorLog{}, err
18831883
}
1884-
return q.db.GetReportGeneratorLogByUserAndTemplate(ctx, arg)
1884+
return q.db.GetNotificationReportGeneratorLogByUserAndTemplate(ctx, arg)
18851885
}
18861886

18871887
func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
@@ -3964,11 +3964,11 @@ func (q *querier) UpsertProvisionerDaemon(ctx context.Context, arg database.Upse
39643964
return q.db.UpsertProvisionerDaemon(ctx, arg)
39653965
}
39663966

3967-
func (q *querier) UpsertReportGeneratorLog(ctx context.Context, arg database.UpsertReportGeneratorLogParams) error {
3967+
func (q *querier) UpsertNotificationReportGeneratorLog(ctx context.Context, arg database.UpsertNotificationReportGeneratorLogParams) error {
39683968
if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
39693969
return err
39703970
}
3971-
return q.db.UpsertReportGeneratorLog(ctx, arg)
3971+
return q.db.UpsertNotificationReportGeneratorLog(ctx, arg)
39723972
}
39733973

39743974
func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2735,8 +2735,8 @@ func (s *MethodTestSuite) TestSystemFunctions() {
27352735
Value: "value",
27362736
}).Asserts(rbac.ResourceSystem, policy.ActionCreate)
27372737
}))
2738-
s.Run("DeleteOldReportGeneratorLogs", s.Subtest(func(db database.Store, check *expects) {
2739-
check.Args(database.DeleteOldReportGeneratorLogsParams{
2738+
s.Run("DeleteOldNotificationReportGeneratorLogs", s.Subtest(func(db database.Store, check *expects) {
2739+
check.Args(database.DeleteOldNotificationReportGeneratorLogsParams{
27402740
Before: dbtime.Now(),
27412741
NotificationTemplateID: uuid.New(),
27422742
}).Asserts(rbac.ResourceSystem, policy.ActionDelete)
@@ -2747,23 +2747,23 @@ func (s *MethodTestSuite) TestSystemFunctions() {
27472747
Since: dbtime.Now(),
27482748
}).Asserts(rbac.ResourceSystem, policy.ActionRead)
27492749
}))
2750-
s.Run("GetReportGeneratorLogByUserAndTemplate", s.Subtest(func(db database.Store, check *expects) {
2750+
s.Run("GetNotificationReportGeneratorLogByUserAndTemplate", s.Subtest(func(db database.Store, check *expects) {
27512751
u := dbgen.User(s.T(), db, database.User{})
2752-
_ = db.UpsertReportGeneratorLog(context.Background(), database.UpsertReportGeneratorLogParams{
2752+
_ = db.UpsertNotificationReportGeneratorLog(context.Background(), database.UpsertNotificationReportGeneratorLogParams{
27532753
UserID: u.ID,
27542754
NotificationTemplateID: notifications.TemplateWorkspaceBuildsFailedReport,
27552755
LastGeneratedAt: dbtime.Now(),
27562756
})
2757-
check.Args(database.GetReportGeneratorLogByUserAndTemplateParams{
2757+
check.Args(database.GetNotificationReportGeneratorLogByUserAndTemplateParams{
27582758
UserID: u.ID,
27592759
NotificationTemplateID: notifications.TemplateWorkspaceBuildsFailedReport,
27602760
}).Asserts(rbac.ResourceSystem, policy.ActionRead)
27612761
}))
27622762
s.Run("GetWorkspaceBuildStatsByTemplates", s.Subtest(func(db database.Store, check *expects) {
27632763
check.Args(dbtime.Now()).Asserts(rbac.ResourceSystem, policy.ActionRead)
27642764
}))
2765-
s.Run("UpsertReportGeneratorLog", s.Subtest(func(db database.Store, check *expects) {
2766-
check.Args(database.UpsertReportGeneratorLogParams{
2765+
s.Run("UpsertNotificationReportGeneratorLog", s.Subtest(func(db database.Store, check *expects) {
2766+
check.Args(database.UpsertNotificationReportGeneratorLogParams{
27672767
UserID: uuid.New(),
27682768
NotificationTemplateID: uuid.New(),
27692769
LastGeneratedAt: dbtime.Now(),

‎coderd/database/dbmem/dbmem.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,7 +1709,7 @@ func (q *FakeQuerier) DeleteOldProvisionerDaemons(_ context.Context) error {
17091709
return nil
17101710
}
17111711

1712-
func (q *FakeQuerier) DeleteOldReportGeneratorLogs(_ context.Context, params database.DeleteOldReportGeneratorLogsParams) error {
1712+
func (q *FakeQuerier) DeleteOldNotificationReportGeneratorLogs(_ context.Context, params database.DeleteOldNotificationReportGeneratorLogsParams) error {
17131713
q.mutex.Lock()
17141714
defer q.mutex.Unlock()
17151715

@@ -3603,7 +3603,7 @@ func (q *FakeQuerier) GetReplicasUpdatedAfter(_ context.Context, updatedAt time.
36033603
return replicas, nil
36043604
}
36053605

3606-
func (q *FakeQuerier) GetReportGeneratorLogByUserAndTemplate(_ context.Context, arg database.GetReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {
3606+
func (q *FakeQuerier) GetNotificationReportGeneratorLogByUserAndTemplate(_ context.Context, arg database.GetNotificationReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {
36073607
err := validateDatabaseType(arg)
36083608
if err != nil {
36093609
return database.ReportGeneratorLog{}, err
@@ -9429,7 +9429,7 @@ func (q *FakeQuerier) UpsertProvisionerDaemon(_ context.Context, arg database.Up
94299429
return d, nil
94309430
}
94319431

9432-
func (q *FakeQuerier) UpsertReportGeneratorLog(_ context.Context, arg database.UpsertReportGeneratorLogParams) error {
9432+
func (q *FakeQuerier) UpsertNotificationReportGeneratorLog(_ context.Context, arg database.UpsertNotificationReportGeneratorLogParams) error {
94339433
err := validateDatabaseType(arg)
94349434
if err != nil {
94359435
return err

‎coderd/database/dbmetrics/dbmetrics.go

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

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/migrations/migrate_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ func TestMigrateUpWithFixtures(t *testing.T) {
268268
"template_version_variables",
269269
"dbcrypt_keys", // having zero rows is a valid state for this table
270270
"template_version_workspace_tags",
271-
"report_generator_logs",
271+
"notification_report_generator_logs",
272272
}
273273
s := &tableStats{s: make(map[string]int)}
274274

‎coderd/database/querier.go

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

0 commit comments

Comments
 (0)