Fix

mtojek · mtojek · commit 8f22f8d3d6f0 · 2023-01-09T12:46:43.000+01:00
diff --git a/cli/userstatus_test.go b/cli/userstatus_test.go
@@ -33,7 +33,7 @@ func TestUserStatus(t *testing.T) {
 	})
 
 	t.Run("StatusOther", func(t *testing.T) {
-		require.Equal(t, otherUser.Status, codersdk.UserStatusActive, "start as active")
+		require.Equal(t, codersdk.UserStatusActive, otherUser.Status, "start as active")
 
 		cmd, root := clitest.New(t, "users", "suspend", otherUser.Username)
 		clitest.SetupConfig(t, client, root)
@@ -45,7 +45,7 @@ func TestUserStatus(t *testing.T) {
 		// Check the user status
 		otherUser, err = client.User(context.Background(), otherUser.Username)
 		require.NoError(t, err, "fetch suspended user")
-		require.Equal(t, otherUser.Status, codersdk.UserStatusSuspended, "suspended user")
+		require.Equal(t, codersdk.UserStatusSuspended, otherUser.Status, "suspended user")
 
 		// Set back to active. Try using a uuid as well
 		cmd, root = clitest.New(t, "users", "activate", otherUser.ID.String())
@@ -58,6 +58,6 @@ func TestUserStatus(t *testing.T) {
 		// Check the user status
 		otherUser, err = client.User(context.Background(), otherUser.ID.String())
 		require.NoError(t, err, "fetch active user")
-		require.Equal(t, otherUser.Status, codersdk.UserStatusActive, "active user")
+		require.Equal(t, codersdk.UserStatusActive, otherUser.Status, "active user")
 	})
 }
diff --git a/coderd/users.go b/coderd/users.go
@@ -542,7 +542,7 @@ func (api *API) putSuspendUserAccount() func(rw http.ResponseWriter, r *http.Req
 // @Success 200 {object} codersdk.User
 // @Router /users/{user}/status/activate [put]
 func (api *API) putActivateUserAccount() func(rw http.ResponseWriter, r *http.Request) {
-	return api.putUserStatus(database.UserStatusSuspended)
+	return api.putUserStatus(database.UserStatusActive)
 }
 
 func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseWriter, r *http.Request) {

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ func (api API) putSuspendUserAccount() func(rw http.ResponseWriter, r http.Req`
`542`	`542`	`// @Success 200 {object} codersdk.User`
`543`	`543`	`// @Router /users/{user}/status/activate [put]`
`544`	`544`	`func (api API) putActivateUserAccount() func(rw http.ResponseWriter, r http.Request) {`
`545`		`- return api.putUserStatus(database.UserStatusSuspended)`
	`545`	`+ return api.putUserStatus(database.UserStatusActive)`
`546`	`546`	`}`
`547`	`547`
`548`	`548`	`func (api API) putUserStatus(status database.UserStatus) func(rw http.ResponseWriter, r http.Request) {`