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.

feat(review): add object id query condition for review

LinkinStarsc72237844ffe
diff --git a/internal/schema/review_schema.go b/internal/schema/review_schema.go
index a86b4da1..f76253c5 100644
--- a/internal/schema/review_schema.go
+++ b/internal/schema/review_schema.go
@@ -1,5 +1,10 @@
package schema
+import (
+ "github.com/apache/incubator-answer/internal/base/validator"
+ "github.com/apache/incubator-answer/pkg/uid"
+)
+
// UpdateReviewReq update review request
type UpdateReviewReq struct {
ReviewID int `validate:"required" json:"review_id"`
@@ -17,11 +22,20 @@ func (r *UpdateReviewReq) IsReject() bool {
// GetUnreviewedPostPageReq get review page request
type GetUnreviewedPostPageReq struct {
- Page int `json:"page" form:"page"`
+ ObjectID string `validate:"omitempty" form:"object_id"`
+ Page int `validate:"omitempty" form:"page"`
ReviewerMapping map[string]string `json:"-"`
UserID string `json:"-"`
}
+func (r *GetUnreviewedPostPageReq) Check() (errField []*validator.FormErrorField, err error) {
+ if len(r.ObjectID) > 0 {
+ r.Page = 1
+ r.ObjectID = uid.DeShortID(r.ObjectID)
+ }
+ return
+}
+
// GetUnreviewedPostPageResp get review page response
type GetUnreviewedPostPageResp struct {
ReviewID int `json:"review_id"`
diff --git a/internal/service/content/revision_service.go b/internal/service/content/revision_service.go
index 3a3b8d5c..6b708833 100644
--- a/internal/service/content/revision_service.go
+++ b/internal/service/content/revision_service.go
@@ -457,14 +457,14 @@ func (rs *RevisionService) GetReviewingType(ctx context.Context, req *schema.Get
// get queue amount
if req.IsAdmin {
- reportCount, err := rs.reviewService.GetReviewPendingCount(ctx)
+ reviewCount, err := rs.reviewService.GetReviewPendingCount(ctx)
if err != nil {
log.Errorf("get report count failed: %v", err)
} else {
resp = append(resp, &schema.GetReviewingTypeResp{
Name: string(constant.QueuedPost),
Label: "Queued post",
- TodoAmount: reportCount,
+ TodoAmount: reviewCount,
})
}
}
diff --git a/internal/service/review/review_service.go b/internal/service/review/review_service.go
index 56a692bb..e0a713fe 100644
--- a/internal/service/review/review_service.go
+++ b/internal/service/review/review_service.go
@@ -227,7 +227,10 @@ 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{Status: entity.ReviewStatusPending})
+ reviewList, total, err := cs.reviewRepo.GetReviewPage(ctx, req.Page, 1, &entity.Review{
+ ObjectID: req.ObjectID,
+ Status: entity.ReviewStatusPending,
+ })
if err != nil {
return
}