Skip to content

Commit 8556c38

Browse files
dannykoppingdannykopping
committed
Add preferences queries
Signed-off-by: Danny Kopping <danny@coder.com>
1 parent 3ac40be commit 8556c38

File tree

17 files changed

+445
-67
lines changed

17 files changed

+445
-67
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/apidoc/swagger.json

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

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,6 +1474,13 @@ func (q *querier) GetNotificationMessagesByStatus(ctx context.Context, arg datab
14741474
return q.db.GetNotificationMessagesByStatus(ctx, arg)
14751475
}
14761476

1477+
func (q *querier) GetNotificationTemplateById(ctx context.Context, id uuid.UUID) (database.NotificationTemplate, error) {
1478+
if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceNotificationTemplate); err != nil {
1479+
return database.NotificationTemplate{}, err
1480+
}
1481+
return q.db.GetNotificationTemplateById(ctx, id)
1482+
}
1483+
14771484
func (q *querier) GetNotificationsSettings(ctx context.Context) (string, error) {
14781485
// No authz checks
14791486
return q.db.GetNotificationsSettings(ctx)
@@ -2085,6 +2092,13 @@ func (q *querier) GetUserLinksByUserID(ctx context.Context, userID uuid.UUID) ([
20852092
return q.db.GetUserLinksByUserID(ctx, userID)
20862093
}
20872094

2095+
func (q *querier) GetUserNotificationPreferences(ctx context.Context, userID uuid.UUID) ([]database.NotificationPreference, error) {
2096+
if err := q.authorizeContext(ctx, policy.ActionReadPersonal, rbac.ResourceUserObject(userID)); err != nil {
2097+
return nil, err
2098+
}
2099+
return q.db.GetUserNotificationPreferences(ctx, userID)
2100+
}
2101+
20882102
func (q *querier) GetUserWorkspaceBuildParameters(ctx context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
20892103
u, err := q.db.GetUserByID(ctx, params.OwnerID)
20902104
if err != nil {
@@ -3011,6 +3025,14 @@ func (q *querier) UpdateMemberRoles(ctx context.Context, arg database.UpdateMemb
30113025
return q.db.UpdateMemberRoles(ctx, arg)
30123026
}
30133027

3028+
// TODO: how to restrict this to admins?
3029+
func (q *querier) UpdateNotificationTemplateMethod(ctx context.Context, arg database.UpdateNotificationTemplateMethodParams) (int64, error) {
3030+
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceNotificationTemplate); err != nil {
3031+
return -1, err
3032+
}
3033+
return q.db.UpdateNotificationTemplateMethod(ctx, arg)
3034+
}
3035+
30143036
func (q *querier) UpdateOAuth2ProviderAppByID(ctx context.Context, arg database.UpdateOAuth2ProviderAppByIDParams) (database.OAuth2ProviderApp, error) {
30153037
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceOauth2App); err != nil {
30163038
return database.OAuth2ProviderApp{}, err
@@ -3326,6 +3348,13 @@ func (q *querier) UpdateUserLoginType(ctx context.Context, arg database.UpdateUs
33263348
return q.db.UpdateUserLoginType(ctx, arg)
33273349
}
33283350

3351+
func (q *querier) UpdateUserNotificationPreferences(ctx context.Context, arg database.UpdateUserNotificationPreferencesParams) (int64, error) {
3352+
if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, rbac.ResourceUserObject(arg.UserID)); err != nil {
3353+
return -1, err
3354+
}
3355+
return q.db.UpdateUserNotificationPreferences(ctx, arg)
3356+
}
3357+
33293358
func (q *querier) UpdateUserProfile(ctx context.Context, arg database.UpdateUserProfileParams) (database.User, error) {
33303359
u, err := q.db.GetUserByID(ctx, arg.ID)
33313360
if err != nil {

‎coderd/database/dbmem/dbmem.go

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ type data struct {
160160
jfrogXRayScans []database.JfrogXrayScan
161161
licenses []database.License
162162
notificationMessages []database.NotificationMessage
163+
notificationPreferences []database.NotificationPreference
163164
oauth2ProviderApps []database.OAuth2ProviderApp
164165
oauth2ProviderAppSecrets []database.OAuth2ProviderAppSecret
165166
oauth2ProviderAppCodes []database.OAuth2ProviderAppCode
@@ -2708,6 +2709,10 @@ func (q *FakeQuerier) GetNotificationMessagesByStatus(_ context.Context, arg dat
27082709
return out, nil
27092710
}
27102711

2712+
func (q *FakeQuerier) GetNotificationTemplateById(_ context.Context, id uuid.UUID) (database.NotificationTemplate, error) {
2713+
return database.NotificationTemplate{ID: id, Name: "fake"}, nil
2714+
}
2715+
27112716
func (q *FakeQuerier) GetNotificationsSettings(_ context.Context) (string, error) {
27122717
q.mutex.RLock()
27132718
defer q.mutex.RUnlock()
@@ -4853,6 +4858,22 @@ func (q *FakeQuerier) GetUserLinksByUserID(_ context.Context, userID uuid.UUID)
48534858
return uls, nil
48544859
}
48554860

4861+
func (q *FakeQuerier) GetUserNotificationPreferences(_ context.Context, userID uuid.UUID) ([]database.NotificationPreference, error) {
4862+
q.mutex.RLock()
4863+
defer q.mutex.RUnlock()
4864+
4865+
out := make([]database.NotificationPreference, 0, len(q.notificationPreferences))
4866+
for _, np := range q.notificationPreferences {
4867+
if np.UserID != userID {
4868+
continue
4869+
}
4870+
4871+
out = append(out, np)
4872+
}
4873+
4874+
return out, nil
4875+
}
4876+
48564877
func (q *FakeQuerier) GetUserWorkspaceBuildParameters(_ context.Context, params database.GetUserWorkspaceBuildParametersParams) ([]database.GetUserWorkspaceBuildParametersRow, error) {
48574878
q.mutex.RLock()
48584879
defer q.mutex.RUnlock()
@@ -7520,6 +7541,15 @@ func (q *FakeQuerier) UpdateMemberRoles(_ context.Context, arg database.UpdateMe
75207541
return database.OrganizationMember{}, sql.ErrNoRows
75217542
}
75227543

7544+
func (q *FakeQuerier) UpdateNotificationTemplateMethod(ctx context.Context, arg database.UpdateNotificationTemplateMethodParams) (int64, error) {
7545+
err := validateDatabaseType(arg)
7546+
if err != nil {
7547+
return 0, err
7548+
}
7549+
7550+
return 1, nil
7551+
}
7552+
75237553
func (q *FakeQuerier) UpdateOAuth2ProviderAppByID(_ context.Context, arg database.UpdateOAuth2ProviderAppByIDParams) (database.OAuth2ProviderApp, error) {
75247554
err := validateDatabaseType(arg)
75257555
if err != nil {
@@ -8114,6 +8144,47 @@ func (q *FakeQuerier) UpdateUserLoginType(_ context.Context, arg database.Update
81148144
return database.User{}, sql.ErrNoRows
81158145
}
81168146

8147+
func (q *FakeQuerier) UpdateUserNotificationPreferences(ctx context.Context, arg database.UpdateUserNotificationPreferencesParams) (int64, error) {
8148+
err := validateDatabaseType(arg)
8149+
if err != nil {
8150+
return 0, err
8151+
}
8152+
8153+
q.mutex.Lock()
8154+
defer q.mutex.Unlock()
8155+
8156+
var upserted int64
8157+
for i, templateID := range arg.NotificationTemplateIds {
8158+
var (
8159+
found *database.NotificationPreference
8160+
disabled = arg.Disableds[i]
8161+
)
8162+
8163+
for _, np := range q.notificationPreferences {
8164+
if np.UserID != arg.UserID && np.NotificationTemplateID != templateID {
8165+
continue
8166+
}
8167+
8168+
found = &np
8169+
}
8170+
8171+
if found != nil {
8172+
found.Disabled = disabled
8173+
found.UpdatedAt = time.Now()
8174+
} else {
8175+
q.notificationPreferences = append(q.notificationPreferences, database.NotificationPreference{
8176+
Disabled: disabled,
8177+
UserID: arg.UserID,
8178+
NotificationTemplateID: templateID,
8179+
CreatedAt: time.Now(),
8180+
UpdatedAt: time.Now(),
8181+
})
8182+
}
8183+
}
8184+
8185+
return upserted, nil
8186+
}
8187+
81178188
func (q *FakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUserProfileParams) (database.User, error) {
81188189
if err := validateDatabaseType(arg); err != nil {
81198190
return database.User{}, err

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 28 additions & 0 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: 60 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/foreign_key_constraint.go

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

0 commit comments

Comments
 (0)