make display name optional to avoid breakage

aslilac · aslilac · commit c5f8ccb3d7bb · 2024-06-05T17:04:06.000Z
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -74,6 +74,10 @@ func (api *API) postOrganizations(rw http.ResponseWriter, r *http.Request) {
 
 	var organization database.Organization
 	err = api.Database.InTx(func(tx database.Store) error {
+		if req.DisplayName == "" {
+			req.DisplayName = req.Name
+		}
+
 		organization, err = tx.InsertOrganization(ctx, database.InsertOrganizationParams{
 			ID:          uuid.New(),
 			Name:        req.Name,
diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -148,6 +148,20 @@ func TestPostOrganizationsByUser(t *testing.T) {
 		require.Equal(t, "New", o.DisplayName)
 		require.Equal(t, "A new organization to love and cherish forever.", o.Description)
 	})
+
+	t.Run("CreateWithoutExplicitDisplayName", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, client)
+		ctx := testutil.Context(t, testutil.WaitLong)
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name: "new",
+		})
+		require.NoError(t, err)
+		require.Equal(t, "new", o.Name)
+		require.Equal(t, "new", o.DisplayName) // should match the given `Name`
+	})
 }
 
 func TestPatchOrganizationsByUser(t *testing.T) {
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -59,7 +59,7 @@ type OrganizationMember struct {
 
 type CreateOrganizationRequest struct {
 	Name        string `json:"name" validate:"required,organization_name"`
-	DisplayName string `json:"display_name" validate:"required,organization_display_name"`
+	DisplayName string `json:"display_name" validate:"omitempty,organization_display_name"`
 	Description string `json:"description,omitempty"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ type OrganizationMember struct {`
`59`	`59`
`60`	`60`	`type CreateOrganizationRequest struct {`
`61`	`61`	Name string `json:"name" validate:"required,organization_name"`
`62`		- DisplayName string `json:"display_name" validate:"required,organization_display_name"`
	`62`	+ DisplayName string `json:"display_name" validate:"omitempty,organization_display_name"`
`63`	`63`	Description string `json:"description,omitempty"`
`64`	`64`	`}`
`65`	`65`