1 files changed, 12 insertions, 4 deletions
diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/Identity.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/Identity.java
index 03c0ef4..2d81055 100644
--- a/shared/src/main/java/kz/ilotterytea/frogartha/domain/Identity.java
+++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/Identity.java
@@ -7,14 +7,20 @@ import com.github.czyzby.websocket.serialization.impl.Serializer;
 
 public class Identity implements Transferable<Identity> {
     private String username;
+    private long id;
 
     public Identity() {
     }
 
-    public Identity(String username) {
+    public Identity(long id, String username) {
+        this.id = id;
         this.username = username;
     }
 
+    public long getId() {
+        return id;
+    }
+
     public String getUsername() {
         return username;
     }
@@ -22,7 +28,8 @@ public class Identity implements Transferable<Identity> {
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof Identity) {
-            return ((Identity) obj).username.equals(username);
+            Identity i = (Identity) obj;
+            return i.username.equals(username) && i.id == id;
         }
         return false;
     }
@@ -31,16 +38,17 @@ public class Identity implements Transferable<Identity> {
     public String toString() {
         return "Identity{" +
             "username='" + username + '\'' +
+            ", id=" + id +
             '}';
     }
 
     @Override
     public void serialize(Serializer serializer) throws SerializationException {
-        serializer.serializeString(username);
+        serializer.serializeLong(id).serializeString(username);
     }
 
     @Override
     public Identity deserialize(Deserializer deserializer) throws SerializationException {
-        return new Identity(deserializer.deserializeString());
+        return new Identity(deserializer.deserializeLong(), deserializer.deserializeString());
     }
 }