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

Fixed user search

Browse Source
This commit is contained in:
DieGurke
2020-02-08 14:27:21 +01:00
parent 33dc6ba4ac
commit 9110073d16
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/envoy/server/Startup.java
View File

@@ -10,7 +10,12 @@ import envoy.server.data.ConfigItem;
import envoy.server.database.PersistenceManager; import envoy.server.database.PersistenceManager;
import envoy.server.net.ObjectMessageProcessor; import envoy.server.net.ObjectMessageProcessor;
import envoy.server.net.ObjectMessageReader; import envoy.server.net.ObjectMessageReader;
import envoy.server.processors.*; import envoy.server.processors.ContactsRequestProcesor;
import envoy.server.processors.IdGeneratorRequestProcessor;
import envoy.server.processors.LoginCredentialProcessor;
import envoy.server.processors.MessageProcessor;
import envoy.server.processors.MessageStatusChangeProcessor;
import envoy.server.processors.UserStatusChangeProcessor;
/** /**
* Starts the server.<br> * Starts the server.<br>
@@ -38,6 +43,7 @@ public class Startup {
processors.add(new MessageStatusChangeProcessor()); processors.add(new MessageStatusChangeProcessor());
processors.add(new UserStatusChangeProcessor()); processors.add(new UserStatusChangeProcessor());
processors.add(new IdGeneratorRequestProcessor()); processors.add(new IdGeneratorRequestProcessor());
processors.add(new ContactsRequestProcesor());
Server server = new Server(8080, () -> new ObjectMessageReader(), new ObjectMessageProcessor(processors)); Server server = new Server(8080, () -> new ObjectMessageReader(), new ObjectMessageProcessor(processors));
initializeCurrentMessageId(); initializeCurrentMessageId();

2
src/main/java/envoy/server/database/PersistenceManager.java
View File

@@ -177,7 +177,7 @@ public class PersistenceManager {
} }
public List<User> searchUsers(String searchPhrase) { public List<User> searchUsers(String searchPhrase) {
return entityManager.createNamedQuery("searchUsers").setParameter("searchPhrase", searchPhrase).getResultList(); return entityManager.createNamedQuery("searchUsers").setParameter("searchPhrase", searchPhrase + "%").getResultList();
} }
/** /**

5
src/main/java/envoy/server/processors/ContactsRequestProcesor.java
View File

@@ -3,6 +3,7 @@ package envoy.server.processors;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import envoy.data.Contacts;
import envoy.event.ContactsRequest; import envoy.event.ContactsRequest;
import envoy.server.ObjectProcessor; import envoy.server.ObjectProcessor;
import envoy.server.database.PersistenceManager; import envoy.server.database.PersistenceManager;
@@ -21,11 +22,11 @@ public class ContactsRequestProcesor implements ObjectProcessor<ContactsRequest>
@Override @Override
public void process(ContactsRequest request, long socketId, ObjectWriteProxy writeProxy) throws IOException { public void process(ContactsRequest request, long socketId, ObjectWriteProxy writeProxy) throws IOException {
writeProxy.write(socketId, writeProxy.write(socketId,
PersistenceManager.getPersistenceManager() new Contacts(PersistenceManager.getPersistenceManager()
.searchUsers(request.get()) .searchUsers(request.get())
.stream() .stream()
.map(envoy.server.data.User::toCommonUser) .map(envoy.server.data.User::toCommonUser)
.collect(Collectors.toList())); .collect(Collectors.toList())));
} }
@Override @Override