Merge remote-tracking branch 'origin/main' into kacpersaw/feat-coder-…

…attach # Conflicts: # coderd/database/dump.sql # coderd/database/modelqueries.go # coderd/database/queries.sql.go # coderd/database/queries/templates.sql # coderd/searchquery/search.go # coderd/searchquery/search_test.go
coder · kacpersaw · Jul 23, 2025 · Jul 24, 2025 · Jul 28, 2025 · Jul 29, 2025
commit 73acd0f84e2f9e955dfd9fb73ad1aa705af81b7c
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -82,6 +82,8 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 		pq.Array(arg.IDs),
 		arg.Deprecated,
 		arg.HasAITask,
+		arg.AuthorID,
+		arg.AuthorUsername,
 		arg.HasExternalAgent,
 	)
 	if err != nil {

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -59,6 +59,19 @@ WHERE
 			tv.has_ai_task = sqlc.narg('has_ai_task') :: boolean
 		ELSE true
 	END
+	-- Filter by author_id
+	AND CASE
+		  WHEN @author_id :: uuid != '00000000-0000-0000-0000-000000000000'::uuid THEN
+			  t.created_by = @author_id
+		  ELSE true
+	END
+	-- Filter by author_username
+	AND CASE
+		  WHEN @author_username :: text != '' THEN
+			  t.created_by = (SELECT id FROM users WHERE lower(users.username) = lower(@author_username) AND deleted = false)
+		  ELSE true
+	END
+
 	-- Filter by has_external_agent in latest version
 	AND CASE
 		WHEN sqlc.narg('has_external_agent') :: boolean IS NOT NULL THEN

diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
@@ -278,16 +278,23 @@ func Templates(ctx context.Context, db database.Store, actorID uuid.UUID, query
 
 	parser := httpapi.NewQueryParamParser()
 	filter := database.GetTemplatesWithFilterParams{
-		Deleted:          parser.Boolean(values, false, "deleted"),
-		ExactName:        parser.String(values, "", "exact_name"),
-		FuzzyName:        parser.String(values, "", "name"),
-		IDs:              parser.UUIDs(values, []uuid.UUID{}, "ids"),
-		Deprecated:       parser.NullableBoolean(values, sql.NullBool{}, "deprecated"),
-		OrganizationID:   parseOrganization(ctx, db, parser, values, "organization"),
-		HasAITask:        parser.NullableBoolean(values, sql.NullBool{}, "has-ai-task"),
+		Deleted:        parser.Boolean(values, false, "deleted"),
+		OrganizationID: parseOrganization(ctx, db, parser, values, "organization"),
+		ExactName:      parser.String(values, "", "exact_name"),
+		FuzzyName:      parser.String(values, "", "name"),
+		IDs:            parser.UUIDs(values, []uuid.UUID{}, "ids"),
+		Deprecated:     parser.NullableBoolean(values, sql.NullBool{}, "deprecated"),
+		HasAITask:      parser.NullableBoolean(values, sql.NullBool{}, "has-ai-task"),
+		AuthorID:       parser.UUID(values, uuid.Nil, "author_id"),
+		AuthorUsername: parser.String(values, "", "author"),
 		HasExternalAgent: parser.NullableBoolean(values, sql.NullBool{}, "has-external-agent"),
 	}
 
+	if filter.AuthorUsername == codersdk.Me {
+		filter.AuthorID = actorID
+		filter.AuthorUsername = ""
+	}
+
 	parser.ErrorExcessParams(values)
 	return filter, parser.Errors
 }

diff --git a/coderd/searchquery/search_test.go b/coderd/searchquery/search_test.go
@@ -749,6 +749,14 @@ func TestSearchTemplates(t *testing.T) {
 				},
 			},
 		},
+		{
+			Name:  "MyTemplates",
+			Query: "author:me",
+			Expected: database.GetTemplatesWithFilterParams{
+				AuthorUsername: "",
+				AuthorID:       userID,
+			},
+		},
 	}
 
 	for _, c := range testCases {