|
|
@ -1,7 +1,6 @@
|
|
|
|
package convert
|
|
|
|
package convert
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
import (
|
|
|
|
"Open_IM/pkg/common/db/relation"
|
|
|
|
|
|
|
|
"Open_IM/pkg/common/db/table"
|
|
|
|
"Open_IM/pkg/common/db/table"
|
|
|
|
sdk "Open_IM/pkg/proto/sdk_ws"
|
|
|
|
sdk "Open_IM/pkg/proto/sdk_ws"
|
|
|
|
utils "github.com/OpenIMSDK/open_utils"
|
|
|
|
utils "github.com/OpenIMSDK/open_utils"
|
|
|
@ -119,20 +118,19 @@ func (db *DBFriendRequest) Convert() (*sdk.FriendRequest, error) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type DBBlack struct {
|
|
|
|
type DBBlack struct {
|
|
|
|
*relation.Black
|
|
|
|
*table.BlackModel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (*PBBlack) PB2DB(friendRequests []*sdk.BlackInfo) (DBFriendRequests []*table., err error) {
|
|
|
|
func (*PBBlack) PB2DB(blacks []*sdk.BlackInfo) (DBBlacks []*table.BlackModel, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (*DBBlack) DB2PB(friendRequests []*table.FriendRequestModel) (PBFriendRequests []*sdk.FriendRequest, err error) {
|
|
|
|
func (*DBBlack) DB2PB(blacks []*table.BlackModel) (PBBlacks []*sdk.BlackInfo, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func NewDBBlack(black *table.BlackModel) *DBBlack {
|
|
|
|
func NewDBBlack(black *relation.Black) *DBBlack {
|
|
|
|
return &DBBlack{BlackModel: black}
|
|
|
|
return &DBBlack{Black: black}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
type PBBlack struct {
|
|
|
|
type PBBlack struct {
|
|
|
@ -143,8 +141,8 @@ func NewPBBlack(blackInfo *sdk.BlackInfo) *PBBlack {
|
|
|
|
return &PBBlack{BlackInfo: blackInfo}
|
|
|
|
return &PBBlack{BlackInfo: blackInfo}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func (pb *PBBlack) Convert() (*relation.Black, error) {
|
|
|
|
func (pb *PBBlack) Convert() (*table.BlackModel, error) {
|
|
|
|
dbBlack := &relation.Black{}
|
|
|
|
dbBlack := &table.BlackModel{}
|
|
|
|
dbBlack.BlockUserID = pb.BlackUserInfo.UserID
|
|
|
|
dbBlack.BlockUserID = pb.BlackUserInfo.UserID
|
|
|
|
dbBlack.CreateTime = utils.UnixSecondToTime(int64(pb.CreateTime))
|
|
|
|
dbBlack.CreateTime = utils.UnixSecondToTime(int64(pb.CreateTime))
|
|
|
|
return dbBlack, nil
|
|
|
|
return dbBlack, nil
|
|
|
@ -165,6 +163,14 @@ type DBGroup struct {
|
|
|
|
*table.GroupModel
|
|
|
|
*table.GroupModel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*PBGroup) PB2DB(groups []*sdk.GroupInfo) (DBGroups []*table.GroupModel, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*DBGroup) DB2PB(groups []*table.GroupModel) (PBGroups []*sdk.GroupInfo, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func NewDBGroup(group *table.GroupModel) *DBGroup {
|
|
|
|
func NewDBGroup(group *table.GroupModel) *DBGroup {
|
|
|
|
return &DBGroup{GroupModel: group}
|
|
|
|
return &DBGroup{GroupModel: group}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -208,6 +214,14 @@ type DBGroupMember struct {
|
|
|
|
*table.GroupMemberModel
|
|
|
|
*table.GroupMemberModel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*PBGroupMember) PB2DB(groupMembers []*sdk.GroupMemberFullInfo) (DBGroupMembers []*table.GroupMemberModel, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*DBGroupMember) DB2PB(groupMembers []*table.GroupMemberModel) (PBGroupMembers []*sdk.GroupMemberFullInfo, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func NewDBGroupMember(groupMember *table.GroupMemberModel) *DBGroupMember {
|
|
|
|
func NewDBGroupMember(groupMember *table.GroupMemberModel) *DBGroupMember {
|
|
|
|
return &DBGroupMember{GroupMemberModel: groupMember}
|
|
|
|
return &DBGroupMember{GroupMemberModel: groupMember}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -252,6 +266,14 @@ type DBGroupRequest struct {
|
|
|
|
*table.GroupRequestModel
|
|
|
|
*table.GroupRequestModel
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*PBGroupRequest) PB2DB(groupRequests []*sdk.GroupRequest) (DBGroupRequests []*table.GroupRequestModel, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
func (*DBGroupRequest) DB2PB(groupRequests []*table.GroupRequestModel) (PBGroupRequests []*sdk.GroupRequest, err error) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func NewDBGroupRequest(groupRequest *table.GroupRequestModel) *DBGroupRequest {
|
|
|
|
func NewDBGroupRequest(groupRequest *table.GroupRequestModel) *DBGroupRequest {
|
|
|
|
return &DBGroupRequest{GroupRequestModel: groupRequest}
|
|
|
|
return &DBGroupRequest{GroupRequestModel: groupRequest}
|
|
|
|
}
|
|
|
|
}
|
|
|
|