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.
feat(plugin): add review status
LinkinStarsc7f9d08ec777
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.goindex d96d75c5..1b113270 100644--- a/internal/service/content/answer_service.go+++ b/internal/service/content/answer_service.go@@ -241,12 +241,9 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (if err = as.answerRepo.AddAnswer(ctx, insertData); err != nil {return "", err}- if as.reviewService.AddAnswerReview(ctx, insertData) {- if err := as.answerRepo.UpdateAnswerStatus(ctx, insertData.ID, entity.AnswerStatusAvailable); err != nil {- return "", err- } else {- insertData.Status = entity.AnswerStatusAvailable- }+ insertData.Status = as.reviewService.AddAnswerReview(ctx, insertData)+ if err := as.answerRepo.UpdateAnswerStatus(ctx, insertData.ID, insertData.Status); err != nil {+ return "", err}err = as.questionCommon.UpdateAnswerCount(ctx, req.QuestionID)if err != nil {diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.goindex e4f2b499..d717a465 100644--- a/internal/service/content/question_service.go+++ b/internal/service/content/question_service.go@@ -327,12 +327,9 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Questionif err != nil {return}- if qs.reviewService.AddQuestionReview(ctx, question, req.Tags) {- if err := qs.questionRepo.UpdateQuestionStatus(ctx, question.ID, entity.QuestionStatusAvailable); err != nil {- return nil, err- } else {- question.Status = entity.AnswerStatusAvailable- }+ question.Status = qs.reviewService.AddQuestionReview(ctx, question, req.Tags)+ if err := qs.questionRepo.UpdateQuestionStatus(ctx, question.ID, question.Status); err != nil {+ return nil, err}objectTagData := schema.TagChange{}objectTagData.ObjectID = question.IDdiff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.goindex 80c318b1..2d928f6a 100644--- a/internal/service/review/review_service.go+++ b/internal/service/review/review_service.go@@ -99,7 +99,7 @@ func NewReviewService(// AddQuestionReview add review for question if neededfunc (cs *ReviewService) AddQuestionReview(ctx context.Context,- question *entity.Question, tags []*schema.TagItem) (needReview bool) {+ question *entity.Question, tags []*schema.TagItem) (questionStatus int) {reviewContent := &plugin.ReviewContent{ObjectType: constant.QuestionObjectType,Title: question.Title,@@ -109,18 +109,36 @@ func (cs *ReviewService) AddQuestionReview(ctx context.Context,reviewContent.Tags = append(reviewContent.Tags, tag.SlugName)}reviewContent.Author = cs.getReviewContentAuthorInfo(ctx, question.UserID)- return cs.callPluginToReview(ctx, question.UserID, question.ID, reviewContent)+ reviewStatus := cs.callPluginToReview(ctx, question.UserID, question.ID, reviewContent)+ switch reviewStatus {+ case plugin.ReviewStatusApproved:+ questionStatus = entity.QuestionStatusAvailable+ case plugin.ReviewStatusNeedReview:+ questionStatus = entity.QuestionStatusPending+ case plugin.ReviewStatusDeleteDirectly:+ questionStatus = entity.QuestionStatusDeleted+ }+ return questionStatus}// AddAnswerReview add review for answer if neededfunc (cs *ReviewService) AddAnswerReview(ctx context.Context,- answer *entity.Answer) (needReview bool) {+ answer *entity.Answer) (answerStatus int) {reviewContent := &plugin.ReviewContent{ObjectType: constant.AnswerObjectType,Content: answer.ParsedText,}reviewContent.Author = cs.getReviewContentAuthorInfo(ctx, answer.UserID)- return cs.callPluginToReview(ctx, answer.UserID, answer.ID, reviewContent)+ reviewStatus := cs.callPluginToReview(ctx, answer.UserID, answer.ID, reviewContent)+ switch reviewStatus {+ case plugin.ReviewStatusApproved:+ answerStatus = entity.AnswerStatusAvailable+ case plugin.ReviewStatusNeedReview:+ answerStatus = entity.AnswerStatusPending+ case plugin.ReviewStatusDeleteDirectly:+ answerStatus = entity.AnswerStatusDeleted+ }+ return answerStatus}// get review content author info@@ -143,9 +161,9 @@ func (cs *ReviewService) getReviewContentAuthorInfo(ctx context.Context, userID// call plugin to reviewfunc (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectID string,- reviewContent *plugin.ReviewContent) (approved bool) {+ reviewContent *plugin.ReviewContent) (reviewStatus plugin.ReviewStatus) {// As default, no need review- approved = true+ reviewStatus = plugin.ReviewStatusApprovedobjectID = uid.DeShortID(objectID)r := &entity.Review{@@ -161,23 +179,23 @@ func (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectI_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {// If one of the reviewer plugin return false, then the review is not approved- if !approved {+ if reviewStatus != plugin.ReviewStatusApproved {return nil}if result := reviewer.Review(reviewContent); !result.Approved {- approved = false+ reviewStatus = result.ReviewStatusr.Reason = result.Reasonr.Submitter = reviewer.Info().SlugName}return nil})- if !approved {+ if reviewStatus == plugin.ReviewStatusNeedReview {if err := cs.reviewRepo.AddReview(ctx, r); err != nil {log.Errorf("add review failed, err: %v", err)}}- return approved+ return reviewStatus}// UpdateReview update reviewdiff --git a/plugin/reviewer.go b/plugin/reviewer.goindex 4c9165c6..ac193af3 100644--- a/plugin/reviewer.go+++ b/plugin/reviewer.go@@ -52,10 +52,20 @@ type ReviewContentAuthor struct {Role int}+type ReviewStatus string++const (+ ReviewStatusApproved ReviewStatus = "approved"+ ReviewStatusDeleteDirectly ReviewStatus = "delete_directly"+ ReviewStatusNeedReview ReviewStatus = "need_review"+)+// ReviewResult is a struct that contains the result of a reviewtype ReviewResult struct {// If the review is approvedApproved bool+ // The status of the review+ ReviewStatus ReviewStatus// The reason for the resultReason string}