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

Implemented contact adding mechanism + database update on both clients.

Browse Source 
* Added filtering on searchRequest response (temporary: has to be done
in query not manually in ContactsRequestProcessor.)
This commit is contained in:
DieGurke
2020-02-10 20:02:05 +01:00
parent 37f1594989
commit a96199ccd7
4 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/envoy/server/data/User.java
View File

@ -8,9 +8,9 @@ import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
@ -26,13 +26,14 @@ import javax.persistence.TemporalType;
* Created: <strong>02.01.2020</strong><br>
*
* @author Kai S. K. Engelbart
* @author Maximilian K&auml;fer
* @since Envoy Server Standalone v0.1-alpha
*/
@Entity
@Table(name = "users")
@NamedQueries(
{ @NamedQuery(query = "SELECT u FROM User u WHERE u.name = :name", name = "getUserByName"),
@NamedQuery(query = "SELECT u.contacts FROM User u WHERE u = :user", name = "getContactsOfUser"), // not tested
@NamedQuery(query = "SELECT u.contacts FROM User u WHERE u = :user", name = "getContactsOfUser"),
@NamedQuery(query = "SELECT u FROM User u WHERE lower(u.name) LIKE lower(:searchPhrase)", name = "searchUsers") }
)
public class User {
@ -47,7 +48,7 @@ public class User {
private Date lastSeen;
private envoy.data.User.UserStatus status;
@OneToMany(targetEntity = User.class, cascade = CascadeType.ALL, orphanRemoval = true)
@ManyToMany(targetEntity = User.class, cascade = CascadeType.ALL) // , orphanRemoval = true
private List<User> contacts;
/**