rename inbox notifications

fix rbac roles
coder · defelmnq · Mar 3, 2025 · Feb 18, 2025 · Feb 19, 2025 · Feb 19, 2025
commit 27c159281997b82ec09ed92225e49bfc0775c42e
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -4495,6 +4495,7 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		check.Args(u.ID).Asserts(rbac.ResourceInboxNotification.WithID(notifID).WithOwner(u.ID.String()), policy.ActionRead).Returns([]database.InboxNotification{notif})
@@ -4517,6 +4518,7 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		check.Args(u.ID).Asserts(rbac.ResourceInboxNotification.WithID(notifID).WithOwner(u.ID.String()), policy.ActionRead).Returns([]database.InboxNotification{notif})
@@ -4542,6 +4544,7 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		check.Args(database.FetchInboxNotificationsByUserIDFilteredByTemplatesAndTargetsParams{
@@ -4571,6 +4574,7 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		check.Args(database.FetchUnreadInboxNotificationsByUserIDFilteredByTemplatesAndTargetsParams{
@@ -4600,14 +4604,34 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		check.Args(notifID).Asserts(rbac.ResourceInboxNotification.WithID(notifID).WithOwner(u.ID.String()), policy.ActionRead).Returns(notif)
 	}))
 
-	s.Run("InsertInboxNotification", s.Subtest(func(_ database.Store, check *expects) {
-		owner := uuid.UUID{}
-		check.Args(database.InsertInboxNotificationParams{}).Asserts(rbac.ResourceInboxNotification.WithOwner(owner.String()), policy.ActionCreate)
+	s.Run("InsertInboxNotification", s.Subtest(func(db database.Store, check *expects) {
+		u := dbgen.User(s.T(), db, database.User{})
+		o := dbgen.Organization(s.T(), db, database.Organization{})
+		tpl := dbgen.Template(s.T(), db, database.Template{
+			OrganizationID: o.ID,
+			CreatedBy:      u.ID,
+		})
+
+		notifID := uuid.New()
+
+		targets := []uuid.UUID{u.ID, tpl.ID}
+
+		check.Args(database.InsertInboxNotificationParams{
+			ID:         notifID,
+			UserID:     u.ID,
+			TemplateID: tpl.ID,
+			Targets:    targets,
+			Title:      "test title",
+			Content:    "test content notification",
+			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
+		}).Asserts(rbac.ResourceInboxNotification.WithOwner(u.ID.String()), policy.ActionCreate)
 	}))
 
 	s.Run("SetInboxNotificationAsRead", s.Subtest(func(db database.Store, check *expects) {
@@ -4631,6 +4655,7 @@ func (s *MethodTestSuite) TestNotifications() {
 			Title:      "test title",
 			Content:    "test content notification",
 			Icon:       "test icon",
+			Actions:    json.RawMessage("{}"),
 		})
 
 		notif.ReadAt = sql.NullTime{Time: readAt, Valid: true}

diff --git a/coderd/database/migrations/000296_notifications_inbox.down.sql b/coderd/database/migrations/000296_notifications_inbox.down.sql
@@ -1 +1 @@
-DROP TABLE IF EXISTS notifications_inbox;
+DROP TABLE IF EXISTS inbox_notifications;
diff --git a/coderd/database/migrations/testdata/fixtures/000296_notifications_inbox.up.sql b/coderd/database/migrations/testdata/fixtures/000296_notifications_inbox.up.sql
@@ -0,0 +1,25 @@
+INSERT INTO
+	inbox_notifications (
+		id,
+		user_id,
+		template_id,
+		targets,
+		title,
+		content,
+		icon,
+		actions,
+		read_at,
+		created_at
+	)
+	VALUES (
+		'68b396aa-7f53-4bf1-b8d8-4cbf5fa244e5', -- uuid
+		'45e89705-e09d-4850-bcec-f9a937f5d78d', -- uuid
+		'193590e9-918f-4ef9-be47-04625f49c4c3', -- uuid
+        ARRAY[]::UUID[], -- uuid[]
+		'Test Notification',
+		'This is a test notification',
+		'https://test.coder.com/favicon.ico',
+		'{}',
+		'2024-01-01 00:00:00',
+		'2024-01-01 00:00:00'
+	);
diff --git a/coderd/rbac/roles_test.go b/coderd/rbac/roles_test.go
@@ -354,6 +354,17 @@ func TestRolePermissions(t *testing.T) {
 				false: {setOtherOrg, setOrgNotMe, templateAdmin, userAdmin},
 			},
 		},
+		{
+			Name: "InboxNotification",
+			Actions: []policy.Action{
+				policy.ActionCreate, policy.ActionRead, policy.ActionUpdate,
+			},
+			Resource: rbac.ResourceInboxNotification.WithID(uuid.New()).InOrg(orgID).WithOwner(currentUser.String()),
+			AuthorizeMap: map[bool][]hasAuthSubjects{
+				true:  {owner, orgMemberMe, orgAdmin},
+				false: {setOtherOrg, orgUserAdmin, orgTemplateAdmin, orgAuditor, templateAdmin, userAdmin, memberMe},
+			},
+		},
 		{
 			Name:     "UserData",
 			Actions:  []policy.Action{policy.ActionReadPersonal, policy.ActionUpdatePersonal},
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DROP TABLE IF EXISTS notifications_inbox;
		DROP TABLE IF EXISTS inbox_notifications;