Skip to content

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.

fix(review): fix review

LinkinStars6dd862496c1f
diff --git a/docs/docs.go b/docs/docs.go
index 9ee5856d..6c02e33c 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -8144,7 +8144,7 @@ const docTemplate = `{
"type": "string"
},
"review_id": {
- "type": "string"
+ "type": "integer"
},
"submit_at": {
"type": "integer"
@@ -9764,7 +9764,7 @@ const docTemplate = `{
],
"properties": {
"review_id": {
- "type": "string"
+ "type": "integer"
},
"status": {
"type": "string",
diff --git a/docs/swagger.json b/docs/swagger.json
index 4429af0b..d275df8d 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -8132,7 +8132,7 @@
"type": "string"
},
"review_id": {
- "type": "string"
+ "type": "integer"
},
"submit_at": {
"type": "integer"
@@ -9752,7 +9752,7 @@
],
"properties": {
"review_id": {
- "type": "string"
+ "type": "integer"
},
"status": {
"type": "string",
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index ae4ed789..291069ed 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1043,7 +1043,7 @@ definitions:
parsed_text:
type: string
review_id:
- type: string
+ type: integer
submit_at:
type: integer
submitter_display_name:
@@ -2154,7 +2154,7 @@ definitions:
schema.UpdateReviewReq:
properties:
review_id:
- type: string
+ type: integer
status:
enum:
- approve
diff --git a/internal/controller/review_controller.go b/internal/controller/review_controller.go
index 0000a951..5331cc52 100644
--- a/internal/controller/review_controller.go
+++ b/internal/controller/review_controller.go
@@ -21,6 +21,7 @@ package controller
import (
"github.com/apache/incubator-answer/internal/base/handler"
+ "github.com/apache/incubator-answer/internal/base/middleware"
"github.com/apache/incubator-answer/internal/schema"
"github.com/apache/incubator-answer/internal/service/action"
"github.com/apache/incubator-answer/internal/service/rank"
@@ -96,6 +97,7 @@ func (rc *ReviewController) UpdateReview(ctx *gin.Context) {
}
// TODO: check permission
+ req.UserID = middleware.GetLoginUserIDFromContext(ctx)
err := rc.reviewService.UpdateReview(ctx, req)
handler.HandleResponse(ctx, err, nil)
diff --git a/internal/entity/review_entity.go b/internal/entity/review_entity.go
index 199e635d..c88de007 100644
--- a/internal/entity/review_entity.go
+++ b/internal/entity/review_entity.go
@@ -29,7 +29,7 @@ const (
// Review review
type Review struct {
- ID string `xorm:"not null pk autoincr BIGINT(20) id"`
+ ID int `xorm:"not null pk autoincr BIGINT(20) id"`
CreatedAt time.Time `xorm:"created TIMESTAMP created_at"`
UpdatedAt time.Time `xorm:"updated TIMESTAMP updated_at"`
UserID string `xorm:"not null BIGINT(20) user_id"`
@@ -37,7 +37,7 @@ type Review struct {
ObjectType int `xorm:"not null default 0 INT(11) object_type"`
ReviewerUserID string `xorm:"not null default 0 BIGINT(20) reviewer_user_id"`
Submitter string `xorm:"not null default '' VARCHAR(100) submitter"`
- Reason string `xorm:"not null default '' TEXT reason"`
+ Reason string `xorm:"not null TEXT reason"`
Status int `xorm:"not null default 0 INT(11) status"`
}
diff --git a/internal/repo/review/review_repo.go b/internal/repo/review/review_repo.go
index 80a02071..91bc046c 100644
--- a/internal/repo/review/review_repo.go
+++ b/internal/repo/review/review_repo.go
@@ -52,7 +52,7 @@ func (cr *reviewRepo) AddReview(ctx context.Context, review *entity.Review) (err
}
// UpdateReviewStatus update review status
-func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error) {
+func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID int, reviewerUserID string, status int) (err error) {
_, err = cr.data.DB.Context(ctx).ID(reviewID).Update(&entity.Review{
ReviewerUserID: reviewerUserID, Status: status})
if err != nil {
@@ -62,7 +62,7 @@ func (cr *reviewRepo) UpdateReviewStatus(ctx context.Context, reviewID, reviewer
}
// GetReview get review one
-func (cr *reviewRepo) GetReview(ctx context.Context, reviewID string) (
+func (cr *reviewRepo) GetReview(ctx context.Context, reviewID int) (
review *entity.Review, exist bool, err error) {
review = &entity.Review{}
exist, err = cr.data.DB.Context(ctx).ID(reviewID).Get(review)
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index ee03c107..a86b4da1 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -2,7 +2,7 @@ package schema
// UpdateReviewReq update review request
type UpdateReviewReq struct {
- ReviewID string `validate:"required" json:"review_id"`
+ ReviewID int `validate:"required" json:"review_id"`
Status string `validate:"required,oneof=approve reject" json:"status"`
UserID string `json:"-"`
}
@@ -24,7 +24,7 @@ type GetUnreviewedPostPageReq struct {
// GetUnreviewedPostPageResp get review page response
type GetUnreviewedPostPageResp struct {
- ReviewID string `json:"review_id"`
+ ReviewID int `json:"review_id"`
CreatedAt int64 `json:"created_at"`
ObjectID string `json:"object_id"`
ObjectType string `json:"object_type" enums:"question,answer,comment"`
diff --git a/internal/service/content/answer_service.go b/internal/service/content/answer_service.go
index a916c016..e832c31c 100644
--- a/internal/service/content/answer_service.go
+++ b/internal/service/content/answer_service.go
@@ -235,14 +235,16 @@ func (as *AnswerService) Insert(ctx context.Context, req *schema.AnswerAddReq) (
insertData.QuestionID = req.QuestionID
insertData.RevisionID = "0"
insertData.LastEditUserID = "0"
- insertData.Status = entity.AnswerStatusAvailable
+ insertData.Status = entity.AnswerStatusPending
//insertData.UpdatedAt = now
- if as.reviewService.AddAnswerReview(ctx, insertData) {
- insertData.Status = entity.AnswerStatusPending
- }
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
+ }
+ }
err = as.questionCommon.UpdateAnswerCount(ctx, req.QuestionID)
if err != nil {
log.Error("IncreaseAnswerCount error", err.Error())
diff --git a/internal/service/content/question_service.go b/internal/service/content/question_service.go
index aa1eff3b..1d0851b9 100644
--- a/internal/service/content/question_service.go
+++ b/internal/service/content/question_service.go
@@ -303,20 +303,22 @@ func (qs *QuestionService) AddQuestion(ctx context.Context, req *schema.Question
question.LastAnswerID = "0"
question.LastEditUserID = "0"
//question.PostUpdateTime = nil
- question.Status = entity.QuestionStatusAvailable
+ question.Status = entity.QuestionStatusPending
question.RevisionID = "0"
question.CreatedAt = now
question.PostUpdateTime = now
question.Pin = entity.QuestionUnPin
question.Show = entity.QuestionShow
//question.UpdatedAt = nil
- if qs.reviewService.AddQuestionReview(ctx, question, req.Tags) {
- question.Status = entity.QuestionStatusPending
- }
err = qs.questionRepo.AddQuestion(ctx, question)
if 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
+ }
+ }
objectTagData := schema.TagChange{}
objectTagData.ObjectID = question.ID
objectTagData.Tags = req.Tags
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index bead8ee4..56a692bb 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -32,6 +32,7 @@ import (
questioncommon "github.com/apache/incubator-answer/internal/service/question_common"
"github.com/apache/incubator-answer/internal/service/role"
usercommon "github.com/apache/incubator-answer/internal/service/user_common"
+ "github.com/apache/incubator-answer/pkg/uid"
"github.com/apache/incubator-answer/plugin"
"github.com/jinzhu/copier"
"github.com/segmentfault/pacman/errors"
@@ -41,8 +42,8 @@ import (
// ReviewRepo review repository
type ReviewRepo interface {
AddReview(ctx context.Context, review *entity.Review) (err error)
- UpdateReviewStatus(ctx context.Context, reviewID, reviewerUserID string, status int) (err error)
- GetReview(ctx context.Context, reviewID string) (review *entity.Review, exist bool, err error)
+ UpdateReviewStatus(ctx context.Context, reviewID int, reviewerUserID string, status int) (err error)
+ GetReview(ctx context.Context, reviewID int) (review *entity.Review, exist bool, err error)
GetReviewCount(ctx context.Context, status int) (count int64, err error)
GetReviewPage(ctx context.Context, page, pageSize int, cond *entity.Review) (reviewList []*entity.Review, total int64, err error)
}
@@ -80,8 +81,9 @@ func NewReviewService(
func (cs *ReviewService) AddQuestionReview(ctx context.Context,
question *entity.Question, tags []*schema.TagItem) (needReview bool) {
reviewContent := &plugin.ReviewContent{
- Title: question.Title,
- Content: question.ParsedText,
+ ObjectType: constant.QuestionObjectType,
+ Title: question.Title,
+ Content: question.ParsedText,
}
for _, tag := range tags {
reviewContent.Tags = append(reviewContent.Tags, tag.SlugName)
@@ -124,12 +126,14 @@ func (cs *ReviewService) callPluginToReview(ctx context.Context, userID, objectI
reviewContent *plugin.ReviewContent) (approved bool) {
// As default, no need review
approved = true
+ objectID = uid.DeShortID(objectID)
r := &entity.Review{
- UserID: userID,
- ObjectID: objectID,
- ObjectType: constant.ObjectTypeStrMapping[reviewContent.ObjectType],
- Status: entity.ReviewStatusPending,
+ UserID: userID,
+ ObjectID: objectID,
+ ObjectType: constant.ObjectTypeStrMapping[reviewContent.ObjectType],
+ ReviewerUserID: "0",
+ Status: entity.ReviewStatusPending,
}
_ = plugin.CallReviewer(func(reviewer plugin.Reviewer) error {
@@ -223,7 +227,7 @@ func (cs *ReviewService) GetReviewPendingCount(ctx context.Context) (count int64
// GetUnreviewedPostPage get review page
func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.GetUnreviewedPostPageReq) (
pageModel *pager.PageModel, err error) {
- reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{})
+ reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{Status: entity.ReviewStatusPending})
if err != nil {
return
}
@@ -257,6 +261,7 @@ func (cs *ReviewService) GetUnreviewedPostPage(ctx context.Context, req *schema.
if exists {
_ = copier.Copy(&r.UserInfo, userInfo)
}
+ resp = append(resp, r)
}
return pager.NewPageModel(total, resp), nil
}