Merge remote-tracking branch 'origin/errcode' into errcode

pkg/common/db/model/group.go

@@ -2,42 +2,42 @@ package model
 
 import (
 	"Open_IM/pkg/common/db/cache"
-	"Open_IM/pkg/common/db/mongo"
+	"Open_IM/pkg/common/db/mongoDB"
 	"Open_IM/pkg/common/db/mysql"
-	"Open_IM/pkg/common/trace_log"
-	"Open_IM/pkg/utils"
 	"context"
-	"encoding/json"
-	//"github.com/dtm-labs/rockscache"
+	"github.com/dtm-labs/rockscache"
+	"github.com/go-redis/redis/v8"
+	"go.mongodb.org/mongo-driver/mongo"
 	"gorm.io/gorm"
 	//"time"
 )
 
-type GroupModel struct {
-	db       *mysql.Group
-	cache    *cache.GroupCache
-	mongo 	 *mongo.Client
+type GroupInterface interface {
+	Find(ctx context.Context, groupIDs []string) (groups []*mysql.Group, err error)
+	Create(ctx context.Context, groups []*mysql.Group) error
+	Delete(ctx context.Context, groupIDs []string) error
+	Take(ctx context.Context, groupID string) (group *mysql.Group, err error)
 }
 
+type GroupModel struct {
+	db    mysql.GroupModelInterface
+	cache *cache.GroupCache
+	mongo *mongoDB.Client
+}
 
-func NewGroupModel() {
+func NewGroupModel(db mysql.GroupModelInterface, rdb redis.UniversalClient, mdb *mongo.Client) *GroupModel {
 	var groupModel GroupModel
-	redisClient := cache.InitRedis()
-	rdb := cache.NewRedisClient(redisClient)
-	groupModel.db = mysql.NewGroupDB()
-	//mgo := mongo.In()
+	groupModel.db = db
+	groupModel.cache = cache.NewGroupCache(rdb, db, rockscache.Options{
+		DisableCacheRead:  false,
+		StrongConsistency: true,
+	})
+	groupModel.mongo = mongoDB.NewMongoClient(mdb)
+	return &groupModel
 }
 
 func (g *GroupModel) Find(ctx context.Context, groupIDs []string) (groups []*mysql.Group, err error) {
-	g.cache.Client.
-	for _, groupID := range groupIDs {
-		group, err := g.getGroupInfoFromCache(ctx, groupID)
-		if err != nil {
-			return nil, err
-		}
-		groups = append(groups, group)
-	}
-	return groups, nil
+	return g.cache.GetGroupsInfoFromCache(ctx, groupIDs)
 }
 
 func (g *GroupModel) Create(ctx context.Context, groups []*mysql.Group) error {
@@ -49,7 +49,7 @@ func (g *GroupModel) Delete(ctx context.Context, groupIDs []string) error {
 		if err := g.db.Delete(ctx, groupIDs, tx); err != nil {
 			return err
 		}
-		if err := g.deleteGroupsInCache(ctx, groupIDs); err != nil {
+		if err := g.cache.DelGroupsInfoFromCache(ctx, groupIDs); err != nil {
 			return err
 		}
 		return nil
@@ -57,35 +57,6 @@ func (g *GroupModel) Delete(ctx context.Context, groupIDs []string) error {
 	return err
 }
 
-func (g *GroupModel) deleteGroupsInCache(ctx context.Context, groupIDs []string) error {
-	for _, groupID := range groupIDs {
-		if err := g.weakRc.Cache.TagAsDeleted(g.getGroupCacheKey(groupID)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (g *GroupModel) getGroupInfoFromCache(ctx context.Context, groupID string) (groupInfo *mysql.Group, err error) {
-	getGroupInfo := func() (string, error) {
-		groupInfo, err := mysql.GetGroupInfoByGroupID(groupID)
-		if err != nil {
-			return "", utils.Wrap(err, "")
-		}
-		bytes, err := json.Marshal(groupInfo)
-		if err != nil {
-			return "", utils.Wrap(err, "")
-		}
-		return string(bytes), nil
-	}
-	groupInfo = &mysql.Group{}
-	defer func() {
-		trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupInfo", groupInfo)
-	}()
-	groupInfoStr, err := g.weakRc.Cache.Fetch(groupInfoCache+groupID, GroupExpireTime, getGroupInfo)
-	if err != nil {
-		return nil, utils.Wrap(err, "")
-	}
-	err = json.Unmarshal([]byte(groupInfoStr), groupInfo)
-	return groupInfo, utils.Wrap(err, "")
+func (g *GroupModel) Take(ctx context.Context, groupID string) (group *mysql.Group, err error) {
+	return g.cache.GetGroupInfoFromCache(ctx, groupID)
 }

pkg/common/db/model/user.go

@@ -9,9 +9,10 @@ type UserModel struct {
 	db *mysql.User
 }
 
-func NewGroupUser(ctx context.Context) {
+func NewGroupUser(ctx context.Context) *UserModel {
 	var userModel UserModel
 	userModel.db = mysql.NewUserDB()
+	return &userModel
 }
 
 func (u *UserModel) Find(ctx context.Context, userIDs []string) (users []*mysql.User, err error) {