Skip to content

Commit 61d4123

Browse files
committed
refactor: move personal reward display condition into queries.GetProfile
1 parent ee5bb74 commit 61d4123

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

internal/controllers/users/profile.go

-7
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ func Profile(c *fiber.Ctx) error {
2525
if err != nil {
2626
return err
2727
}
28-
currentUser, err := queries.GetUserByID(nil, uid)
29-
if err != nil {
30-
return err
31-
}
32-
if !(uid == id || currentUser.IsAdmin || currentUser.IsCommunityAdmin) {
33-
response.Reward = -1
34-
}
3528
return c.Status(fiber.StatusOK).JSON(models.OKResponse{
3629
Data: response,
3730
Error: false,

pkg/queries/user.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -346,12 +346,14 @@ func GetProfile(db *gorm.DB, id uint, uid uint) (models.ProfileResponse, error)
346346
if user.IsAnonymous && id != uid {
347347
return models.ProfileResponse{ID: id, NickName: user.NickName, Avatar: avatar, IsAnonymous: user.IsAnonymous, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin}, nil
348348
} else {
349-
r := models.ProfileResponse{ID: id, Email: user.Email, Year: user.Year, Grade: user.Grade, NickName: user.NickName, RealName: user.RealName, IsAnonymous: user.IsAnonymous, Avatar: avatar, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin, Reward: user.Reward}
349+
r := models.ProfileResponse{ID: id, Email: user.Email, Year: user.Year, Grade: user.Grade, NickName: user.NickName, RealName: user.RealName, IsAnonymous: user.IsAnonymous, Avatar: avatar, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin}
350350
if id == uid {
351351
r.InvitationCode = user.InvitationCode
352352
}
353353
if id == uid || user.IsAdmin || user.IsCommunityAdmin {
354354
r.Reward = user.Reward
355+
} else {
356+
r.Reward = -1
355357
}
356358
return r, nil
357359
}

0 commit comments

Comments
 (0)