From 54863d2e0deb64667ce794a953a48bb06fa143ce Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Sun, 9 Jun 2024 16:37:42 +0800
Subject: [PATCH] fix: get model issue

---
 grpc/server/task_server.go |  5 +----
 notification/service.go    | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/grpc/server/task_server.go b/grpc/server/task_server.go
index 1b167ee..7d28461 100644
--- a/grpc/server/task_server.go
+++ b/grpc/server/task_server.go
@@ -126,10 +126,7 @@ func (svr TaskServer) SendNotification(ctx context.Context, request *grpc.Reques
 	}
 	settings, _, err := svc.GetSettingList(bson.M{
 		"enabled": true,
-	}, &entity.Pagination{
-		Page: 0,
-		Size: 99999,
-	}, nil)
+	}, nil, nil)
 	if err != nil {
 		return nil, trace.TraceError(err)
 	}
diff --git a/notification/service.go b/notification/service.go
index b1dda58..ae4b50b 100644
--- a/notification/service.go
+++ b/notification/service.go
@@ -269,13 +269,22 @@ func (svc *Service) SendMobile(s *Setting, entity bson.M) (err error) {
 }
 
 func (svc *Service) GetSettingList(query bson.M, pagination *entity.Pagination, sort bson.D) (res []Setting, total int, err error) {
+	// options
+	var options *mongo2.FindOptions
+	if pagination != nil || sort != nil {
+		options = new(mongo2.FindOptions)
+		if pagination != nil {
+			options.Skip = pagination.Size * (pagination.Page - 1)
+			options.Limit = pagination.Size
+		}
+		if sort != nil {
+			options.Sort = sort
+		}
+	}
+
 	// get list
 	var list []Setting
-	if err := svc.col.Find(query, &mongo2.FindOptions{
-		Sort:  sort,
-		Skip:  pagination.Size * (pagination.Page - 1),
-		Limit: pagination.Size,
-	}).All(&list); err != nil {
+	if err := svc.col.Find(query, options).All(&list); err != nil {
 		if err.Error() == mongo.ErrNoDocuments.Error() {
 			return nil, 0, nil
 		} else {