fix dbmem and add additional tests

aslilac · aslilac · commit 3904a0775740 · 2024-06-05T16:17:08.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -86,6 +86,7 @@ func New() database.Store {
 	defaultOrg, err := q.InsertOrganization(context.Background(), database.InsertOrganizationParams{
 		ID:          uuid.New(),
 		Name:        "first-organization",
+		DisplayName: "first-organization",
 		Description: "Builtin default organization.",
 		CreatedAt:   dbtime.Now(),
 		UpdatedAt:   dbtime.Now(),
@@ -6177,11 +6178,13 @@ func (q *FakeQuerier) InsertOrganization(_ context.Context, arg database.InsertO
 	defer q.mutex.Unlock()
 
 	organization := database.Organization{
-		ID:        arg.ID,
-		Name:      arg.Name,
-		CreatedAt: arg.CreatedAt,
-		UpdatedAt: arg.UpdatedAt,
-		IsDefault: len(q.organizations) == 0,
+		ID:          arg.ID,
+		Name:        arg.Name,
+		DisplayName: arg.DisplayName,
+		Description: arg.Description,
+		CreatedAt:   arg.CreatedAt,
+		UpdatedAt:   arg.UpdatedAt,
+		IsDefault:   len(q.organizations) == 0,
 	}
 	q.organizations = append(q.organizations, organization)
 	return organization, nil
@@ -7322,6 +7325,8 @@ func (q *FakeQuerier) UpdateOrganization(_ context.Context, arg database.UpdateO
 	for i, org := range q.organizations {
 		if org.ID == arg.ID {
 			org.Name = arg.Name
+			org.DisplayName = arg.DisplayName
+			org.Description = arg.Description
 			q.organizations[i] = org
 			return org, nil
 		}
diff --git a/coderd/organizations.go b/coderd/organizations.go
@@ -78,9 +78,9 @@ func (api *API) postOrganizations(rw http.ResponseWriter, r *http.Request) {
 			ID:          uuid.New(),
 			Name:        req.Name,
 			DisplayName: req.DisplayName,
+			Description: req.Description,
 			CreatedAt:   dbtime.Now(),
 			UpdatedAt:   dbtime.Now(),
-			Description: "",
 		})
 		if err != nil {
 			return xerrors.Errorf("create organization: %w", err)
diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go
@@ -117,17 +117,36 @@ func TestPostOrganizationsByUser(t *testing.T) {
 		require.Equal(t, http.StatusConflict, apiErr.StatusCode())
 	})
 
-	t.Run("Create", func(t *testing.T) {
+	t.Run("InvalidName", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
 		_ = coderdtest.CreateFirstUser(t, client)
 		ctx := testutil.Context(t, testutil.WaitLong)
 
 		_, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "A name which is definitely! not! url! safe!",
+			DisplayName: "New",
+		})
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
+	})
+
+	t.Run("Create", 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",
 			DisplayName: "New",
+			Description: "A new organization to love and cherish forever.",
 		})
 		require.NoError(t, err)
+		require.Equal(t, "new", o.Name)
+		require.Equal(t, "New", o.DisplayName)
+		require.Equal(t, "A new organization to love and cherish forever.", o.Description)
 	})
 }
 
@@ -175,6 +194,26 @@ func TestPatchOrganizationsByUser(t *testing.T) {
 		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
 	})
 
+	t.Run("InvalidName", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		_ = coderdtest.CreateFirstUser(t, client)
+		ctx := testutil.Context(t, testutil.WaitMedium)
+
+		o, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{
+			Name:        "something-unique",
+			DisplayName: "Something Unique",
+		})
+		require.NoError(t, err)
+
+		_, err = client.UpdateOrganization(ctx, o.ID.String(), codersdk.UpdateOrganizationRequest{
+			Name: "something! unique! but not! url! safe!",
+		})
+		var apiErr *codersdk.Error
+		require.ErrorAs(t, err, &apiErr)
+		require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
+	})
+
 	t.Run("UpdateById", func(t *testing.T) {
 		t.Parallel()
 		client := coderdtest.New(t, nil)
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -60,6 +60,7 @@ type OrganizationMember struct {
 type CreateOrganizationRequest struct {
 	Name        string `json:"name" validate:"required,username"`
 	DisplayName string `json:"display_name" validate:"required"`
+	Description string `json:"description"`
 }
 
 type UpdateOrganizationRequest struct {

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