zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Fixed several errors in GroupResizeProcessor

Browse Source 
* a common user was passed to the persistence manager instead of its ID
* a server group was sent to its members instead of the common group
This commit is contained in:
Kai S. K. Engelbart
2020-04-09 13:53:06 +02:00
parent c6f0bff957
commit 98632f97bb
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/envoy/server/processors/GroupResizeProcessor.java
View File

@@ -18,23 +18,30 @@ import envoy.server.net.ObjectWriteProxy;
*/ */
public class GroupResizeProcessor implements ObjectProcessor<GroupResizeEvent> { public class GroupResizeProcessor implements ObjectProcessor<GroupResizeEvent> {
PersistenceManager persistenceManager = PersistenceManager.getInstance(); private static final PersistenceManager persistenceManager = PersistenceManager.getInstance();
ConnectionManager connectionManager = ConnectionManager.getInstance(); private static final ConnectionManager connectionManager = ConnectionManager.getInstance();
@Override @Override
public void process(GroupResizeEvent input, long socketID, ObjectWriteProxy writeProxy) throws IOException { public void process(GroupResizeEvent input, long socketID, ObjectWriteProxy writeProxy) throws IOException {
envoy.server.data.Group group = persistenceManager.getGroupByID(input.getGroupID());
// Acquire the group to resize from the database
var group = persistenceManager.getGroupByID(input.getGroupID());
// Perform the desired operation
switch (input.getOperation()) { switch (input.getOperation()) {
case ADD: case ADD:
group.getContacts().add(persistenceManager.getUserByID(input.get())); group.getContacts().add(persistenceManager.getUserByID(input.get().getID()));
break; break;
case REMOVE: case REMOVE:
group.getContacts().remove(persistenceManager.getUserByID(input.get())); group.getContacts().remove(persistenceManager.getUserByID(input.get().getID()));
break; break;
} }
// Update the group in the database
persistenceManager.updateContact(group); persistenceManager.updateContact(group);
writeProxy.write(socketID, group);
// Send the updated group to all of its members
var commonGroup = group.toCommon();
group.getContacts() group.getContacts()
.stream() .stream()
.map(Contact::getID) .map(Contact::getID)
@@ -42,7 +49,7 @@ public class GroupResizeProcessor implements ObjectProcessor<GroupResizeEvent> {
.map(connectionManager::getSocketId) .map(connectionManager::getSocketId)
.forEach(memberSocketID -> { .forEach(memberSocketID -> {
try { try {
writeProxy.write(memberSocketID, group); writeProxy.write(memberSocketID, commonGroup);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }