- 文章列表接口 MongoDB 排序条件优化，如果不是按照创建时间排序，则新增创建时间排序为第二个优先级排序

- 代码优化
chenmingyong0423 · Jan 27, 2024 · 87ddd15 · 87ddd15
1 parent fe5bdab
commit 87ddd15
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/server/go.mod b/server/go.mod
@@ -14,6 +14,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/viper v1.18.2
 	go.mongodb.org/mongo-driver v1.13.1
+	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
@@ -57,7 +58,6 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect

diff --git a/server/internal/post/repository/post_repository.go b/server/internal/post/repository/post_repository.go
@@ -249,7 +249,11 @@ func (r *PostRepository) QueryPostsPage(ctx context.Context, postsQueryCondition
 	findOptions := options.Find()
 	findOptions.SetSkip(postsQueryCondition.Skip).SetLimit(postsQueryCondition.Size)
 	if postsQueryCondition.Sorting.Field != nil && postsQueryCondition.Sorting.Order != nil {
-		findOptions.SetSort(bsonx.M(*postsQueryCondition.Sorting.Field, orderConvertToInt(*postsQueryCondition.Sorting.Order)))
+		sortBuilder := bsonx.NewD().Add(*postsQueryCondition.Sorting.Field, orderConvertToInt(*postsQueryCondition.Sorting.Order))
+		if *postsQueryCondition.Sorting.Field != "create_time" {
+			sortBuilder.Add("create_time", -1)
+		}
+		findOptions.SetSort(sortBuilder.Build())
 	} else {
 		findOptions.SetSort(bsonx.M("create_time", -1))
 	}

diff --git a/server/internal/tag/service/tags_service.go b/server/internal/tag/service/tags_service.go
@@ -16,8 +16,12 @@ package service
 
 import (
 	"context"
+	"fmt"
+	"log/slog"
 	"net/http"
 
+	"github.com/gin-gonic/gin"
+
 	"github.com/chenmingyong0423/fnote/server/internal/count_stats/service"
 	"github.com/chenmingyong0423/fnote/server/internal/pkg/api"
 	"github.com/chenmingyong0423/fnote/server/internal/pkg/domain"
@@ -81,7 +85,8 @@ func (s *TagService) DeleteTag(ctx context.Context, id string) error {
 		// 分类数量 -1
 		gErr := s.countStatsService.DecreaseByReferenceIdAndType(ctx, domain.CountStatsTypeTagCount.ToString(), domain.CountStatsTypeTagCount)
 		if gErr != nil {
-
+			l := slog.Default().With("X-Request-ID", ctx.(*gin.Context).GetString("X-Request-ID"))
+			l.WarnContext(ctx, fmt.Sprintf("%+v", gErr))
 		}
 	}()
 	return nil
@@ -112,7 +117,8 @@ func (s *TagService) AdminCreateTag(ctx context.Context, tag domain.Tag) error {
 		// 分类数量 +1
 		gErr := s.countStatsService.IncreaseByReferenceIdAndType(ctx, domain.CountStatsTypeTagCount.ToString(), domain.CountStatsTypeTagCount)
 		if gErr != nil {
-
+			l := slog.Default().With("X-Request-ID", ctx.(*gin.Context).GetString("X-Request-ID"))
+			l.WarnContext(ctx, fmt.Sprintf("%+v", gErr))
 		}
 	}()
 	return nil

diff --git a/server/internal/visit_log/repository/dao/vl_dao.go b/server/internal/visit_log/repository/dao/vl_dao.go
@@ -16,9 +16,10 @@ package dao
 
 import (
 	"context"
-	"github.com/chenmingyong0423/go-mongox/builder/query"
 	"time"
 
+	"github.com/chenmingyong0423/go-mongox/builder/query"
+
 	"github.com/chenmingyong0423/go-mongox"
 
 	"github.com/pkg/errors"

diff --git a/server/internal/visit_log/service/vl_service.go b/server/internal/visit_log/service/vl_service.go
@@ -16,6 +16,7 @@ package service
 
 import (
 	"context"
+
 	"github.com/chenmingyong0423/fnote/server/internal/pkg/domain"
 	"github.com/chenmingyong0423/fnote/server/internal/visit_log/repository"
 	"github.com/pkg/errors"