From 783342ef8f4e086621ddd18eb0c6c809b9baa9aa Mon Sep 17 00:00:00 2001
From: Thanh Le <lenguyenthanh@hotmail.com>
Date: Tue, 21 Nov 2023 23:06:20 +0100
Subject: [PATCH] Refactor acquire action out

---
 app/src/main/scala/http/FishnetRoutes.scala | 23 ++++++++++-----------
 build.sbt                                   |  3 +--
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/src/main/scala/http/FishnetRoutes.scala b/app/src/main/scala/http/FishnetRoutes.scala
index 2f3979d..e5f8b89 100644
--- a/app/src/main/scala/http/FishnetRoutes.scala
+++ b/app/src/main/scala/http/FishnetRoutes.scala
@@ -18,23 +18,22 @@ final class FishnetRoutes(executor: Executor) extends Http4sDsl[IO]:
 
     case req @ POST -> Root / "acquire" =>
       req
-        .decode[Fishnet.Acquire]: acquire =>
-          executor
-            .acquire(acquire.fishnet.apikey)
-            .map(_.map(_.toResponse))
-            .flatMap(_.fold(NoContent())(Ok(_)))
-            .recoverWith:
-              case x => InternalServerError(x.getMessage().nn)
+        .decode[Fishnet.Acquire]: input =>
+          acquire(input.fishnet.apikey)
 
     case req @ POST -> Root / "move" / WorkIdVar(id) =>
       req
         .decode[Fishnet.PostMove]: move =>
           executor.move(id, move.fishnet.apikey, move.move.bestmove)
-            >> executor.acquire(move.fishnet.apikey)
-              .map(_.map(_.toResponse))
-              .flatMap(_.fold(NoContent())(Ok(_)))
-              .recoverWith:
-                case x => InternalServerError(x.getMessage().nn)
+            >> acquire(move.fishnet.apikey)
+
+  def acquire(key: ClientKey): IO[Response[IO]] =
+    executor
+      .acquire(key)
+      .map(_.map(_.toResponse))
+      .flatMap(_.fold(NoContent())(Ok(_)))
+      .recoverWith:
+        case x => InternalServerError(x.getMessage().nn)
 
   val routes: HttpRoutes[IO] = Router(prefixPath -> httpRoutes)
 
diff --git a/build.sbt b/build.sbt
index c8b6b16..5dc37cb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,7 @@ lazy val app = project
   .in(file("app"))
   .settings(
     scalacOptions -= "-Xfatal-warnings",
-    scalacOptions ++= Seq("-source:future", "-rewrite", "-indent", "-explain", "-Wunused:all"),
+    scalacOptions ++= Seq("-source:future", "-rewrite", "-indent", "-explain", "-Wunused:all", "-release:21"),
     resolvers ++= Seq(Dependencies.lilaMaven),
     libraryDependencies ++= Seq(
       catsCore,
@@ -41,7 +41,6 @@ lazy val app = project
       munitScalacheck,
       weaver,
       weaverScalaCheck,
-      http4sClient,
       circeLiteral,
     ),
   )