群组添加成员时,检查是否已经存在群组成员, fix issue #501

This commit is contained in:
heavyrian2012
2022-08-03 12:19:03 +08:00
parent 8c88d5a13f
commit c3b9b9fccf
2 changed files with 30 additions and 15 deletions
@@ -1300,11 +1300,31 @@ public class MemoryMessagesStore implements IMessagesStore {
} }
} }
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
if (members == null || members.size() == 0) {
members = loadGroupMemberFromDB(hzInstance, groupId);
}
ArrayList<String> existMemberIds = new ArrayList<>();
for (WFCMessage.GroupMember member : members) {
if (member.getType() != GroupMemberType_Removed) {
existMemberIds.add(member.getMemberId());
}
}
long updateDt = System.currentTimeMillis(); long updateDt = System.currentTimeMillis();
List<WFCMessage.GroupMember> tmp = new ArrayList<>(); List<WFCMessage.GroupMember> tmp = new ArrayList<>();
ArrayList<String> newInviteUsers = new ArrayList<>(); int newMemberCount = 0;
for (WFCMessage.GroupMember member : memberList) { for (WFCMessage.GroupMember member : memberList) {
if (existMemberIds.contains(member.getMemberId()) && member.getType() != GroupMemberType_Removed) {
if(!isAdmin)
continue;
} else {
newMemberCount++;
}
WFCMessage.GroupMember.Builder builder = member.toBuilder(); WFCMessage.GroupMember.Builder builder = member.toBuilder();
builder.setUpdateDt(updateDt).setCreateDt(updateDt); builder.setUpdateDt(updateDt).setCreateDt(updateDt);
if (member.getMemberId().equals(groupInfo.getOwner())) { if (member.getMemberId().equals(groupInfo.getOwner())) {
@@ -1324,29 +1344,23 @@ public class MemoryMessagesStore implements IMessagesStore {
} }
member = builder.build(); member = builder.build();
tmp.add(member); tmp.add(member);
newInviteUsers.add(member.getMemberId());
updateDt++; updateDt++;
} }
memberList = tmp; memberList = tmp;
MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS); if (memberList.size() == 0) {
Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId); if (!isAdmin) {
if (members == null || members.size() == 0) { return ErrorCode.ERROR_CODE_ALREADY_IN_GROUP;
members = loadGroupMemberFromDB(hzInstance, groupId); } else {
} return ErrorCode.ERROR_CODE_SUCCESS;
if (maxCount != Integer.MAX_VALUE) {
int existCount = 0;
for (WFCMessage.GroupMember member : members) {
if (member.getType() != GroupMemberType_Removed) {
existCount++;
}
} }
if (existCount + newInviteUsers.size() > maxCount) { } else {
if (existMemberIds.size() + newMemberCount > maxCount) {
return ErrorCode.ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT; return ErrorCode.ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT;
} }
} }
databaseStore.persistGroupMember(groupId, memberList, true); databaseStore.persistGroupMember(groupId, memberList, true);
databaseStore.updateGroupMemberCountDt(groupId); databaseStore.updateGroupMemberCountDt(groupId);
@@ -29,6 +29,7 @@ public enum ErrorCode {
//Group error //Group error
ERROR_CODE_GROUP_ALREADY_EXIST(11, "group already exist"), ERROR_CODE_GROUP_ALREADY_EXIST(11, "group already exist"),
ERROR_CODE_ALREADY_IN_GROUP(12, "member already in group"),
//user error //user error
ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"), ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"),