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(admin/contents): feat pending list
kumfo7546aabca97a
diff --git a/docs/docs.go b/docs/docs.goindex 6c02e33c..74f2b9df 100644--- a/docs/docs.go+++ b/docs/docs.go@@ -1,5 +1,4 @@-// Code generated by swaggo/swag. DO NOT EDIT.-+// Package docs Code generated by swaggo/swag. DO NOT EDITpackage docsimport "github.com/swaggo/swag"@@ -39,7 +38,7 @@ const docTemplate = `{"ApiKeyAuth": []}],- "description": "Status:[available,deleted]",+ "description": "Status:[available,deleted,pending]","consumes": ["application/json"],@@ -66,7 +65,8 @@ const docTemplate = `{{"enum": ["available",- "deleted"+ "deleted",+ "pending"],"type": "string","description": "user status",@@ -369,7 +369,7 @@ const docTemplate = `{"ApiKeyAuth": []}],- "description": "Status:[available,closed,deleted]",+ "description": "Status:[available,closed,deleted,pending]","consumes": ["application/json"],@@ -397,7 +397,8 @@ const docTemplate = `{"enum": ["available","closed",- "deleted"+ "deleted",+ "pending"],"type": "string","description": "user status",diff --git a/docs/swagger.json b/docs/swagger.jsonindex d275df8d..c133e0c9 100644--- a/docs/swagger.json+++ b/docs/swagger.json@@ -27,7 +27,7 @@"ApiKeyAuth": []}],- "description": "Status:[available,deleted]",+ "description": "Status:[available,deleted,pending]","consumes": ["application/json"],@@ -54,7 +54,8 @@{"enum": ["available",- "deleted"+ "deleted",+ "pending"],"type": "string","description": "user status",@@ -357,7 +358,7 @@"ApiKeyAuth": []}],- "description": "Status:[available,closed,deleted]",+ "description": "Status:[available,closed,deleted,pending]","consumes": ["application/json"],@@ -385,7 +386,8 @@"enum": ["available","closed",- "deleted"+ "deleted",+ "pending"],"type": "string","description": "user status",diff --git a/docs/swagger.yaml b/docs/swagger.yamlindex 291069ed..8d5e305a 100644--- a/docs/swagger.yaml+++ b/docs/swagger.yaml@@ -2611,7 +2611,7 @@ paths:get:consumes:- application/json- description: Status:[available,deleted]+ description: Status:[available,deleted,pending]parameters:- description: page sizein: query@@ -2625,6 +2625,7 @@ paths:enum:- available- deleted+ - pendingin: queryname: statustype: string@@ -2812,7 +2813,7 @@ paths:get:consumes:- application/json- description: Status:[available,closed,deleted]+ description: Status:[available,closed,deleted,pending]parameters:- description: page sizein: query@@ -2827,6 +2828,7 @@ paths:- available- closed- deleted+ - pendingin: queryname: statustype: stringdiff --git a/internal/controller/question_controller.go b/internal/controller/question_controller.goindex 3e21c87b..3f5f936c 100644--- a/internal/controller/question_controller.go+++ b/internal/controller/question_controller.go@@ -870,14 +870,14 @@ func (qc *QuestionController) PersonalCollectionPage(ctx *gin.Context) {// AdminQuestionPage admin question page// @Summary AdminQuestionPage admin question page-// @Description Status:[available,closed,deleted]+// @Description Status:[available,closed,deleted,pending]// @Tags admin// @Accept json// @Produce json// @Security ApiKeyAuth// @Param page query int false "page size"// @Param page_size query int false "page size"-// @Param status query string false "user status" Enums(available, closed, deleted)+// @Param status query string false "user status" Enums(available, closed, deleted, pending)// @Param query query string false "question id or title"// @Success 200 {object} handler.RespBody// @Router /answer/admin/api/question/page [get]@@ -894,14 +894,14 @@ func (qc *QuestionController) AdminQuestionPage(ctx *gin.Context) {// AdminAnswerPage admin answer page// @Summary AdminAnswerPage admin answer page-// @Description Status:[available,deleted]+// @Description Status:[available,deleted,pending]// @Tags admin// @Accept json// @Produce json// @Security ApiKeyAuth// @Param page query int false "page size"// @Param page_size query int false "page size"-// @Param status query string false "user status" Enums(available,deleted)+// @Param status query string false "user status" Enums(available,deleted,pending)// @Param query query string false "answer id or question title"// @Param question_id query string false "question id"// @Success 200 {object} handler.RespBodydiff --git a/internal/entity/answer_entity.go b/internal/entity/answer_entity.goindex 39a17ebf..ee5bbc2c 100644--- a/internal/entity/answer_entity.go+++ b/internal/entity/answer_entity.go@@ -34,6 +34,7 @@ const (var AdminAnswerSearchStatus = map[string]int{"available": AnswerStatusAvailable,"deleted": AnswerStatusDeleted,+ "pending": AnswerStatusPending,}// Answer answerdiff --git a/internal/entity/question_entity.go b/internal/entity/question_entity.goindex 0e589aeb..280cc670 100644--- a/internal/entity/question_entity.go+++ b/internal/entity/question_entity.go@@ -38,12 +38,14 @@ var AdminQuestionSearchStatus = map[string]int{"available": QuestionStatusAvailable,"closed": QuestionStatusClosed,"deleted": QuestionStatusDeleted,+ "pending": QuestionStatusPending,}var AdminQuestionSearchStatusIntToString = map[int]string{QuestionStatusAvailable: "available",QuestionStatusClosed: "closed",QuestionStatusDeleted: "deleted",+ QuestionStatusPending: "pending",}// Question questiondiff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.goindex a7c305dd..5944203b 100644--- a/internal/schema/question_schema.go+++ b/internal/schema/question_schema.go@@ -405,7 +405,7 @@ type QuestionPageRespOperator struct {type AdminQuestionPageReq struct {Page int `validate:"omitempty,min=1" form:"page"`PageSize int `validate:"omitempty,min=1" form:"page_size"`- StatusCond string `validate:"omitempty,oneof=normal closed deleted" form:"status"`+ StatusCond string `validate:"omitempty,oneof=normal closed deleted pending" form:"status"`Query string `validate:"omitempty,gt=0,lte=100" json:"query" form:"query" `Status int `json:"-"`LoginUserID string `json:"-"`@@ -426,7 +426,7 @@ func (req *AdminQuestionPageReq) Check() (errField []*validator.FormErrorField,type AdminAnswerPageReq struct {Page int `validate:"omitempty,min=1" form:"page"`PageSize int `validate:"omitempty,min=1" form:"page_size"`- StatusCond string `validate:"omitempty,oneof=normal deleted" form:"status"`+ StatusCond string `validate:"omitempty,oneof=normal deleted pending" form:"status"`Query string `validate:"omitempty,gt=0,lte=100" form:"query"`QuestionID string `validate:"omitempty,gt=0,lte=24" form:"question_id"`QuestionTitle string `json:"-"`