Provide AuthAccount in AccountLinkAdapter

bivashy · Nov 2, 2023 · 62fc881 · 62fc881
1 parent a142f5d
commit 62fc881
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/core/src/main/java/me/mastercapexd/auth/database/adapter/AccountLinkAdapter.java b/core/src/main/java/me/mastercapexd/auth/database/adapter/AccountLinkAdapter.java
@@ -3,12 +3,13 @@
 import com.bivashy.auth.api.link.user.LinkUser;
 
 import me.mastercapexd.auth.database.model.AccountLink;
+import me.mastercapexd.auth.database.model.AuthAccount;
 
 public class AccountLinkAdapter extends AccountLink {
 
-    public AccountLinkAdapter(LinkUser linkUser) {
+    public AccountLinkAdapter(LinkUser linkUser, AuthAccount account) {
         super(linkUser.getLinkType().getName(), linkUser.getLinkUserInfo().getIdentificator().asString(), linkUser.getLinkUserInfo().isConfirmationEnabled(),
-                null);
+                account);
     }
 
 }
diff --git a/core/src/main/java/me/mastercapexd/auth/database/model/AccountLink.java b/core/src/main/java/me/mastercapexd/auth/database/model/AccountLink.java
@@ -1,11 +1,14 @@
 package me.mastercapexd.auth.database.model;
 
+import java.util.Objects;
+
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
 
 @DatabaseTable(tableName = "auth_links")
 public class AccountLink {
+
     public static final String LINK_TYPE_FIELD_KEY = "link_type";
     public static final String LINK_USER_ID_FIELD_KEY = "link_user_id";
     public static final String LINK_ENABLED_FIELD_KEY = "link_enabled";
@@ -43,6 +46,10 @@ public long getId() {
         return id;
     }
 
+    public void setId(long id) {
+        this.id = id;
+    }
+
     public String getLinkType() {
         return linkType;
     }
@@ -59,11 +66,20 @@ public AuthAccount getAccount() {
         return account;
     }
 
-    public void setLinkUserId(String linkUserId) {
-        this.linkUserId = linkUserId;
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof AccountLink))
+            return false;
+        AccountLink that = (AccountLink) o;
+        return getId() == that.getId() && isLinkEnabled() == that.isLinkEnabled() && Objects.equals(getLinkType(), that.getLinkType()) &&
+                Objects.equals(getLinkUserId(), that.getLinkUserId()) && getAccount().getId() == that.getAccount().getId();
     }
 
-    public void setLinkEnabled(boolean linkEnabled) {
-        this.linkEnabled = linkEnabled;
+    @Override
+    public int hashCode() {
+        return Objects.hash(getId(), getLinkType(), getLinkUserId(), isLinkEnabled(), getAccount().getId());
     }
+
 }