merge from x/gorm branch

internal/dao/slonik/messages.go

@@ -7,6 +7,7 @@ package slonik
 import (
 	"github.com/jackc/pgx/v5"
 	"github.com/rocboss/paopao-ce/internal/core"
+	"github.com/rocboss/paopao-ce/internal/core/cs"
 	"github.com/rocboss/paopao-ce/internal/core/ms"
 	"github.com/rocboss/paopao-ce/pkg/debug"
 )
@@ -43,16 +44,9 @@ func (s *messageSrv) ReadMessage(message *ms.Message) error {
 	return nil
 }
 
-func (s *messageSrv) GetMessages(userId int64, offset, limit int) ([]*ms.MessageFormated, error) {
+func (s *messageSrv) GetMessages(userId int64, style cs.MessageStyle, limit, offset int) ([]*ms.MessageFormated, int64, error) {
 	// TODO
-	debug.NotImplemented()
-	return nil, nil
-}
-
-func (s *messageSrv) GetMessageCount(userId int64) (int64, error) {
-	// TODO
-	debug.NotImplemented()
-	return 0, nil
+	return nil, 0, cs.ErrNotImplemented
 }
 
 func newMessageService(db *pgx.Conn) core.MessageService {

internal/dao/slonik/slonik.go

@@ -37,6 +37,8 @@ type dataSrv struct {
 	core.AttachmentCheckService
 	core.TweetMetricServantA
 	core.CommentMetricServantA
+	core.UserMetricServantA
+	core.TrendsManageServantA
 }
 
 type webDataSrvA struct {
@@ -50,11 +52,14 @@ func NewDataService() (core.DataService, core.VersionInfo) {
 	db := pgxDB()
 	pvs := security.NewPhoneVerifyService()
 	cms := newCommentMetricServentA(db)
+	ums := newUserMetricServentA(db)
 	tms := newTweetMetricServentA(db)
 	cis := cache.NewEventCacheIndexSrv(tms)
 	ds := &dataSrv{
 		TweetMetricServantA:    tms,
 		CommentMetricServantA:  cms,
+		UserMetricServantA:     ums,
+		TrendsManageServantA:   newTrendsManageServentA(db),
 		WalletService:          newWalletService(db),
 		MessageService:         newMessageService(db),
 		TopicService:           newTopicService(db),

internal/dao/slonik/trends.go

@@ -0,0 +1,26 @@
+// Copyright 2023 ROC. All rights reserved.
+// Use of this source code is governed by a MIT style
+// license that can be found in the LICENSE file.
+
+package slonik
+
+import (
+	"github.com/jackc/pgx/v5"
+	"github.com/rocboss/paopao-ce/internal/core"
+	"github.com/rocboss/paopao-ce/internal/core/cs"
+)
+
+type trendsSrvA struct {
+	*pgxSrv
+}
+
+func (s *trendsSrvA) GetIndexTrends(userId int64, limit int, offset int) (res []*cs.TrendsItem, total int64, err error) {
+	// TODO
+	return nil, 0, cs.ErrNotImplemented
+}
+
+func newTrendsManageServentA(db *pgx.Conn) core.TrendsManageServantA {
+	return &trendsSrvA{
+		pgxSrv: newPgxSrv(db),
+	}
+}