Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e1fb85

Browse files
committed
fix: empty name
1 parentae22b4b commit1e1fb85

File tree

4 files changed

+37
-8
lines changed

4 files changed

+37
-8
lines changed

‎coderd/database/databasefake/databasefake.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,7 @@ func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUs
10351035
ifuser.ID!=arg.ID {
10361036
continue
10371037
}
1038+
user.Name=arg.Name
10381039
user.Email=arg.Email
10391040
user.Username=arg.Username
10401041
q.users[index]=user

‎coderd/users.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,10 @@ func (api *api) patchUserProfile(rw http.ResponseWriter, r *http.Request) {
278278
return
279279
}
280280

281+
ifpatchUserProfile.Name==nil {
282+
patchUserProfile.Name=&user.Name
283+
}
284+
281285
existentUser,err:=api.Database.GetUserByEmailOrUsername(r.Context(), database.GetUserByEmailOrUsernameParams{
282286
Email:patchUserProfile.Email,
283287
Username:patchUserProfile.Username,
@@ -313,7 +317,7 @@ func (api *api) patchUserProfile(rw http.ResponseWriter, r *http.Request) {
313317

314318
updatedUserProfile,err:=api.Database.UpdateUserProfile(r.Context(), database.UpdateUserProfileParams{
315319
ID:user.ID,
316-
Name:patchUserProfile.Name,
320+
Name:*patchUserProfile.Name,
317321
Email:patchUserProfile.Email,
318322
Username:patchUserProfile.Username,
319323
UpdatedAt:database.Now(),
@@ -932,5 +936,6 @@ func convertUser(user database.User) codersdk.User {
932936
Email:user.Email,
933937
CreatedAt:user.CreatedAt,
934938
Username:user.Username,
939+
Name:user.Name,
935940
}
936941
}

‎coderd/users_test.go

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ func TestPatchUserProfile(t *testing.T) {
217217
require.Equal(t,http.StatusBadRequest,apiErr.StatusCode())
218218
})
219219

220-
t.Run("Conflicting email",func(t*testing.T) {
220+
t.Run("ConflictingEmail",func(t*testing.T) {
221221
t.Parallel()
222222
client:=coderdtest.New(t,nil)
223223
user:=coderdtest.CreateFirstUser(t,client)
@@ -236,7 +236,7 @@ func TestPatchUserProfile(t *testing.T) {
236236
require.Equal(t,http.StatusConflict,apiErr.StatusCode())
237237
})
238238

239-
t.Run("Conflicting username",func(t*testing.T) {
239+
t.Run("ConflictingUsername",func(t*testing.T) {
240240
t.Parallel()
241241
client:=coderdtest.New(t,nil)
242242
user:=coderdtest.CreateFirstUser(t,client)
@@ -255,7 +255,7 @@ func TestPatchUserProfile(t *testing.T) {
255255
require.Equal(t,http.StatusConflict,apiErr.StatusCode())
256256
})
257257

258-
t.Run("Full Patch",func(t*testing.T) {
258+
t.Run("UpdateUsernameAndEmail",func(t*testing.T) {
259259
t.Parallel()
260260
client:=coderdtest.New(t,nil)
261261
coderdtest.CreateFirstUser(t,client)
@@ -268,7 +268,7 @@ func TestPatchUserProfile(t *testing.T) {
268268
require.Equal(t,userProfile.Email,"newemail@coder.com")
269269
})
270270

271-
t.Run("Partial Patch",func(t*testing.T) {
271+
t.Run("UpdateUsername",func(t*testing.T) {
272272
t.Parallel()
273273
client:=coderdtest.New(t,nil)
274274
coderdtest.CreateFirstUser(t,client)
@@ -281,6 +281,28 @@ func TestPatchUserProfile(t *testing.T) {
281281
require.Equal(t,userProfile.Username,me.Username)
282282
require.Equal(t,userProfile.Email,"newemail@coder.com")
283283
})
284+
285+
t.Run("KeepUserName",func(t*testing.T) {
286+
t.Parallel()
287+
client:=coderdtest.New(t,nil)
288+
coderdtest.CreateFirstUser(t,client)
289+
me,_:=client.User(context.Background(),codersdk.Me)
290+
newName:="New Name"
291+
firstProfile,_:=client.PatchUserProfile(context.Background(),codersdk.Me, codersdk.PatchUserProfileRequest{
292+
Username:me.Username,
293+
Email:me.Email,
294+
Name:&newName,
295+
})
296+
t.Log(firstProfile)
297+
userProfile,err:=client.PatchUserProfile(context.Background(),codersdk.Me, codersdk.PatchUserProfileRequest{
298+
Username:"newusername",
299+
Email:"newemail@coder.com",
300+
})
301+
require.NoError(t,err)
302+
require.Equal(t,userProfile.Username,"newusername")
303+
require.Equal(t,userProfile.Email,"newemail@coder.com")
304+
require.Equal(t,userProfile.Name,newName)
305+
})
284306
}
285307

286308
funcTestUserByName(t*testing.T) {

‎codersdk/users.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ type User struct {
1919
Emailstring`json:"email" validate:"required"`
2020
CreatedAt time.Time`json:"created_at" validate:"required"`
2121
Usernamestring`json:"username" validate:"required"`
22+
Namestring`json:"name"`
2223
}
2324

2425
typeCreateFirstUserRequeststruct {
@@ -42,9 +43,9 @@ type CreateUserRequest struct {
4243
}
4344

4445
typePatchUserProfileRequeststruct {
45-
Emailstring`json:"email" validate:"required,email"`
46-
Usernamestring`json:"username" validate:"required,username"`
47-
Namestring`json:"name"`
46+
Emailstring`json:"email" validate:"required,email"`
47+
Usernamestring`json:"username" validate:"required,username"`
48+
Name*string`json:"name"`
4849
}
4950

5051
// LoginWithPasswordRequest enables callers to authenticate with email and password.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp