refactor: move personal reward display condition into pkg/queries/use…

…r.go.
ShanghaitechGeekPie · Apr 10, 2024 · 5aa4c2d · 5aa4c2d
1 parent 11d169f
commit 5aa4c2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/internal/controllers/users/profile.go b/internal/controllers/users/profile.go
@@ -25,13 +25,6 @@ func Profile(c *fiber.Ctx) error {
  if err != nil {
  return err
  }
- currentUser, err := queries.GetUserByID(nil, uid)
- if err != nil {
- return err
- }
- if !(uid == id || currentUser.IsAdmin || currentUser.IsCommunityAdmin) {
- response.Reward = -1
- }
  return c.Status(fiber.StatusOK).JSON(models.OKResponse{
  Data: response,
  Error: false,

diff --git a/pkg/queries/user.go b/pkg/queries/user.go
@@ -346,12 +346,14 @@ func GetProfile(db *gorm.DB, id uint, uid uint) (models.ProfileResponse, error)
  if user.IsAnonymous && id != uid {
  return models.ProfileResponse{ID: id, NickName: user.NickName, Avatar: avatar, IsAnonymous: user.IsAnonymous, IsAdmin: user.IsAdmin, IsCommunityAdmin: user.IsCommunityAdmin}, nil
  } else {
- 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}
+ 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}
  if id == uid {
  r.InvitationCode = user.InvitationCode
  }
  if id == uid || user.IsAdmin || user.IsCommunityAdmin {
  r.Reward = user.Reward
+ } else {
+ r.Reward = -1
  }
  return r, nil
  }