From 12d25e91bfb577d3f0da0c32d9eb9fbee8533624 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 16 Mar 2023 16:10:08 +0800
Subject: [PATCH] db

---
 internal/apiresp/resp.go     |  3 ---
 internal/rpc/friend/black.go | 20 ++++++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/internal/apiresp/resp.go b/internal/apiresp/resp.go
index f151ca88b..4f6a636db 100644
--- a/internal/apiresp/resp.go
+++ b/internal/apiresp/resp.go
@@ -14,9 +14,6 @@ type apiResponse struct {
 }
 
 func apiSuccess(data any) *apiResponse {
-	log.ZDebug(context.Background(), "apiSuccess", "resp", &apiResponse{
-		Data: data,
-	})
 	return &apiResponse{
 		Data: data,
 	}
diff --git a/internal/rpc/friend/black.go b/internal/rpc/friend/black.go
index de687c1ba..d66ac7c74 100644
--- a/internal/rpc/friend/black.go
+++ b/internal/rpc/friend/black.go
@@ -7,17 +7,23 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tracelog"
 	pbFriend "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/friend"
+	"time"
 )
 
 func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.GetPaginationBlacksReq) (resp *pbFriend.GetPaginationBlacksResp, err error) {
-	resp = &pbFriend.GetPaginationBlacksResp{}
 	if err := s.userCheck.Access(ctx, req.UserID); err != nil {
 		return nil, err
 	}
-	blacks, total, err := s.BlackDatabase.FindOwnerBlacks(ctx, req.UserID, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	var pageNumber, showNumber int32
+	if req.Pagination != nil {
+		pageNumber = req.Pagination.PageNumber
+		showNumber = req.Pagination.ShowNumber
+	}
+	blacks, total, err := s.BlackDatabase.FindOwnerBlacks(ctx, req.UserID, pageNumber, showNumber)
 	if err != nil {
 		return nil, err
 	}
+	resp = &pbFriend.GetPaginationBlacksResp{}
 	resp.Blacks, err = (*convert.NewDBBlack(nil, s.RegisterCenter)).DB2PB(ctx, blacks)
 	if err != nil {
 		return nil, err
@@ -27,18 +33,17 @@ func (s *friendServer) GetPaginationBlacks(ctx context.Context, req *pbFriend.Ge
 }
 
 func (s *friendServer) IsBlack(ctx context.Context, req *pbFriend.IsBlackReq) (*pbFriend.IsBlackResp, error) {
-	resp := &pbFriend.IsBlackResp{}
 	in1, in2, err := s.BlackDatabase.CheckIn(ctx, req.UserID1, req.UserID2)
 	if err != nil {
 		return nil, err
 	}
+	resp := &pbFriend.IsBlackResp{}
 	resp.InUser1Blacks = in1
 	resp.InUser2Blacks = in2
 	return resp, nil
 }
 
 func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlackReq) (*pbFriend.RemoveBlackResp, error) {
-	resp := &pbFriend.RemoveBlackResp{}
 	if err := s.userCheck.Access(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
@@ -46,18 +51,17 @@ func (s *friendServer) RemoveBlack(ctx context.Context, req *pbFriend.RemoveBlac
 		return nil, err
 	}
 	s.notification.BlackDeletedNotification(ctx, req)
-	return resp, nil
+	return &pbFriend.RemoveBlackResp{}, nil
 }
 
 func (s *friendServer) AddBlack(ctx context.Context, req *pbFriend.AddBlackReq) (*pbFriend.AddBlackResp, error) {
-	resp := &pbFriend.AddBlackResp{}
 	if err := tokenverify.CheckAccessV3(ctx, req.OwnerUserID); err != nil {
 		return nil, err
 	}
-	black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.GetOpUserID(ctx)}
+	black := relation.BlackModel{OwnerUserID: req.OwnerUserID, BlockUserID: req.BlackUserID, OperatorUserID: tracelog.GetOpUserID(ctx), CreateTime: time.Now()}
 	if err := s.BlackDatabase.Create(ctx, []*relation.BlackModel{&black}); err != nil {
 		return nil, err
 	}
 	s.notification.BlackAddedNotification(ctx, req)
-	return resp, nil
+	return &pbFriend.AddBlackResp{}, nil
 }