diff --git a/internal/api/office/tag.go b/internal/api/office/tag.go index 2491e9f7a..1f14a0116 100644 --- a/internal/api/office/tag.go +++ b/internal/api/office/tag.go @@ -227,7 +227,7 @@ func GetTagSendLogs(c *gin.Context) { return } 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.ShowNumber = respPb.Pagination.ShowNumber diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index ab38b2b93..5f6cf7d1c 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -164,6 +164,11 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) resp = &pbOffice.GetTagSendLogsResp{ 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) if err != nil { @@ -175,10 +180,6 @@ func (s *officeServer) GetTagSendLogs(_ context.Context, req *pbOffice.GetTagSen if err := utils.CopyStructFields(resp.TagSendLogs, tagSendLogs); err != nil { 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()) return resp, nil } diff --git a/pkg/base_info/office_struct.go b/pkg/base_info/office_struct.go index 154ab89f1..65066d0b7 100644 --- a/pkg/base_info/office_struct.go +++ b/pkg/base_info/office_struct.go @@ -36,9 +36,9 @@ type DeleteTagResp struct { type SetTagReq struct { TagID string `json:"tagID" binding:"required"` - NewName string `json:"newName" binding:"required"` - IncreaseUserIDList []string `json:"increaseUserIDList" binding:"required"` - ReduceUserIDList []string `json:"reduceUserIDList" binding:"required"` + NewName string `json:"newName"` + IncreaseUserIDList []string `json:"increaseUserIDList"` + ReduceUserIDList []string `json:"reduceUserIDList"` OperationID string `json:"operationID" binding:"required"` } diff --git a/pkg/common/db/mongoModel.go b/pkg/common/db/mongoModel.go index 6320a6d8e..d385043b8 100644 --- a/pkg/common/db/mongoModel.go +++ b/pkg/common/db/mongoModel.go @@ -450,7 +450,7 @@ func (d *DataBases) GetUserTags(userID string) ([]Tag, error) { if err != nil { return tags, err } - if err = cursor.Decode(tags); err != nil { + if err = cursor.Decode(&tags); err != nil { return tags, err } return tags, nil @@ -483,7 +483,7 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s var tag Tag err := c.FindOne(ctx, bson.M{"tagID": tagID, "userID": userID}).Decode(&tag) if newName != "" { - _, err = c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.D{ + _, err = c.UpdateOne(ctx, bson.D{{"userID", userID}, {"tagID", tagID}}, bson.D{ {"$set", bson.D{ {"tagName", newName}, }}, @@ -501,7 +501,7 @@ func (d *DataBases) SetTag(userID, tagID, newName string, increaseUserIDList []s } } } - _, err = c.UpdateOne(ctx, bson.M{"userID": userID, "tagID": tagID}, bson.D{ + _, err = c.UpdateOne(ctx, bson.D{{"userID", userID}, {"tagID", tagID}}, bson.D{ {"$set", bson.D{ {"userList", tag.UserList}, }}, @@ -533,9 +533,10 @@ type TagSendLog struct { 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(cSendLog) + 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 = d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cSendLog) tagSendLog := TagSendLog{ TagID: sendReq.TagID, TagName: tag.TagName, @@ -544,6 +545,7 @@ func (d *DataBases) SaveTagSendLog(sendReq *officePb.SendMsg2TagReq) error { Content: sendReq.Content, ContentType: sendReq.ContentType, SendTime: time.Now().Unix(), + UserList: tag.UserList, } _, err := c.InsertOne(ctx, tagSendLog) return err @@ -554,7 +556,7 @@ func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32) 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().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 { return tagSendLogs, err }