Remove sqlc query in favor of inline sql for tests

coder · BrunoQuaresma · Jul 29, 2024 · Jul 26, 2024 · Jul 26, 2024 · Jul 26, 2024
commit 5da37456d59ddf57775020f209a03230902ed32d
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1484,13 +1484,6 @@ func (q *querier) GetNotificationMessagesByStatus(ctx context.Context, arg datab
 	return q.db.GetNotificationMessagesByStatus(ctx, arg)
 }
 
-func (q *querier) GetNotificationTemplateByID(ctx context.Context, id uuid.UUID) (database.NotificationTemplate, error) {
-	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
-		return database.NotificationTemplate{}, err
-	}
-	return q.db.GetNotificationTemplateByID(ctx, id)
-}
-
 func (q *querier) GetNotificationsSettings(ctx context.Context) (string, error) {
 	// No authz checks
 	return q.db.GetNotificationsSettings(ctx)

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -65,7 +65,6 @@ func New() database.Store {
 			files:                     make([]database.File, 0),
 			gitSSHKey:                 make([]database.GitSSHKey, 0),
 			notificationMessages:      make([]database.NotificationMessage, 0),
-			notificationTemplates:     make([]database.NotificationTemplate, 0),
 			parameterSchemas:          make([]database.ParameterSchema, 0),
 			provisionerDaemons:        make([]database.ProvisionerDaemon, 0),
 			workspaceAgents:           make([]database.WorkspaceAgent, 0),
@@ -161,7 +160,6 @@ type data struct {
 	jfrogXRayScans                []database.JfrogXrayScan
 	licenses                      []database.License
 	notificationMessages          []database.NotificationMessage
-	notificationTemplates         []database.NotificationTemplate
 	oauth2ProviderApps            []database.OAuth2ProviderApp
 	oauth2ProviderAppSecrets      []database.OAuth2ProviderAppSecret
 	oauth2ProviderAppCodes        []database.OAuth2ProviderAppCode
@@ -2819,19 +2817,6 @@ func (q *FakeQuerier) GetNotificationMessagesByStatus(_ context.Context, arg dat
 	return out, nil
 }
 
-func (q *FakeQuerier) GetNotificationTemplateByID(_ context.Context, id uuid.UUID) (database.NotificationTemplate, error) {
-	q.mutex.RLock()
-	defer q.mutex.RUnlock()
-
-	for _, template := range q.notificationTemplates {
-		if template.ID == id {
-			return template, nil
-		}
-	}
-
-	return database.NotificationTemplate{}, sql.ErrNoRows
-}
-
 func (q *FakeQuerier) GetNotificationsSettings(_ context.Context) (string, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()

diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/notifications.sql b/coderd/database/queries/notifications.sql
@@ -132,6 +132,3 @@ WHERE id IN
 
 -- name: GetNotificationMessagesByStatus :many
 SELECT * FROM notification_messages WHERE status = @status LIMIT sqlc.arg('limit')::int;
-
--- name: GetNotificationTemplateByID :one
-SELECT * FROM notification_templates WHERE id = @id::uuid;
diff --git a/coderd/notifications/notifications_test.go b/coderd/notifications/notifications_test.go
@@ -683,14 +683,15 @@ func TestNotifcationTemplatesBody(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
-			t.Cleanup(cancel)
-			db, _, _ := dbtestutil.NewDBWithSQLDB(t)
+			_, _, sql := dbtestutil.NewDBWithSQLDB(t)
 
-			tpl, err := db.GetNotificationTemplateByID(ctx, tc.id)
-			require.NoError(t, err, "failed to get notification template")
+			var bodyTmpl string
+			err := sql.
+				QueryRow("SELECT body_template FROM notification_templates WHERE id = $1 LIMIT 1", tc.id).
+				Scan(&bodyTmpl)
+			require.NoError(t, err, "failed to query body template for template:", tc.id)
 
-			_, err = render.GoTemplate(tpl.BodyTemplate, tc.payload, nil)
+			_, err = render.GoTemplate(bodyTmpl, tc.payload, nil)
 			require.NoError(t, err, "failed to render notification template")
 		})
 	}