Error code standardization

internal/rpc/friend/friend.go

@@ -37,7 +37,7 @@ func Start(client *openKeeper.ZkClient, server *grpc.Server) error {
 	}
 	pbfriend.RegisterFriendServer(server, &friendServer{
 		FriendInterface: controller.NewFriendController(controller.NewFriendDatabase(relation.NewFriendGorm(db), relation.NewFriendRequestGorm(db), tx.NewGorm(db))),
-		BlackInterface:  controller.NewBlackController(db),
+		BlackInterface:  controller.NewBlackController(controller.NewBlackDatabase(relation.NewBlackGorm(db))),
 		notification:    notification.NewCheck(client),
 		userCheck:       check.NewUserCheck(client),
 		RegisterCenter:  client,

pkg/common/db/controller/black.go

@@ -1,7 +1,6 @@
 package controller
 
 import (
-	relation2 "Open_IM/pkg/common/db/relation"
 	"Open_IM/pkg/common/db/table/relation"
 	"Open_IM/pkg/utils"
 	"context"
@@ -24,8 +23,8 @@ type BlackController struct {
 	database BlackDatabaseInterface
 }
 
-func NewBlackController(db *gorm.DB) *BlackController {
-	return &BlackController{database: NewBlackDatabase(db)}
+func NewBlackController(database BlackDatabaseInterface) BlackInterface {
+	return &BlackController{database: database}
 }
 
 // Create 增加黑名单
@@ -60,35 +59,31 @@ type BlackDatabaseInterface interface {
 }
 
 type BlackDatabase struct {
-	sqlDB *relation2.BlackGorm
+	black relation.BlackModelInterface
 }
 
-func NewBlackDatabase(db *gorm.DB) *BlackDatabase {
-	sqlDB := relation2.NewBlackGorm(db)
-	database := &BlackDatabase{
-		sqlDB: sqlDB,
-	}
-	return database
+func NewBlackDatabase(black relation.BlackModelInterface) *BlackDatabase {
+	return &BlackDatabase{black}
 }
 
 // Create 增加黑名单
 func (b *BlackDatabase) Create(ctx context.Context, blacks []*relation.BlackModel) (err error) {
-	return b.sqlDB.Create(ctx, blacks)
+	return b.black.Create(ctx, blacks)
 }
 
 // Delete 删除黑名单
 func (b *BlackDatabase) Delete(ctx context.Context, blacks []*relation.BlackModel) (err error) {
-	return b.sqlDB.Delete(ctx, blacks)
+	return b.black.Delete(ctx, blacks)
 }
 
 // FindOwnerBlacks 获取黑名单列表
 func (b *BlackDatabase) FindOwnerBlacks(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (blacks []*relation.BlackModel, total int64, err error) {
-	return b.sqlDB.FindOwnerBlacks(ctx, ownerUserID, pageNumber, showNumber)
+	return b.black.FindOwnerBlacks(ctx, ownerUserID, pageNumber, showNumber)
 }
 
 // CheckIn 检查user2是否在user1的黑名单列表中(inUser1Blacks==true) 检查user1是否在user2的黑名单列表中(inUser2Blacks==true)
 func (b *BlackDatabase) CheckIn(ctx context.Context, userID1, userID2 string) (inUser1Blacks bool, inUser2Blacks bool, err error) {
-	_, err = b.sqlDB.Take(ctx, userID1, userID2)
+	_, err = b.black.Take(ctx, userID1, userID2)
 	if err != nil {
 		if errors.Unwrap(err) != gorm.ErrRecordNotFound {
 			return
@@ -99,7 +94,7 @@ func (b *BlackDatabase) CheckIn(ctx context.Context, userID1, userID2 string) (i
 	}
 
 	inUser2Blacks = true
-	_, err = b.sqlDB.Take(ctx, userID2, userID1)
+	_, err = b.black.Take(ctx, userID2, userID1)
 	if err != nil {
 		if utils.Unwrap(err) != gorm.ErrRecordNotFound {
 			return

pkg/common/db/relation/black_model.go

@@ -12,10 +12,8 @@ type BlackGorm struct {
 	DB *gorm.DB
 }
 
-func NewBlackGorm(db *gorm.DB) *BlackGorm {
-	var black BlackGorm
-	black.DB = db
-	return &black
+func NewBlackGorm(db *gorm.DB) relation.BlackModelInterface {
+	return &BlackGorm{db}
 }
 
 func (b *BlackGorm) Create(ctx context.Context, blacks []*relation.BlackModel) (err error) {

pkg/common/db/relation/friend_model.go

@@ -8,11 +8,6 @@ import (
 	"gorm.io/gorm"
 )
 
-type FriendUser struct {
-	FriendGorm
-	Nickname string `gorm:"column:name;size:255"`
-}
-
 type FriendGorm struct {
 	DB *gorm.DB
 }

pkg/common/db/table/relation/black.go

@@ -1,6 +1,7 @@
 package relation
 
 import (
+	"context"
 	"time"
 )
 
@@ -22,4 +23,12 @@ func (BlackModel) TableName() string {
 }
 
 type BlackModelInterface interface {
+	Create(ctx context.Context, blacks []*BlackModel) (err error)
+	Delete(ctx context.Context, blacks []*BlackModel) (err error)
+	UpdateByMap(ctx context.Context, ownerUserID, blockUserID string, args map[string]interface{}) (err error)
+	Update(ctx context.Context, blacks []*BlackModel) (err error)
+	Find(ctx context.Context, blacks []*BlackModel) (blackList []*BlackModel, err error)
+	Take(ctx context.Context, ownerUserID, blockUserID string) (black *BlackModel, err error)
+	FindOwnerBlacks(ctx context.Context, ownerUserID string, pageNumber, showNumber int32) (blacks []*BlackModel, total int64, err error)
+	FindBlackUserIDs(ctx context.Context, ownerUserID string) (blackUserIDs []string, err error)
 }