Merge pull request #30 from ShanghaitechGeekPie/reward-fix

Fix setting reward for comments and displaying reward in profile
ShanghaitechGeekPie · May 21, 2024 · ea1ae15 · ea1ae15
2 parents fef01e4 + ab3e905
commit ea1ae15
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/internal/controllers/reward/setcomment.go b/internal/controllers/reward/setcomment.go
@@ -38,7 +38,7 @@ func SetComment(c *fiber.Ctx) error {
 	}
 
 	comment := &models.Comment{}
-	result := db.First(&comment, request.ID)
+	result := db.Preload("User").First(&comment, request.ID)
 	if result.Error != nil {
 		return errors.Wrap(result.Error, errors.DatabaseError)
 	}

diff --git a/pkg/queries/user.go b/pkg/queries/user.go
@@ -347,29 +347,42 @@ func GetUserByID(db *gorm.DB, id uint) (*models.User, error) {
 	return user, nil
 }
 
-// id: 被查询用户的id
-// uid: 查询用户的id
-// ip: 查询用户的ip
-func GetProfile(db *gorm.DB, id uint, uid uint) (models.ProfileResponse, error) {
+func GetProfile(db *gorm.DB, queriedUserID uint, queryingUserID uint) (models.ProfileResponse, error) {
 	if db == nil {
 		db = database.GetDB()
 	}
-	user, err := GetUserByID(db, id)
+
+	user, err := GetUserByID(db, queriedUserID)
 	if err != nil {
 		return models.ProfileResponse{}, err
 	}
+
+	displayInvitationCode := queryingUserID == queriedUserID
+	displayReward := queryingUserID == queriedUserID
+
+	// don't query if not logged in
+	if queryingUserID != 0 && queryingUserID != queriedUserID {
+		queryingUser, err := GetUserByID(db, queryingUserID)
+		if err != nil {
+			return models.ProfileResponse{}, err
+		}
+		if queryingUser.IsAdmin || queryingUser.IsCommunityAdmin {
+			displayReward = true
+		}
+	}
+
 	avatar := ""
 	if user.Avatar != "" {
 		avatar = fmt.Sprintf("https://%s/%s/avatar/%s", database.GetEndpoint(), database.MinioConf.Bucket, user.Avatar)
 	}
-	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
+	if user.IsAnonymous && queryingUserID != queriedUserID {
+		return models.ProfileResponse{ID: user.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}
-		if id == uid {
+		r := models.ProfileResponse{ID: user.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 displayInvitationCode {
 			r.InvitationCode = user.InvitationCode
 		}
-		if id == uid || user.IsAdmin || user.IsCommunityAdmin {
+		if displayReward {
 			r.Reward = user.Reward
 		} else {
 			r.Reward = -1