fix: populate default created_by and add not-null constraint in templates (coder#2290)

Author: AbhineetJain

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),
-				CreatedBy:            uuid.NullUUID{UUID: uuid.UUID{4}, Valid: true},
+				CreatedBy:            uuid.UUID{4},
 			},
 			exp: audit.Map{
 				"id":                     uuid.UUID{1}.String(),

coderd/database/dump.sql

@@ -0,0 +1 @@
+ALTER TABLE ONLY templates ALTER COLUMN created_by DROP NOT NULL;

coderd/database/migrations/000023_template_created_by_not_null.down.sql

@@ -0,0 +1,14 @@
+UPDATE
+    templates
+SET
+    created_by = (
+        SELECT user_id FROM organization_members
+        WHERE organization_members.organization_id = templates.organization_id
+        ORDER BY created_at
+        LIMIT 1
+    )
+WHERE
+    created_by IS NULL;
+
+
+ALTER TABLE ONLY templates ALTER COLUMN created_by SET NOT NULL;

coderd/database/migrations/000023_template_created_by_not_null.up.sql

@@ -186,10 +186,7 @@ func (api *API) postTemplateByOrganization(rw http.ResponseWriter, r *http.Reque
 			Description:          createTemplate.Description,
 			MaxTtl:               int64(maxTTL),
 			MinAutostartInterval: int64(minAutostartInterval),
-			CreatedBy: uuid.NullUUID{
-				UUID:  apiKey.UserID,
-				Valid: true,
-			},
+			CreatedBy:            apiKey.UserID,
 		})
 		if err != nil {
 			return xerrors.Errorf("insert template: %s", err)
@@ -453,15 +450,11 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 func getCreatedByNamesByTemplateIDs(ctx context.Context, db database.Store, templates []database.Template) (map[string]string, error) {
 	creators := make(map[string]string, len(templates))
 	for _, template := range templates {
-		if template.CreatedBy.Valid {
-			creator, err := db.GetUserByID(ctx, template.CreatedBy.UUID)
-			if err != nil {
-				return map[string]string{}, err
-			}
-			creators[template.ID.String()] = creator.Username
-		} else {
-			creators[template.ID.String()] = ""
+		creator, err := db.GetUserByID(ctx, template.CreatedBy)
+		if err != nil {
+			return map[string]string{}, err
 		}
+		creators[template.ID.String()] = creator.Username
 	}
 	return creators, nil
 }

coderd/database/models.go

@@ -25,7 +25,7 @@ type Template struct {
 	Description                string          `json:"description"`
 	MaxTTLMillis               int64           `json:"max_ttl_ms"`
 	MinAutostartIntervalMillis int64           `json:"min_autostart_interval_ms"`
-	CreatedByID                uuid.NullUUID   `json:"created_by_id"`
+	CreatedByID                uuid.UUID       `json:"created_by_id"`
 	CreatedByName              string          `json:"created_by_name"`
 }
 

coderd/database/queries.sql.go

@@ -247,7 +247,7 @@ export interface Template {
   readonly description: string
   readonly max_ttl_ms: number
   readonly min_autostart_interval_ms: number
-  readonly created_by_id?: string
+  readonly created_by_id: string
   readonly created_by_name: string
 }
 

coderd/templates.go

@@ -23,12 +23,3 @@ UsedByMany.args = {
   },
   activeVersion: Mocks.MockTemplateVersion,
 }
-
-export const UnknownCreator = Template.bind({})
-UnknownCreator.args = {
-  template: {
-    ...Mocks.MockTemplate,
-    created_by_name: "",
-  },
-  activeVersion: Mocks.MockTemplateVersion,
-}