remove warnings, enable some old traits

RawToast · Nov 18, 2023 · 644f33d · 644f33d
1 parent 6e09350
commit 644f33d
Show file tree

Hide file tree

Showing 20 changed files with 490 additions and 476 deletions.
diff --git a/src/main/scala/hygiene/Server.scala b/src/main/scala/hygiene/Server.scala
@@ -10,6 +10,8 @@ package hygiene
 // import org.http4s.server.blaze.BlazeBuilder
 // import org.http4s.util.StreamApp
 
+object Server
+
 // object Server extends StreamApp {
 
 //   // Construct services / inject here

diff --git a/src/main/scala/hygiene/client/JsonClient.scala b/src/main/scala/hygiene/client/JsonClient.scala
@@ -9,6 +9,9 @@ package hygiene.client
 // import org.http4s.dsl._
 // import org.log4s._
 
+trait Client[F[_], R]:
+  def fetch(path: String): F[R]
+
 // class JsonClient(client: Client, baseUri:Uri){
 
 //   lazy val logger: Logger = getLogger

diff --git a/src/main/scala/hygiene/domain/Authority.scala b/src/main/scala/hygiene/domain/Authority.scala
@@ -1,3 +1,3 @@
 package hygiene.domain
 
-// case class Authority(name: String, id: Int, establishments: Int)
+case class Authority(name: String, id: Int, establishments: Int)
diff --git a/src/main/scala/hygiene/middleware/CachingMiddleware.scala b/src/main/scala/hygiene/middleware/CachingMiddleware.scala
@@ -6,7 +6,7 @@ package hygiene.middleware
 // import org.log4s._
 // import org.http4s.dsl._
 
-// object CachingMiddleware {
+object CachingMiddleware
 
 //   lazy val logger = getLogger
 

diff --git a/src/main/scala/hygiene/routes/AuthorityController.scala b/src/main/scala/hygiene/routes/AuthorityController.scala
@@ -8,6 +8,8 @@ package hygiene.routes
 // import play.twirl.api.Html
 // import org.http4s.twirl._
 
+object HereToShutupTheCompiler
+
 // class AuthorityController(establishmentService: HygieneRatings, authorityService: ListAuthorities) {
 //   val endpoints: HttpService = HttpService {
 

diff --git a/src/main/scala/hygiene/services/AuthorityService.scala b/src/main/scala/hygiene/services/AuthorityService.scala
@@ -2,14 +2,13 @@ package hygiene.services
 
 // import fs2.Task
 // import hygiene.client.JsonClient
-// import hygiene.domain.Authority
+import hygiene.domain.Authority
 // import hygiene.services.util.AuthorityParser
 // import io.circe.Json
 // import org.log4s.{Logger, getLogger}
 
-// trait ListAuthorities {
-//   def authorities: Task[Seq[Authority]]
-// }
+trait ListAuthorities[F[_]]:
+  def authorities: F[Seq[Authority]]
 
 // class AuthorityService(client: JsonClient, authorityParser: AuthorityParser[Json])
 //   extends ListAuthorities {

diff --git a/src/main/scala/hygiene/services/EstablishmentService.scala b/src/main/scala/hygiene/services/EstablishmentService.scala
@@ -6,9 +6,8 @@ package hygiene.services
 // import io.circe.Json
 // import org.log4s.{Logger, getLogger}
 
-// trait HygieneRatings {
-//   def hygieneRatings(id: Int, establishments: Int): Task[Map[String, Double]]
-// }
+trait HygieneRatings[F[_]]:
+  def hygieneRatings(id: Int, establishments: Int): F[Map[String, Double]]
 
 // class EstablishmentService(client: JsonClient,
 //                            establishmentParser: EstablishmentParser[Json],

diff --git a/src/main/scala/hygiene/services/util/AuthorityParser.scala b/src/main/scala/hygiene/services/util/AuthorityParser.scala
@@ -1,6 +1,6 @@
 package hygiene.services.util
 
-// import hygiene.domain.Authority
+import hygiene.domain.Authority
 // import io.circe.Json
 // import io.circe.optics.JsonPath._
 // import monocle.{Optional, Traversal}
@@ -28,6 +28,6 @@ package hygiene.services.util
 //   }
 // }
 
-// trait AuthorityParser[T] {
-//   def summariseAuthorites(authData: T): Seq[Authority]
-// }
+trait AuthorityParser[T] {
+  def summariseAuthorites(authData: T): Seq[Authority]
+}
diff --git a/src/main/scala/hygiene/services/util/EstablishmentParser.scala b/src/main/scala/hygiene/services/util/EstablishmentParser.scala
@@ -2,11 +2,10 @@ package hygiene.services.util
 
 // import io.circe.Json
 
-// trait EstablishmentParser[T] {
-//   def establishmentRating(singleEstablishment: T): Option[String]
+trait EstablishmentParser[T]:
+  def establishmentRating(singleEstablishment: T): Option[String]
 
-//   def countEstablishmentRatings(validEstablishmentsJson: T): Map[String, Int]
-// }
+  def countEstablishmentRatings(validEstablishmentsJson: T): Map[String, Int]
 
 // object JsonEstablishmentParser extends EstablishmentParser[Json] {
 

diff --git a/src/main/scala/hygiene/services/util/RatingsFormatter.scala b/src/main/scala/hygiene/services/util/RatingsFormatter.scala
@@ -1,8 +1,7 @@
 package hygiene.services.util
 
-// trait RatingsFormatter {
-//   def summariseRatings(ratings: Map[String, Int]): Map[String, Double]
-// }
+trait RatingsFormatter:
+  def summariseRatings(ratings: Map[String, Int]): Map[String, Double]
 
 // object UniversalRatingsFormatter extends RatingsFormatter {
 //   /**