From a11c4fcb58181a74097086929e7fd8608f02a9f6 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 28 Mar 2022 19:05:58 +0800 Subject: [PATCH] tag --- internal/rpc/office/office.go | 4 +++- pkg/common/db/mongoModel.go | 42 +++++++++++++++++------------------ 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 8401a1c9f..2d0cce613 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -178,7 +178,9 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen resp.CommonResp.ErrCode = constant.ErrDB.ErrCode return resp, nil } - utils.CopyStructFields(&resp.TagSendLogs, tagSendLogs) + if err := utils.CopyStructFields(&resp.TagSendLogs, tagSendLogs); err != nil { + log.NewDebug(req.OperationID, utils.GetSelfFuncName(), err.Error()) + } log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp.String()) return resp, nil } diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 383b6fc33..2f97a8a6a 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -436,17 +436,17 @@ func (d *DataBases) DelGroupMember(groupID, uid string) error { } type Tag struct { - UserID string `bson:"userID"` - TagID string `bson:"tagID"` - TagName string `bson:"tagName"` - UserList []string `bson:"userList"` + UserID string `bson:"user_id"` + TagID string `bson:"tag_id"` + TagName string `bson:"tag_name"` + UserList []string `bson:"user_list"` } func (d *DataBases) GetUserTags(userID string) ([]Tag, error) { ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) var tags []Tag - cursor, err := c.Find(ctx, bson.M{"userID": userID}) + cursor, err := c.Find(ctx, bson.M{"user_id": userID}) if err != nil { return tags, err } @@ -473,7 +473,7 @@ func (d *DataBases) CreateTag(userID, tagName string, userList []string) error { func (d *DataBases) DeleteTag(userID, tagID string) error { ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) - _, err := c.DeleteOne(ctx, bson.M{"userID": userID, "tagID": tagID}) + _, err := c.DeleteOne(ctx, bson.M{"user_id": userID, "tag_id": tagID}) return err } @@ -481,11 +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) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) var tag Tag - if err := c.FindOne(ctx, bson.M{"tagID": tagID, "userID": userID}).Decode(&tag); err != nil { + if err := c.FindOne(ctx, bson.M{"tag_id": tagID, "user_id": userID}).Decode(&tag); err != nil { return err } if newName != "" { - _, err := c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.M{"$set": bson.M{"tagName": newName}}) + _, err := c.UpdateOne(ctx, bson.M{"user_id": userID, "tag_id": tagID}, bson.M{"$set": bson.M{"tag_name": newName}}) if err != nil { return err } @@ -505,7 +505,7 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s newUserList = append(newUserList, v) } } - _, err := c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.M{"$set": bson.M{"userList": newUserList}}) + _, err := c.UpdateOne(ctx, bson.M{"user_id": userID, "tag_id": tagID}, bson.M{"$set": bson.M{"user_list": newUserList}}) if err != nil { return err } @@ -516,30 +516,30 @@ func (d *DataBases) GetUserIDListByTagID(userID, tagID string) ([]string, error) var tag Tag ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) - _ = c.FindOne(ctx, bson.M{"userID": userID, "tagID": tagID}).Decode(&tag) + _ = c.FindOne(ctx, bson.M{"user_id": userID, "tag_id": tagID}).Decode(&tag) return tag.UserList, nil } type TagUser struct { - UserID string `bson:"userID"` - UserName string `bson:"userName"` + UserID string `bson:"user_id"` + UserName string `bson:"user_name"` } type TagSendLog struct { - TagID string `bson:"tagID"` - TagName string `bson:"tagName"` - SendID string `bson:"sendID"` - SenderPlatformID int32 `bson:"senderPlatformID"` + TagID string `bson:"tag_id"` + TagName string `bson:"tag_name"` + SendID string `bson:"send_id"` + SenderPlatformID int32 `bson:"sender_platform_id"` Content string `bson:"content"` - ContentType int32 `bson:"contentType"` - SendTime int64 `bson:"sendTime"` + ContentType int32 `bson:"content_type"` + SendTime int64 `bson:"send_time"` } func (d *DataBases) SaveTagSendLog(sendReq *officePb.SendMsg2TagReq) error { ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cTag) var tag Tag - _ = c.FindOne(ctx, bson.M{"userID": sendReq.SendID, "tagID": sendReq.TagID}).Decode(&tag) + _ = c.FindOne(ctx, bson.M{"user_id": sendReq.SendID, "tag_id": sendReq.TagID}).Decode(&tag) c = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog) tagSendLog := TagSendLog{ TagID: sendReq.TagID, @@ -558,8 +558,8 @@ func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32) var tagSendLogs []TagSendLog ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog) - findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)) - cursor, err := c.Find(ctx, bson.M{"sendID": userID}, findOpts) + findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)).SetSort("-send_time") + cursor, err := c.Find(ctx, bson.M{"send_id": userID}, findOpts) if err != nil { return tagSendLogs, err }