Merge branch 'feat/1.0.6/fixbug' into test

internal/controller/comment_controller.go

@@ -112,6 +112,18 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {
 
 	req.UserID = middleware.GetLoginUserIDFromContext(ctx)
 	req.IsAdmin = middleware.GetIsAdminFromContext(ctx)
+	canList, err := cc.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		permission.CommentAdd,
+		permission.CommentEdit,
+		permission.CommentDelete,
+	})
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+	req.CanAdd = canList[0]
+	req.CanEdit = canList[1]
+	req.CanDelete = canList[2]
 	can, err := cc.rankService.CheckOperationPermission(ctx, req.UserID, permission.CommentEdit, req.CommentID)
 	if err != nil {
 		handler.HandleResponse(ctx, err, nil)
@@ -122,8 +134,8 @@ func (cc *CommentController) UpdateComment(ctx *gin.Context) {
 		return
 	}
 
-	err = cc.commentService.UpdateComment(ctx, req)
-	handler.HandleResponse(ctx, err, nil)
+	resp, err := cc.commentService.UpdateComment(ctx, req)
+	handler.HandleResponse(ctx, err, resp)
 }
 
 // GetCommentWithPage get comment page

internal/controller/template_controller.go

@@ -451,6 +451,7 @@ func (tc *TemplateController) html(ctx *gin.Context, code int, tpl string, siteI
 	if !ok {
 		data["path"] = ""
 	}
+	ctx.Header("X-Frame-Options", "DENY")
 	ctx.HTML(code, tpl, data)
 }
 

internal/schema/comment_schema.go

@@ -53,6 +53,12 @@ type UpdateCommentReq struct {
 	// user id
 	UserID  string `json:"-"`
 	IsAdmin bool   `json:"-"`
+
+	CanAdd bool `json:"-"`
+	// whether user can edit it
+	CanEdit bool `json:"-"`
+	// whether user can delete it
+	CanDelete bool `json:"-"`
 }
 
 func (req *UpdateCommentReq) Check() (errFields []*validator.FormErrorField, err error) {

internal/service/answer_service.go

@@ -164,7 +164,7 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
 	if err != nil {
 		log.Error("UpdateLastAnswer error", err.Error())
 	}
-	err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
+	err = as.questionCommon.UpdatePostTime(ctx, req.QuestionID)
 	if err != nil {
 		return insertData.ID, err
 	}
@@ -268,7 +268,7 @@ func (as *AnswerService) Update(ctx context.Context, req *schema.AnswerUpdateReq
 		if err = as.answerRepo.UpdateAnswer(ctx, insertData, []string{"original_text", "parsed_text", "updated_at", "last_edit_user_id"}); err != nil {
 			return "", err
 		}
-		err = as.questionCommon.UpdataPostTime(ctx, req.QuestionID)
+		err = as.questionCommon.UpdatePostTime(ctx, req.QuestionID)
 		if err != nil {
 			return insertData.ID, err
 		}

internal/service/comment/comment_service.go

@@ -209,24 +209,40 @@ func (cs *CommentService) RemoveComment(ctx context.Context, req *schema.RemoveC
 }
 
 // UpdateComment update comment
-func (cs *CommentService) UpdateComment(ctx context.Context, req *schema.UpdateCommentReq) (err error) {
+func (cs *CommentService) UpdateComment(ctx context.Context, req *schema.UpdateCommentReq) (
+	resp *schema.GetCommentResp, err error) {
+	resp = &schema.GetCommentResp{}
+
 	old, exist, err := cs.commentCommonRepo.GetComment(ctx, req.CommentID)
 	if err != nil {
 		return
 	}
 	if !exist {
-		return errors.BadRequest(reason.CommentNotFound)
+		return resp, errors.BadRequest(reason.CommentNotFound)
 	}
 
 	// user can edit the comment that was posted by himself before deadline.
 	if !req.IsAdmin && (time.Now().After(old.CreatedAt.Add(constant.CommentEditDeadline))) {
-		return errors.BadRequest(reason.CommentCannotEditAfterDeadline)
+		return resp, errors.BadRequest(reason.CommentCannotEditAfterDeadline)
 	}
 
 	comment := &entity.Comment{}
 	_ = copier.Copy(comment, req)
 	comment.ID = req.CommentID
-	return cs.commentRepo.UpdateComment(ctx, comment)
+	resp.SetFromComment(comment)
+	resp.MemberActions = permission.GetCommentPermission(ctx, req.UserID, resp.UserID,
+		time.Now(), req.CanEdit, req.CanDelete)
+	userInfo, exist, err := cs.userCommon.GetUserBasicInfoByID(ctx, resp.UserID)
+	if err != nil {
+		return nil, err
+	}
+	if exist {
+		resp.Username = userInfo.Username
+		resp.UserDisplayName = userInfo.DisplayName
+		resp.UserAvatar = userInfo.Avatar
+		resp.UserStatus = userInfo.Status
+	}
+	return resp, cs.commentRepo.UpdateComment(ctx, comment)
 }
 
 // GetComment get comment one

internal/service/question_common/question.go

@@ -112,14 +112,14 @@ func (qs *QuestionCommon) UpdateLastAnswer(ctx context.Context, questionID, Answ
 	return qs.questionRepo.UpdateLastAnswer(ctx, question)
 }
 
-func (qs *QuestionCommon) UpdataPostTime(ctx context.Context, questionID string) error {
+func (qs *QuestionCommon) UpdatePostTime(ctx context.Context, questionID string) error {
 	questioninfo := &entity.Question{}
 	now := time.Now()
 	questioninfo.ID = questionID
 	questioninfo.PostUpdateTime = now
 	return qs.questionRepo.UpdateQuestion(ctx, questioninfo, []string{"post_update_time"})
 }
-func (qs *QuestionCommon) UpdataPostSetTime(ctx context.Context, questionID string, setTime time.Time) error {
+func (qs *QuestionCommon) UpdatePostSetTime(ctx context.Context, questionID string, setTime time.Time) error {
 	questioninfo := &entity.Question{}
 	questioninfo.ID = questionID
 	questioninfo.PostUpdateTime = setTime

internal/service/revision_service.go

@@ -191,7 +191,7 @@ func (rs *RevisionService) revisionAuditAnswer(ctx context.Context, revisionitem
 		if saveerr != nil {
 			return saveerr
 		}
-		saveerr = rs.questionCommon.UpdataPostSetTime(ctx, answerinfo.QuestionID, PostUpdateTime)
+		saveerr = rs.questionCommon.UpdatePostSetTime(ctx, answerinfo.QuestionID, PostUpdateTime)
 		if saveerr != nil {
 			return saveerr
 		}