blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-08-09 20:49:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gordon 2022-03-28 16:57:24 +08:00
commit 679c913f3a
5 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/office/tag.go
View File

@ -227,7 +227,7 @@ func GetTagSendLogs(c *gin.Context) {
return return
} }
if err := utils.CopyStructFields(&resp.CommResp, respPb.CommonResp); err != nil { if err := utils.CopyStructFields(&resp.CommResp, respPb.CommonResp); err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
} }
resp.Data.Logs = respPb.TagSendLogs resp.Data.Logs = respPb.TagSendLogs
resp.Data.ShowNumber = respPb.Pagination.ShowNumber resp.Data.ShowNumber = respPb.Pagination.ShowNumber

10
internal/rpc/office/office.go
View File

@ -78,6 +78,7 @@ func (s *officeServer) GetUserTags(_ context.Context, req *pbOffice.GetUserTagsR
resp.CommonResp.ErrCode = constant.ErrDB.ErrCode resp.CommonResp.ErrCode = constant.ErrDB.ErrCode
return resp, nil return resp, nil
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "tags: ", tags)
for _, v := range tags { for _, v := range tags {
tag := &pbOffice.Tag{ tag := &pbOffice.Tag{
TagID: v.TagID, TagID: v.TagID,
@ -164,6 +165,11 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp = &pbOffice.GetTagSendLogsResp{ resp = &pbOffice.GetTagSendLogsResp{
CommonResp: &pbOffice.CommonResp{}, CommonResp: &pbOffice.CommonResp{},
Pagination: &pbCommon.ResponsePagination{
CurrentPage: req.Pagination.PageNumber,
ShowNumber: req.Pagination.ShowNumber,
},
TagSendLogs: []*pbOffice.TagSendLog{},
} }
tagSendLogs, err := db.DB.GetTagSendLogs(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber) tagSendLogs, err := db.DB.GetTagSendLogs(req.UserID, req.Pagination.ShowNumber, req.Pagination.PageNumber)
if err != nil { if err != nil {
@ -175,10 +181,6 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen
if err := utils.CopyStructFields(resp.TagSendLogs, tagSendLogs); err != nil { if err := utils.CopyStructFields(resp.TagSendLogs, tagSendLogs); err != nil {
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
} }
resp.Pagination = &pbCommon.ResponsePagination{
CurrentPage: req.Pagination.PageNumber,
ShowNumber: req.Pagination.ShowNumber,
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String())
return resp, nil return resp, nil
} }

6
pkg/base_info/office_struct.go
View File

@ -36,9 +36,9 @@ type DeleteTagResp struct {
type SetTagReq struct { type SetTagReq struct {
TagID string `json:"tagID" binding:"required"` TagID string `json:"tagID" binding:"required"`
NewName string `json:"newName" binding:"required"` NewName string `json:"newName"`
IncreaseUserIDList []string `json:"increaseUserIDList" binding:"required"` IncreaseUserIDList []string `json:"increaseUserIDList"`
ReduceUserIDList []string `json:"reduceUserIDList" binding:"required"` ReduceUserIDList []string `json:"reduceUserIDList"`
OperationID string `json:"operationID" binding:"required"` OperationID string `json:"operationID" binding:"required"`
} }

38
pkg/common/db/mongoModel.go
View File

@ -450,7 +450,7 @@ func (d *DataBases) GetUserTags(userID string) ([]Tag, error) {
if err != nil { if err != nil {
return tags, err return tags, err
} }
if err = cursor.Decode(tags); err != nil { if err = cursor.All(ctx, &tags); err != nil {
return tags, err return tags, err
} }
return tags, nil return tags, nil
@ -481,13 +481,11 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag)
var tag Tag var tag Tag
err := c.FindOne(ctx, bson.M{"tagID": tagID, "userID": userID}).Decode(&tag) if err := c.FindOne(ctx, bson.M{"tagID": tagID, "userID": userID}).Decode(&tag); err != nil {
return err
}
if newName != "" { if newName != "" {
_, err = c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.D{ _, err := c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.M{"$set": bson.M{"tagName": newName}})
{"$set", bson.D{
{"tagName", newName},
}},
})
if err != nil { if err != nil {
return err return err
} }
@ -497,15 +495,17 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s
for _, v := range reduceUserIDList { for _, v := range reduceUserIDList {
for i2, v2 := range tag.UserList { for i2, v2 := range tag.UserList {
if v == v2 { if v == v2 {
tag.UserList = append(tag.UserList[:i2], tag.UserList[i2+1:]...) tag.UserList[i2] = ""
} }
} }
} }
_, err = c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.D{ var newUserList []string
{"$set", bson.D{ for _, v := range tag.UserList {
{"userList", tag.UserList}, if v != "" {
}}, newUserList = append(newUserList, v)
}) }
}
_, err := c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.M{"$set": bson.M{"userList": newUserList}})
if err != nil { if err != nil {
return err return err
} }
@ -533,9 +533,10 @@ type TagSendLog struct {
func (d *DataBases) SaveTagSendLog(sendReq *officePb.SendMsg2TagReq) error { func (d *DataBases) SaveTagSendLog(sendReq *officePb.SendMsg2TagReq) error {
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag)
var tag Tag var tag Tag
_ = c.FindOne(ctx, bson.M{"userID": sendReq.SendID, "tagID": sendReq.TagID}).Decode(&tag) _ = c.FindOne(ctx, bson.M{"userID": sendReq.SendID, "tagID": sendReq.TagID}).Decode(&tag)
c = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog)
tagSendLog := TagSendLog{ tagSendLog := TagSendLog{
TagID: sendReq.TagID, TagID: sendReq.TagID,
TagName: tag.TagName, TagName: tag.TagName,
@ -544,21 +545,22 @@ func (d *DataBases) SaveTagSendLog(sendReq *officePb.SendMsg2TagReq) error {
Content: sendReq.Content, Content: sendReq.Content,
ContentType: sendReq.ContentType, ContentType: sendReq.ContentType,
SendTime: time.Now().Unix(), SendTime: time.Now().Unix(),
UserList: tag.UserList,
} }
_, err := c.InsertOne(ctx, tagSendLog) _, err := c.InsertOne(ctx, tagSendLog)
return err return err
} }
func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32) ([]*TagSendLog, error) { func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32) ([]TagSendLog, error) {
var tagSendLogs []*TagSendLog var tagSendLogs []TagSendLog
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog)
findOpts := options.Find().SetSort(-1).SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)) findOpts := options.Find().SetSort(-1).SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1))
cursor, err := c.Find(ctx, bson.M{"sendID": userID}, findOpts) cursor, err := c.Find(ctx, bson.D{{"sendID", userID}}, findOpts)
if err != nil { if err != nil {
return tagSendLogs, err return tagSendLogs, err
} }
err = cursor.Decode(&tagSendLogs) err = cursor.All(ctx, tagSendLogs)
if err != nil { if err != nil {
return tagSendLogs, err return tagSendLogs, err
} }

2
pkg/common/db/mysql_model/im_mysql_model/user_model.go
View File

@ -80,7 +80,7 @@ func GetUserNameByUserID(userID string) (string, error) {
return "", err return "", err
} }
var userName string var userName string
err = dbConn.Table("users").Select("name").Where("user_id=?", userID).Find(&userName).Error err = dbConn.Table("users").Select("name").Where("user_id=?", userID).First(&userName).Error
if err != nil { if err != nil {
return "", err return "", err
} }