.

indoorvivants · Oct 21, 2023 · 10e2a3d · 10e2a3d
1 parent d8c2822
commit 10e2a3d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/modules/backend/src/main/scala/database.scala b/modules/backend/src/main/scala/database.scala
@@ -12,8 +12,8 @@ trait Database:
   def create(key: Key, value: Option[Value]): IO[Unit]
   def getAll(): IO[Stream[IO, Pair]]
   def delete(key: Key): IO[Int]
-  def inc(key: Key): IO[Pair]
-  def dec(key: Key): IO[Pair]
+  def inc(key: Key): IO[Option[Pair]]
+  def dec(key: Key): IO[Option[Pair]]
   def update(key: Key, value: Value): IO[Pair]
 
 object Database:
@@ -26,15 +26,15 @@ object Database:
         )
       }
 
-      override def dec(key: Key): IO[Pair] = pool.use{
+      override def dec(key: Key): IO[Option[Pair]] = pool.use{
         s => s.prepare(operations.decrementValue).flatMap(
-          _.unique(key)
+          _.option(key)
         )
       }
 
-      override def inc(key: Key): IO[Pair] = pool.use{
+      override def inc(key: Key): IO[Option[Pair]] = pool.use{
         s => s.prepare(operations.incrementValue).flatMap(
-          _.unique(key)
+          _.option(key)
         )
       }
 

diff --git a/modules/backend/src/main/scala/service.hello.scala b/modules/backend/src/main/scala/service.hello.scala
@@ -16,7 +16,7 @@ class HelloImplementation(logger: Scribe[IO], db: Database)
     }
 
   override def dec(key: Key): IO[Unit] =
-    db.dec(key).void
+    orNotFound(db.dec(key).map(_.map(_ => 1))).void
     // (
     //   err =>
     //     logger.error(err) *>
@@ -25,7 +25,7 @@ class HelloImplementation(logger: Scribe[IO], db: Database)
     // )
 
   override def inc(key: Key): IO[Unit] =
-    db.inc(key).void
+    orNotFound(db.inc(key).map(_.map(_ => 1))).void
     // .redeem(
     //   err =>
     //     IO.println("Inc error") *>

diff --git a/modules/tests/src/test/scala/stub/InMemoryDatabase.scala b/modules/tests/src/test/scala/stub/InMemoryDatabase.scala
@@ -17,17 +17,17 @@ class InMemoryDatabase private (rf: Ref[IO, Map[Key, Value]]) extends Database:
     else throw KeyNotFound()
   }
 
-  override def dec(key: Key): IO[Pair] = rf.modify[Pair] { mp =>
+  override def dec(key: Key): IO[Option[Pair]] = rf.modify[Option[Pair]] { mp =>
     if mp.contains(key) then
       val newMap = mp.updatedWith(key)(_.map(v => Value(v.value - 1)))
-      (newMap, Pair(key, newMap(key)))
+      (newMap, Some(Pair(key, newMap(key))))
     else throw KeyNotFound()
   }
 
-  override def inc(key: Key): IO[Pair] = rf.modify[Pair] { mp =>
+  override def inc(key: Key): IO[Option[Pair]] = rf.modify[Option[Pair]] { mp =>
     if mp.contains(key) then
       val newMap = mp.updatedWith(key)(_.map(v => Value(v.value + 1)))
-      (newMap, Pair(key, newMap(key)))
+      (newMap, Some(Pair(key, newMap(key))))
     else
       throw KeyNotFound()
   }