blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

workMoments

Browse Source
This commit is contained in:
wangchuxiao 2022-04-21 11:18:11 +08:00
parent a243da8b1e
commit 33211bfb27
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/api/office/work_moments.go
View File

@ -206,6 +206,15 @@ func GetWorkMomentByID(c *gin.Context) {
if err := utils.CopyStructFields(&resp.Data.WorkMoment, respPb.WorkMoment); err != nil { if err := utils.CopyStructFields(&resp.Data.WorkMoment, respPb.WorkMoment); err != nil {
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
} }
if err := utils.CopyStructFields(&resp.Data.WorkMoment.AtUserIDList, respPb.WorkMoment.AtUserList); err != nil {
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed")
}
if err := utils.CopyStructFields(&resp.Data.WorkMoment.LikeUserList, respPb.WorkMoment.LikeUserList); err != nil {
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed")
}
if err := utils.CopyStructFields(&resp.Data.WorkMoment.Comments, respPb.WorkMoment.Comments); err != nil {
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed")
}
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "resp: ", resp)
c.JSON(http.StatusOK, resp) c.JSON(http.StatusOK, resp)
} }

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

@ -286,20 +286,6 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error()) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
} }
workMoment.PermissionUserIDList = s.getPermissionUserIDList(req.OperationID, req.WorkMoment.PermissionGroupList, req.WorkMoment.PermissionUserList) workMoment.PermissionUserIDList = s.getPermissionUserIDList(req.OperationID, req.WorkMoment.PermissionGroupList, req.WorkMoment.PermissionUserList)
for _, user := range req.WorkMoment.AtUserList {
if user.UserName == "" {
userName, err := imdb.GetUserNameByUserID(user.UserID)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserNameByUserID failed", user.UserID, err.Error())
continue
}
user.UserName = userName
}
workMoment.AtUserList = append(workMoment.AtUserList, &db.AtUser{
UserID: user.UserID,
UserName: user.UserName,
})
}
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "workMoment to create", workMoment) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "workMoment to create", workMoment)
err = db.DB.CreateOneWorkMoment(&workMoment) err = db.DB.CreateOneWorkMoment(&workMoment)
if err != nil { if err != nil {

6
pkg/base_info/work_moments_struct.go
View File

@ -48,16 +48,16 @@ type WorkMoment struct {
WorkMomentID string `json:"workMomentID"` WorkMomentID string `json:"workMomentID"`
UserID string `json:"userID"` UserID string `json:"userID"`
Content string `json:"content"` Content string `json:"content"`
LikeUsers []*LikeUser `json:"likeUsers"` LikeUserList []*WorkMomentUser `json:"likeUsers"`
Comments []*Comment `json:"comments"` Comments []*Comment `json:"comments"`
//Permission int32 `json:"permission"` //Permission int32 `json:"permission"`
//PermissionUserIDList []string `json:"permissionUserIDList"` //PermissionUserIDList []string `json:"permissionUserIDList"`
//PermissionGroupIDList []string `json:"permissionGroupIDList"` //PermissionGroupIDList []string `json:"permissionGroupIDList"`
AtUserIDList []string `json:"atUserIDList"` AtUserIDList []*WorkMomentUser `json:"atUsers"`
CreateTime int32 `json:"createTime,omitempty"` CreateTime int32 `json:"createTime,omitempty"`
} }
type LikeUser struct { type WorkMomentUser struct {
UserID string `json:"userID"` UserID string `json:"userID"`
UserName string `json:"userName"` UserName string `json:"userName"`
} }