Refactor Document#equals method

Kirill5k · Feb 9, 2024 · d2f9995 · d2f9995
1 parent 71af55d
commit d2f9995
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/modules/circe/src/main/scala/mongo4cats/circe/CirceJsonMapper.scala b/modules/circe/src/main/scala/mongo4cats/circe/CirceJsonMapper.scala
@@ -67,7 +67,7 @@ private[circe] object CirceJsonMapper extends JsonMapper[Json] {
     def toBsonValue: BsonValue =
       jNumber.getClass.getName match {
         case "io.circe.JsonDouble" | "io.circe.JsonFloat" => BsonValue.double(jNumber.toDouble)
-        case "io.circe.JsonLong"                          => BsonValue.long(jNumber.toLong.get)
+        case "io.circe.JsonLong"                          => jNumber.toInt.map(BsonValue.int).orElse(jNumber.toLong.map(BsonValue.long)).get
         case _                                            => BsonValue.bigDecimal(jNumber.toBigDecimal.get)
       }
   }

diff --git a/modules/circe/src/test/scala/mongo4cats/circe/CirceJsonMapperSpec.scala b/modules/circe/src/test/scala/mongo4cats/circe/CirceJsonMapperSpec.scala
@@ -90,7 +90,7 @@ class CirceJsonMapperSpec extends AnyWordSpec with Matchers {
         )
 
         CirceJsonMapper.fromBson(bson) mustBe Right(json)
-        CirceJsonMapper.toBson(json).toString mustBe bson.toString
+        CirceJsonMapper.toBson(json) mustBe bson
       }
 
       "handle numeric conversions" in {
@@ -110,7 +110,7 @@ class CirceJsonMapperSpec extends AnyWordSpec with Matchers {
         )
 
         CirceJsonMapper.fromBson(bson) mustBe Right(json)
-        CirceJsonMapper.toBson(json).toString mustBe bson.toString
+        CirceJsonMapper.toBson(json) mustBe bson
       }
     }
   }

diff --git a/modules/kernel/src/main/scala/mongo4cats/bson/Document.scala b/modules/kernel/src/main/scala/mongo4cats/bson/Document.scala
@@ -107,8 +107,15 @@ final private class ListMapDocument(
   override def hashCode(): Int  = fields.hashCode()
   override def equals(other: Any): Boolean =
     Option(other) match {
-      case Some(doc: Document) => doc.toSet == fields.toSet
-      case _                   => false
+      case Some(doc: Document) if doc.keys == this.keys =>
+        doc.toMap.forall { case (k, v) =>
+          (v, fields.get(k)) match {
+            case (BsonValue.BBinary(bin1), Some(BsonValue.BBinary(bin2))) => bin1.sameElements(bin2)
+            case (bv1, Some(bv2))                                     => bv1 == bv2
+            case _                                                    => false
+          }
+        }
+      case _ => false
     }
 }
 

diff --git a/modules/zio-json/src/test/scala/mongo4cats/zio/json/ZioJsonMapperSpec.scala b/modules/zio-json/src/test/scala/mongo4cats/zio/json/ZioJsonMapperSpec.scala
@@ -105,7 +105,7 @@ class ZioJsonMapperSpec extends AnyWordSpec with Matchers {
         )
 
         ZioJsonMapper.fromBson(bson) mustBe Right(json)
-        ZioJsonMapper.toBson(json).toString mustBe bson.toString
+        ZioJsonMapper.toBson(json) mustBe bson
       }
 
       "handle numeric conversions" in {
@@ -123,7 +123,7 @@ class ZioJsonMapperSpec extends AnyWordSpec with Matchers {
         )
 
         ZioJsonMapper.fromBson(bson) mustBe Right(json)
-        ZioJsonMapper.toBson(json).toString mustBe bson.toString
+        ZioJsonMapper.toBson(json) mustBe bson
       }
     }
   }