rename owner to created_by

coder · AbhineetJain · Jun 10, 2022 · Jun 8, 2022 · Jun 9, 2022 · Jun 10, 2022
commit 6760cf968761ba7dce47e13cb54846c061f11676
diff --git a/coderd/audit/diff_test.go b/coderd/audit/diff_test.go
@@ -88,7 +88,7 @@ func TestDiff(t *testing.T) {
 				ActiveVersionID:      uuid.UUID{3},
 				MaxTtl:               int64(time.Hour),
 				MinAutostartInterval: int64(time.Minute),
-				OwnerID:              uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true},
+				CreatedBy:            uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true},
 			},
 			exp: audit.Map{
 				"id":                     uuid.UUID{1}.String(),
@@ -98,7 +98,7 @@ func TestDiff(t *testing.T) {
 				"active_version_id":      uuid.UUID{3}.String(),
 				"max_ttl":                int64(3600000000000),
 				"min_autostart_interval": int64(60000000000),
-				"owner_id":               uuid.UUID{4}.String(),
+				"created_by":             uuid.UUID{4}.String(),
 			},
 		},
 	})

diff --git a/coderd/audit/table.go b/coderd/audit/table.go
@@ -72,7 +72,7 @@ var AuditableResources = auditMap(map[any]map[string]Action{
 		"description":            ActionTrack,
 		"max_ttl":                ActionTrack,
 		"min_autostart_interval": ActionTrack,
-		"owner_id":               ActionTrack,
+		"created_by":             ActionTrack,
 	},
 	&database.TemplateVersion{}: {
 		"id":              ActionTrack,

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1316,7 +1316,7 @@ func (q *fakeQuerier) InsertTemplate(_ context.Context, arg database.InsertTempl
 		Description:          arg.Description,
 		MaxTtl:               arg.MaxTtl,
 		MinAutostartInterval: arg.MinAutostartInterval,
-		OwnerID:              arg.OwnerID,
+		CreatedBy:            arg.CreatedBy,
 	}
 	q.templates = append(q.templates, template)
 	return template, nil

diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000022_template_owner.down.sql b/coderd/database/migrations/000022_template_owner.down.sql
@@ -1 +1 @@
-ALTER TABLE ONLY templates DROP COLUMN IF EXISTS owner_id;
+ALTER TABLE ONLY templates DROP COLUMN IF EXISTS created_by;
diff --git a/coderd/database/migrations/000022_template_owner.up.sql b/coderd/database/migrations/000022_template_owner.up.sql
@@ -1 +1 @@
-ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS owner_id uuid REFERENCES users (id) ON DELETE RESTRICT;
+ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS created_by uuid REFERENCES users (id) ON DELETE RESTRICT;
diff --git a/coderd/database/models.go b/coderd/database/models.go
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
@@ -50,7 +50,7 @@ INSERT INTO
 		description,
 		max_ttl,
 		min_autostart_interval,
-		owner_id
+		created_by
 	)
 VALUES
 	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11) RETURNING *;

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -177,7 +177,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			Description:          createTemplate.Description,
 			MaxTtl:               int64(maxTTL),
 			MinAutostartInterval: int64(minAutostartInterval),
-			OwnerID: uuid.NullUUID{
+			CreatedBy: uuid.NullUUID{
 				UUID:  apiKey.UserID,
 				Valid: true,
 			},
@@ -429,11 +429,11 @@ func convertTemplates(ctx context.Context, db database.Store, templates []databa
 }
 
 func convertTemplate(ctx context.Context, db database.Store, template database.Template, workspaceOwnerCount uint32) codersdk.Template {
-	var ownerName string
-	if template.OwnerID.Valid {
-		owner, err := db.GetUserByID(ctx, template.OwnerID.UUID)
+	var createdByName string
+	if template.CreatedBy.Valid {
+		creator, err := db.GetUserByID(ctx, template.CreatedBy.UUID)
 		if err == nil {
-			ownerName = owner.Username
+			createdByName = creator.Username
 		}
 	}
 	return codersdk.Template{
@@ -448,7 +448,7 @@ func convertTemplate(ctx context.Context, db database.Store, template database.T
 		Description:                template.Description,
 		MaxTTLMillis:               time.Duration(template.MaxTtl).Milliseconds(),
 		MinAutostartIntervalMillis: time.Duration(template.MinAutostartInterval).Milliseconds(),
-		OwnerID:                    template.OwnerID,
-		OwnerName:                  ownerName,
+		CreatedByID:                template.CreatedBy,
+		CreatedByName:              createdByName,
 	}
 }
diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -25,8 +25,8 @@ type Template struct {
 	Description                string          `json:"description"`
 	MaxTTLMillis               int64           `json:"max_ttl_ms"`
 	MinAutostartIntervalMillis int64           `json:"min_autostart_interval_ms"`
-	OwnerID                    uuid.NullUUID   `json:"owner_id"`
-	OwnerName                  string          `json:"owner_name"`
+	CreatedByID                uuid.NullUUID   `json:"created_by_id"`
+	CreatedByName              string          `json:"created_by_name"`
 }
 
 type UpdateActiveTemplateVersion struct {

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -247,8 +247,8 @@ export interface Template {
   readonly description: string
   readonly max_ttl_ms: number
   readonly min_autostart_interval_ms: number
-  readonly owner_id?: string
-  readonly owner_name: string
+  readonly created_by_id?: string
+  readonly created_by_name: string
 }
 
 // From codersdk/templateversions.go:14:6

diff --git a/site/src/components/TemplateStats/TemplateStats.stories.tsx b/site/src/components/TemplateStats/TemplateStats.stories.tsx
@@ -24,11 +24,11 @@ UsedByMany.args = {
   activeVersion: Mocks.MockTemplateVersion,
 }
 
-export const UnknownOwner = Template.bind({})
-UnknownOwner.args = {
+export const UnknownCreator = Template.bind({})
+UnknownCreator.args = {
   template: {
     ...Mocks.MockTemplate,
-    owner_name: "",
+    created_by_name: "",
   },
   activeVersion: Mocks.MockTemplateVersion,
 }
diff --git a/site/src/components/TemplateStats/TemplateStats.tsx b/site/src/components/TemplateStats/TemplateStats.tsx
@@ -50,7 +50,7 @@ export const TemplateStats: FC<TemplateStatsProps> = ({ template, activeVersion
       <div className={styles.statsDivider} />
       <div className={styles.statItem}>
         <span className={styles.statsLabel}>{Language.createdByLabel}</span>
-        <span className={styles.statsValue}>{template.owner_name || Language.defaultTemplateCreator}</span>
+        <span className={styles.statsValue}>{template.created_by_name || Language.defaultTemplateCreator}</span>
       </div>
     </div>
   )

diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -140,7 +140,7 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = (props) => {
                 <TableCell>{Language.developerCount(template.workspace_owner_count)}</TableCell>
 
                 <TableCell data-chromatic="ignore">{dayjs().to(dayjs(template.updated_at))}</TableCell>
-                <TableCell>{template.owner_name || Language.defaultTemplateOwner}</TableCell>
+                <TableCell>{template.created_by_name || Language.defaultTemplateOwner}</TableCell>
                 <TableCell>
                   <div className={styles.arrowCell}>
                     <KeyboardArrowRight className={styles.arrowRight} />

diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -114,8 +114,8 @@ export const MockTemplate: TypesGen.Template = {
   description: "This is a test description.",
   max_ttl_ms: 604800000,
   min_autostart_interval_ms: 3600000,
-  owner_id: "test-owner-id",
-  owner_name: "test_owner",
+  created_by_id: "test-owner-id",
+  created_by_name: "test_owner",
 }
 
 export const MockWorkspaceAutostartDisabled: TypesGen.UpdateWorkspaceAutostartRequest = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE ONLY templates DROP COLUMN IF EXISTS owner_id;
		ALTER TABLE ONLY templates DROP COLUMN IF EXISTS created_by;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS owner_id uuid REFERENCES users (id) ON DELETE RESTRICT;
		ALTER TABLE ONLY templates ADD COLUMN IF NOT EXISTS created_by uuid REFERENCES users (id) ON DELETE RESTRICT;