Error code standardization

internal/rpc/user/user.go

@@ -138,9 +138,9 @@ func syncPeerUserConversation(conversation *pbConversation.Conversation, operati
 	return nil
 }
 
-func (s *userServer) GetUserInfo(ctx context.Context, req *pbUser.GetUserInfoReq) (*pbUser.GetUserInfoResp, error) {
-	resp := &pbUser.GetUserInfoResp{}
-	users, err := s.Find(ctx, req.UserIDList)
+func (s *userServer) GetUsersInfo(ctx context.Context, req *pbUser.GetUsersInfoReq) (*pbUser.GetUsersInfoResp, error) {
+	resp := &pbUser.GetUsersInfoResp{}
+	users, err := s.Find(ctx, req.UserIDs)
 	if err != nil {
 		return nil, err
 	}
@@ -149,7 +149,7 @@ func (s *userServer) GetUserInfo(ctx context.Context, req *pbUser.GetUserInfoReq
 		if err != nil {
 			return nil, err
 		}
-		resp.UserInfoList = append(resp.UserInfoList, n)
+		resp.UsersInfo = append(resp.UsersInfo, n)
 	}
 	return resp, nil
 }

internal/utils/convert.go

@@ -23,10 +23,18 @@ type DBFriend struct {
 	*relation.Friend
 }
 
+func NewDBFriend(friend *relation.Friend) *DBFriend {
+	return &DBFriend{Friend: friend}
+}
+
 type PBFriend struct {
 	*sdk.FriendInfo
 }
 
+func NewPBFriend(friendInfo *sdk.FriendInfo) *PBFriend {
+	return &PBFriend{FriendInfo: friendInfo}
+}
+
 func (db *DBFriend) convert() (*sdk.FriendInfo, error) {
 	pbFriend := &sdk.FriendInfo{FriendUser: &sdk.UserInfo{}}
 	utils.CopyStructFields(pbFriend, db)
@@ -53,10 +61,18 @@ type DBFriendRequest struct {
 	*relation.FriendRequest
 }
 
+func NewDBFriendRequest(friendRequest *relation.FriendRequest) *DBFriendRequest {
+	return &DBFriendRequest{FriendRequest: friendRequest}
+}
+
 type PBFriendRequest struct {
 	*sdk.FriendRequest
 }
 
+func NewPBFriendRequest(friendRequest *sdk.FriendRequest) *PBFriendRequest {
+	return &PBFriendRequest{FriendRequest: friendRequest}
+}
+
 func (pb *PBFriendRequest) Convert() (*relation.FriendRequest, error) {
 	dbFriendRequest := &relation.FriendRequest{}
 	utils.CopyStructFields(dbFriendRequest, pb)
@@ -90,10 +106,18 @@ type DBBlack struct {
 	*relation.Black
 }
 
+func NewDBBlack(black *relation.Black) *DBBlack {
+	return &DBBlack{Black: black}
+}
+
 type PBBlack struct {
 	*sdk.BlackInfo
 }
 
+func NewPBBlack(blackInfo *sdk.BlackInfo) *PBBlack {
+	return &PBBlack{BlackInfo: blackInfo}
+}
+
 func (pb *PBBlack) Convert() (*relation.Black, error) {
 	dbBlack := &relation.Black{}
 	dbBlack.BlockUserID = pb.BlackUserInfo.UserID
@@ -116,10 +140,18 @@ type DBGroup struct {
 	*relation.Group
 }
 
+func NewDBGroup(group *relation.Group) *DBGroup {
+	return &DBGroup{Group: group}
+}
+
 type PBGroup struct {
 	*sdk.GroupInfo
 }
 
+func NewPBGroup(groupInfo *sdk.GroupInfo) *PBGroup {
+	return &PBGroup{GroupInfo: groupInfo}
+}
+
 func (pb *PBGroup) Convert() *relation.Group {
 	dst := &relation.Group{}
 	_ = utils.CopyStructFields(dst, pb)
@@ -151,10 +183,18 @@ type DBGroupMember struct {
 	*relation.GroupMember
 }
 
+func NewDBGroupMember(groupMember *relation.GroupMember) *DBGroupMember {
+	return &DBGroupMember{GroupMember: groupMember}
+}
+
 type PBGroupMember struct {
 	*sdk.GroupMemberFullInfo
 }
 
+func NewPBGroupMember(groupMemberFullInfo *sdk.GroupMemberFullInfo) *PBGroupMember {
+	return &PBGroupMember{GroupMemberFullInfo: groupMemberFullInfo}
+}
+
 func (pb *PBGroupMember) Convert() (*relation.GroupMember, error) {
 	dst := &relation.GroupMember{}
 	utils.CopyStructFields(dst, pb)
@@ -187,10 +227,18 @@ type DBGroupRequest struct {
 	*relation.GroupRequest
 }
 
+func NewDBGroupRequest(groupRequest *relation.GroupRequest) *DBGroupRequest {
+	return &DBGroupRequest{GroupRequest: groupRequest}
+}
+
 type PBGroupRequest struct {
 	*sdk.GroupRequest
 }
 
+func NewPBGroupRequest(groupRequest *sdk.GroupRequest) *PBGroupRequest {
+	return &PBGroupRequest{GroupRequest: groupRequest}
+}
+
 func (pb *PBGroupRequest) Convert() (*relation.GroupRequest, error) {
 	dst := &relation.GroupRequest{}
 	utils.CopyStructFields(dst, pb)
@@ -210,10 +258,18 @@ type DBUser struct {
 	*relation.User
 }
 
+func NewDBUser(user *relation.User) *DBUser {
+	return &DBUser{User: user}
+}
+
 type PBUser struct {
 	*sdk.UserInfo
 }
 
+func NewPBUser(userInfo *sdk.UserInfo) *PBUser {
+	return &PBUser{UserInfo: userInfo}
+}
+
 func (pb *PBUser) Convert() (*relation.User, error) {
 	dst := &relation.User{}
 	utils.CopyStructFields(dst, pb)

pkg/proto/user/user.proto

@@ -124,33 +124,6 @@ message GetUsersResp{
   repeated server_api_params.UserInfo users = 2;
 }
 
-message AddUserReq{
-  server_api_params.UserInfo userInfo = 1;
-  string operationID = 2;
-}
-
-message AddUserResp{
-}
-
-message GetBlockUsersReq{
-  server_api_params.RequestPagination pagination = 1;
-  string operationID = 2;
-  string userID = 3;
-  int32 totalBlockUserNum = 4;
-}
-
-message BlockUser {
-  server_api_params.UserInfo UserInfo = 1;
-  string BeginDisableTime = 2;
-  string EndDisableTime = 3;
-}
-
-message GetBlockUsersResp{
-  repeated BlockUser BlockUsers = 2;
-  server_api_params.ResponsePagination Pagination = 3;
-  int32 UserNums = 4;
-}
-
 
 service user {
   //获取指定的用户信息 全字段