Add CodecXXX capable of updating map, list, set types in statement instead of replacing it (#263)

dfakhritdinov · Denys Fakhritdinov · web-flow · commit aa8356ba79c2 · 2024-09-09T18:31:35.000+02:00
* Add CodecXXX capable of updating map, list, set types in statement
instead of replacing it

* drop Codec and impl Update instead

---------

Co-authored-by: Denys Fakhritdinov &lt;dfakhritdinov@evolution.com&gt;
diff --git a/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateByIdx.scala b/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateByIdx.scala
@@ -0,0 +1,40 @@
+package com.evolutiongaming.scassandra
+
+import com.datastax.driver.core.{GettableByIndexData, SettableData}
+
+trait UpdateByIdx[-A] {
+
+  def apply[D <: GettableByIndexData & SettableData[D]](
+      data: D,
+      idx: Int,
+      value: A
+  ): D
+
+}
+
+object UpdateByIdx {
+
+  def apply[A: UpdateByIdx]: UpdateByIdx[A] = implicitly
+
+  implicit def fromEncodeByIdx[A: EncodeByIdx]: UpdateByIdx[A] =
+    new UpdateByIdx[A] {
+      def apply[D <: GettableByIndexData & SettableData[D]](
+          data: D,
+          idx: Int,
+          value: A
+      ): D = EncodeByIdx[A].apply(data, idx, value)
+    }
+
+  implicit final class Syntax[A](val self: UpdateByIdx[A]) extends AnyVal {
+
+    def contramap[B](f: B => A): UpdateByIdx[B] = new UpdateByIdx[B] {
+      def apply[D <: GettableByIndexData & SettableData[D]](
+          data: D,
+          idx: Int,
+          value: B
+      ): D = self(data, idx, f(value))
+    }
+
+  }
+
+}
diff --git a/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateByName.scala b/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateByName.scala
@@ -0,0 +1,39 @@
+package com.evolutiongaming.scassandra
+
+import com.datastax.driver.core.{GettableByNameData, SettableData}
+
+trait UpdateByName[-A] {
+
+  def apply[D <: GettableByNameData & SettableData[D]](
+      data: D,
+      name: String,
+      value: A
+  ): D
+
+}
+
+object UpdateByName {
+
+  def apply[A: UpdateByName]: UpdateByName[A] = implicitly
+
+  implicit def fromEncodeByName[A: EncodeByName]: UpdateByName[A] =
+    new UpdateByName[A] {
+      def apply[D <: GettableByNameData & SettableData[D]](
+          data: D,
+          name: String,
+          value: A
+      ): D = EncodeByName[A].apply(data, name, value)
+    }
+
+  implicit final class Syntax[A](val self: UpdateByName[A]) extends AnyVal {
+
+    def contramap[B](f: B => A): UpdateByName[B] = new UpdateByName[B] {
+      def apply[D <: GettableByNameData & SettableData[D]](
+          data: D,
+          name: String,
+          value: B
+      ): D = self(data, name, f(value))
+    }
+
+  }
+}
diff --git a/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateRow.scala b/scassandra/src/main/scala/com/evolutiongaming/scassandra/UpdateRow.scala
@@ -0,0 +1,36 @@
+package com.evolutiongaming.scassandra
+
+import com.datastax.driver.core.{GettableData, SettableData}
+
+trait UpdateRow[-A] {
+
+  def apply[D <: GettableData & SettableData[D]](
+      data: D,
+      value: A
+  ): D
+
+}
+
+object UpdateRow {
+
+  def apply[A: UpdateRow]: UpdateRow[A] = implicitly
+
+  implicit def fromEncodeRow[A: EncodeRow]: UpdateRow[A] =
+    new UpdateRow[A] {
+      def apply[D <: GettableData & SettableData[D]](
+          data: D,
+          value: A
+      ): D = EncodeRow[A].apply(data, value)
+    }
+
+  implicit final class Syntax[A](val self: UpdateRow[A]) extends AnyVal {
+
+    def contramap[B](f: B => A): UpdateRow[B] = new UpdateRow[B] {
+      def apply[D <: GettableData & SettableData[D]](
+          data: D,
+          value: B
+      ): D = self(data, f(value))
+    }
+
+  }
+}
diff --git a/scassandra/src/main/scala/com/evolutiongaming/scassandra/syntax.scala b/scassandra/src/main/scala/com/evolutiongaming/scassandra/syntax.scala
@@ -16,14 +16,15 @@ object syntax {
       val iterator = self.iterator()
       val fetch = FromGFuture[F].apply { self.fetchMoreResults() }.void
       val fetched = Sync[F].delay { self.isFullyFetched }
-      val next = Sync[F].delay { List.fill(self.getAvailableWithoutFetching)(iterator.next()) }
+      val next = Sync[F].delay {
+        List.fill(self.getAvailableWithoutFetching)(iterator.next())
+      }
 
       new Stream[F, Row] {
 
         def foldWhileM[L, R](l: L)(f: (L, Row) => F[Either[L, R]]) = {
 
           l.tailRecM[F, Either[L, R]] { l =>
-
             def apply(rows: List[Row]) = {
               for {
                 result <- rows.foldWhileM(l)(f)
@@ -37,7 +38,8 @@ object syntax {
                 fetching <- fetch.start
                 result <- rows.foldWhileM(l)(f)
                 result <- result match {
-                  case l: Left[L, R]  => fetching.join as l.rightCast[Either[L, R]]
+                  case l: Left[L, R] =>
+                    fetching.join as l.rightCast[Either[L, R]]
                   case r: Right[L, R] => r.leftCast[L].asRight[L].pure[F]
                 }
               } yield result
@@ -54,9 +56,12 @@ object syntax {
     }
   }
 
-  implicit class ScassandraSettableDataOps[A <: SettableData[A]](val self: A) extends AnyVal {
+  implicit class ScassandraSettableDataOps[A <: SettableData[A]](val self: A)
+      extends AnyVal {
 
-    def encode[B](name: String, value: B)(implicit encode: EncodeByName[B]): A = {
+    def encode[B](name: String, value: B)(implicit
+        encode: EncodeByName[B]
+    ): A = {
       encode(self, name, value)
     }
 
@@ -68,7 +73,9 @@ object syntax {
       encode(self, idx, value)
     }
 
-    def encodeSome[B](name: String, value: Option[B])(implicit encode: EncodeByName[B]): A = {
+    def encodeSome[B](name: String, value: Option[B])(implicit
+        encode: EncodeByName[B]
+    ): A = {
       value.fold(self)(encode(self, name, _))
     }
 
@@ -77,8 +84,8 @@ object syntax {
     }
   }
 
-
-  implicit class ScassandraGettableByNameDataOps(val self: GettableByNameData) extends AnyVal {
+  implicit class ScassandraGettableByNameDataOps(val self: GettableByNameData)
+      extends AnyVal {
 
     def decode[A](name: String)(implicit decode: DecodeByName[A]): A = {
       decode(self, name)
@@ -89,23 +96,37 @@ object syntax {
     }
   }
 
-
-  implicit class ScassandraGettableByIdxDataOps(val self: GettableByIndexData) extends AnyVal {
+  implicit class ScassandraGettableByIdxDataOps(val self: GettableByIndexData)
+      extends AnyVal {
 
     def decodeAt[A](idx: Int)(implicit decode: DecodeByIdx[A]): A = {
       decode(self, idx)
     }
   }
 
-
   implicit def toCqlOps[A](a: A): ToCql.Ops.IdOps[A] = new ToCql.Ops.IdOps(a)
 
-
   implicit class ScassandraStatementOps(val self: Statement) extends AnyVal {
 
     def trace(enable: Boolean): Statement = {
       if (enable) self.enableTracing()
       else self.disableTracing()
     }
   }
+
+  implicit class ScassandraUpdateSyntax[D <: GettableData & SettableData[D]](val data: D) extends AnyVal {
+
+    def update[A](value: A)(implicit update: UpdateRow[A]): D = {
+      update(data, value)
+    }
+
+    def update[A](name: String, value: A)(implicit update: UpdateByName[A]): D = {
+      update(data, name, value)
+    }
+
+    def updateAt[A](idx: Int, value: A)(implicit update: UpdateByIdx[A]): D = {
+      update(data, idx, value)
+    }
+
+  }
 }
diff --git a/scassandra/src/test/scala/com/evolutiongaming/scassandra/SyntaxSpec.scala b/scassandra/src/test/scala/com/evolutiongaming/scassandra/SyntaxSpec.scala
@@ -29,5 +29,17 @@ class SyntaxSpec extends AnyWordSpec with Matchers {
       val data1 = data.encodeAt(0, "str")
       data1.byIdx.get(0) shouldEqual Some("str")
     }
+
+    "update by name" in {
+      val data = DataMock()
+      val data1 = data.update("name", "str")
+      data1.byName.get("name") shouldEqual Some("str")
+    }
+
+    "update by idx" in {
+      val data = DataMock()
+      val data1 = data.updateAt(0, "str")
+      data1.byIdx.get(0) shouldEqual Some("str")
+    }
   }
 }
diff --git a/scassandra/src/test/scala/com/evolutiongaming/scassandra/UpdateByIdxSpec.scala b/scassandra/src/test/scala/com/evolutiongaming/scassandra/UpdateByIdxSpec.scala
@@ -0,0 +1,56 @@
+package com.evolutiongaming.scassandra
+
+import java.time.{Instant, LocalDate => LocalDateJ}
+import java.time.temporal.ChronoUnit
+
+import com.datastax.driver.core.{Duration, LocalDate}
+import com.evolutiongaming.scassandra.syntax._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+class UpdateByIdxSpec extends AnyWordSpec with Matchers {
+
+  def of[A](expected: A)(implicit
+      q: UpdateByIdx[A],
+      e: UpdateByIdx[Option[A]],
+      r: DecodeByIdx[A],
+      t: DecodeByIdx[Option[A]]
+  ) = { () =>
+    {
+      val data = DataMock()
+
+      data
+        .updateAt[A](0, expected)
+        .decodeAt[A](0) shouldEqual expected
+
+      data
+        .updateAt[Option[A]](1, Some(expected))
+        .decodeAt[Option[A]](1) shouldEqual Some(expected)
+
+      data
+        .updateAt[Option[A]](2, None)
+        .decodeAt[Option[A]](2) shouldEqual None
+    }
+  }
+
+  "CodecByIdx" should {
+
+    for {
+      (name, test) <- List(
+        ("String", of("string")),
+        ("Int", of(0)),
+        ("Long", of(0L)),
+        ("BigDecimal", of(BigDecimal(0))),
+        ("Double", of(0d)),
+        ("Float", of(0f)),
+        ("Instant", of(Instant.now().truncatedTo(ChronoUnit.MILLIS))),
+        ("Set", of(Set("str"))),
+        ("Duration", of(Duration.newInstance(1, 1, 1))),
+        ("LocalDate", of(LocalDate.fromYearMonthDay(2019, 10, 4))),
+        ("LocalDateJ", of(LocalDateJ.of(2019, 10, 4)))
+      )
+    } {
+      s"encode & decode $name" in test()
+    }
+  }
+}
diff --git a/scassandra/src/test/scala/com/evolutiongaming/scassandra/UpdateByNameSpec.scala b/scassandra/src/test/scala/com/evolutiongaming/scassandra/UpdateByNameSpec.scala
@@ -0,0 +1,56 @@
+package com.evolutiongaming.scassandra
+
+import java.time.{Instant, LocalDate => LocalDateJ}
+import java.time.temporal.ChronoUnit
+
+import com.datastax.driver.core.{Duration, LocalDate}
+import com.evolutiongaming.scassandra.syntax._
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpec
+
+class UpdateByNameSpec extends AnyWordSpec with Matchers {
+
+  def of[A](expected: A)(implicit
+      a: UpdateByName[A],
+      b: UpdateByName[Option[A]],
+      c: DecodeByName[A],
+      d: DecodeByName[Option[A]]
+  ) = { () =>
+    {
+      val data = DataMock()
+
+      data
+        .update[A]("0", expected)
+        .decode[A]("0") shouldEqual expected
+
+      data
+        .update[Option[A]]("1", Some(expected))
+        .decode[Option[A]]("1") shouldEqual Some(expected)
+
+      data
+        .update[Option[A]]("2", None)
+        .decode[Option[A]]("2") shouldEqual None
+    }
+  }
+
+  "CodecByName" should {
+
+    for {
+      (name, test) <- List(
+        ("String", of("string")),
+        ("Int", of(0)),
+        ("Long", of(0L)),
+        ("BigDecimal", of(BigDecimal(0))),
+        ("Double", of(0d)),
+        ("Float", of(0f)),
+        ("Instant", of(Instant.now().truncatedTo(ChronoUnit.MILLIS))),
+        ("Set", of(Set("str"))),
+        ("Duration", of(Duration.newInstance(1, 1, 1))),
+        ("LocalDate", of(LocalDate.fromYearMonthDay(2019, 10, 4))),
+        ("LocalDateJ", of(LocalDateJ.of(2019, 10, 4)))
+      )
+    } {
+      s"encode & decode $name" in test()
+    }
+  }
+}
diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "5.2.2-SNAPSHOT"
+ThisBuild / version := "5.3.0"

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,17 @@ class SyntaxSpec extends AnyWordSpec with Matchers {`
`29`	`29`	`val data1 = data.encodeAt(0, "str")`
`30`	`30`	`data1.byIdx.get(0) shouldEqual Some("str")`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ "update by name" in {`
	`34`	`+ val data = DataMock()`
	`35`	`+ val data1 = data.update("name", "str")`
	`36`	`+ data1.byName.get("name") shouldEqual Some("str")`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ "update by idx" in {`
	`40`	`+ val data = DataMock()`
	`41`	`+ val data1 = data.updateAt(0, "str")`
	`42`	`+ data1.byIdx.get(0) shouldEqual Some("str")`
	`43`	`+ }`
`32`	`44`	`}`
`33`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-ThisBuild / version := "5.2.2-SNAPSHOT"`
	`1`	`+ThisBuild / version := "5.3.0"`