Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: get group member list order by join time asc. #333

Merged
merged 3 commits into from
Sep 18, 2023
Merged

fix: get group member list order by join time asc. #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f5711b
fix: repeated trigger conversation changed.
FGadvancer Sep 14, 2023
b8d570f
fix: group dismissed trigger to UI.
FGadvancer Sep 15, 2023
9ccde0f
fix: get group member list order by join time asc.
FGadvancer Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion internal/conversation_msg/conversation_msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ func (c *Conversation) initSyncer() {
server.Ex != local.Ex ||
server.MaxSeq != local.MaxSeq ||
server.MinSeq != local.MinSeq ||
server.HasReadSeq != local.HasReadSeq ||
server.MsgDestructTime != local.MsgDestructTime ||
server.IsMsgDestruct != local.IsMsgDestruct {
log.ZDebug(context.Background(), "not same", "conversationID", server.ConversationID, "server", server.RecvMsgOpt, "local", local.RecvMsgOpt)
Expand Down
1 change: 1 addition & 0 deletions internal/group/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ func (g *Group) doNotification(ctx context.Context, msg *sdkws.MsgData) error {
if err := utils.UnmarshalNotificationElem(msg.Content, &detail); err != nil {
return err
}
g.listener.OnGroupDismissed(utils.StructToJsonString(detail.Group))
if err := g.db.DeleteGroupAllMembers(ctx, detail.Group.GroupID); err != nil {
return err
}
Expand Down
16 changes: 8 additions & 8 deletions pkg/db/group_member_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,17 @@ func (d *DataBase) GetGroupMemberListSplit(ctx context.Context, groupID string,
var err error
switch filter {
case constant.GroupFilterAll:
err = d.conn.WithContext(ctx).Where("group_id = ?", groupID).Order("role_level DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ?", groupID).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
case constant.GroupFilterOwner:
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupOwner).Order("join_time DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupOwner).Offset(offset).Limit(count).Find(&groupMemberList).Error
case constant.GroupFilterAdmin:
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupAdmin).Order("join_time DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupAdmin).Order("join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
case constant.GroupFilterOrdinaryUsers:
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupOrdinaryUsers).Order("join_time DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ? And role_level = ?", groupID, constant.GroupOrdinaryUsers).Order("join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
case constant.GroupFilterAdminAndOrdinaryUsers:
err = d.conn.WithContext(ctx).Where("group_id = ? And (role_level = ? or role_level = ?)", groupID, constant.GroupAdmin, constant.GroupOrdinaryUsers).Order("role_level DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ? And (role_level = ? or role_level = ?)", groupID, constant.GroupAdmin, constant.GroupOrdinaryUsers).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
case constant.GroupFilterOwnerAndAdmin:
err = d.conn.WithContext(ctx).Where("group_id = ? And (role_level = ? or role_level = ?)", groupID, constant.GroupOwner, constant.GroupAdmin).Order("role_level DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where("group_id = ? And (role_level = ? or role_level = ?)", groupID, constant.GroupOwner, constant.GroupAdmin).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
default:
return nil, fmt.Errorf("filter args failed %d", filter)
}
Expand Down Expand Up @@ -277,10 +277,10 @@ func (d *DataBase) SearchGroupMembersDB(ctx context.Context, keyword string, gro
condition = "( " + condition + " ) "
condition += " and group_id IN ? "
log.Debug("", "subCondition SearchGroupMembers ", condition)
err = d.conn.WithContext(ctx).Where(condition, []string{groupID}).Order("join_time DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where(condition, []string{groupID}).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
} else {
log.Debug("", "subCondition SearchGroupMembers ", condition)
err = d.conn.WithContext(ctx).Where(condition).Order("join_time DESC").Offset(offset).Limit(count).Find(&groupMemberList).Error
err = d.conn.WithContext(ctx).Where(condition).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error
log.Debug("", "subCondition SearchGroupMembers ", condition, len(groupMemberList))
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/db/model_struct/data_model_struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ type LocalGroupMember struct {
UserID string `gorm:"column:user_id;primary_key;type:varchar(64)" json:"userID"`
Nickname string `gorm:"column:nickname;type:varchar(255)" json:"nickname"`
FaceURL string `gorm:"column:user_group_face_url;type:varchar(255)" json:"faceURL"`
RoleLevel int32 `gorm:"column:role_level" json:"roleLevel"`
RoleLevel int32 `gorm:"column:role_level;index:index_role_level;" json:"roleLevel"`
JoinTime int64 `gorm:"column:join_time;index:index_join_time;" json:"joinTime"`
JoinSource int32 `gorm:"column:join_source" json:"joinSource"`
InviterUserID string `gorm:"column:inviter_user_id;size:64" json:"inviterUserID"`
Expand Down
Loading