Merge branch 'dev' into test

apache · Oct 18, 2024 · 07e80ab · 07e80ab
2 parents fe1576b + bc8c699
commit 07e80ab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go
@@ -139,7 +139,6 @@ func (tc *TemplateController) Index(ctx *gin.Context) {
 		OrderCond: "newest",
 	}
 	if handler.BindAndCheck(ctx, req) {
-		tc.Page404(ctx)
 		return
 	}
 
@@ -182,7 +181,6 @@ func (tc *TemplateController) QuestionList(ctx *gin.Context) {
 		OrderCond: "newest",
 	}
 	if handler.BindAndCheck(ctx, req) {
-		tc.Page404(ctx)
 		return
 	}
 	var page = req.Page

diff --git a/internal/repo/question/question_repo.go b/internal/repo/question/question_repo.go
@@ -729,7 +729,7 @@ func (qr *questionRepo) UpdateQuestionLinkStatus(ctx context.Context, status int
 func (qr *questionRepo) GetQuestionLink(ctx context.Context, page, pageSize int, questionID string, orderCond string, inDays int) (questionList []*entity.Question, total int64, err error) {
 	questionList = make([]*entity.Question, 0)
 	questionID = uid.DeShortID(questionID)
-	questionStatus := []int{entity.QuestionStatusAvailable, entity.QuestionStatusPending}
+	questionStatus := []int{entity.QuestionStatusAvailable, entity.QuestionStatusClosed, entity.QuestionStatusPending}
 	if questionID == "0" {
 		return nil, 0, errors.InternalServer(reason.DatabaseError).WithError(
 			fmt.Errorf("questionID is empty"),

diff --git a/internal/schema/question_schema.go b/internal/schema/question_schema.go
@@ -346,6 +346,7 @@ const (
 	QuestionOrderCondHot        = "hot"
 	QuestionOrderCondScore      = "score"
 	QuestionOrderCondUnanswered = "unanswered"
+	QuestionOrderCondRecommend  = "recommend"
 
 	// HotInDays limit max days of the hottest question
 	HotInDays = 90