From 3061277c57727e38b204391531cc24ea70da2fcd Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Sat, 20 May 2023 17:56:11 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20AP=E3=81=AEKey=E3=81=ABid=E3=81=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev/usbharu/hideout/domain/model/ap/Key.kt    | 15 +++++++++++----
 .../dev/usbharu/hideout/domain/model/ap/Object.kt |  9 +++++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt
index 850bacb8..63986e4c 100644
--- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Key.kt
@@ -8,29 +8,36 @@ open class Key : Object {
     constructor(
         type: List<String>,
         name: String,
-        id: String?,
+        id: String,
         owner: String?,
         publicKeyPem: String?
-    ) : super(add(type, "Key"), name, id) {
+    ) : super(
+        type = add(list = type, type = "Key"),
+        name = name,
+        id = id
+    ) {
         this.owner = owner
         this.publicKeyPem = publicKeyPem
     }
 
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is Key) return false
         if (!super.equals(other)) return false
 
-        if (id != other.id) return false
         if (owner != other.owner) return false
         return publicKeyPem == other.publicKeyPem
     }
 
     override fun hashCode(): Int {
         var result = super.hashCode()
-        result = 31 * result + (id?.hashCode() ?: 0)
         result = 31 * result + (owner?.hashCode() ?: 0)
         result = 31 * result + (publicKeyPem?.hashCode() ?: 0)
         return result
     }
+
+    override fun toString(): String {
+        return "Key(owner=$owner, publicKeyPem=$publicKeyPem) ${super.toString()}"
+    }
 }
diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt
index ae52c978..1adcb211 100644
--- a/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt
+++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/ap/Object.kt
@@ -20,6 +20,7 @@ open class Object : JsonLd {
         this.id = id
     }
 
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is Object) return false
@@ -27,7 +28,8 @@ open class Object : JsonLd {
 
         if (type != other.type) return false
         if (name != other.name) return false
-        return actor == other.actor
+        if (actor != other.actor) return false
+        return id == other.id
     }
 
     override fun hashCode(): Int {
@@ -35,10 +37,13 @@ open class Object : JsonLd {
         result = 31 * result + type.hashCode()
         result = 31 * result + (name?.hashCode() ?: 0)
         result = 31 * result + (actor?.hashCode() ?: 0)
+        result = 31 * result + (id?.hashCode() ?: 0)
         return result
     }
 
-    override fun toString(): String = "Object(type=$type, name=$name, actor=$actor) ${super.toString()}"
+    override fun toString(): String {
+        return "Object(type=$type, name=$name, actor=$actor, id=$id) ${super.toString()}"
+    }
 
     companion object {
         @JvmStatic