A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
update comment
aichy126b901f5e3a823
diff --git a/internal/controller/comment_controller.go b/internal/controller/comment_controller.goindex 79ed9681..6b74b754 100644--- a/internal/controller/comment_controller.go+++ b/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 pagediff --git a/internal/schema/comment_schema.go b/internal/schema/comment_schema.goindex dcc44bd5..5b045a07 100644--- a/internal/schema/comment_schema.go+++ b/internal/schema/comment_schema.go@@ -53,6 +53,12 @@ type UpdateCommentReq struct {// user idUserID 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) {diff --git a/internal/service/comment/comment_service.go b/internal/service/comment/comment_service.goindex 18b755ab..6a33ee90 100644--- a/internal/service/comment/comment_service.go+++ b/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