replace graphiql with playground, add docker-compose with postgresql and init scripts

Author: federico silva

build.sbt

@@ -105,5 +105,6 @@ lazy val core = project
       "org.http4s"           %% "http4s-circe"        % http4sVersion,
       "io.circe"             %% "circe-optics"        % circeVersion,
       "org.slf4j"            %  "slf4j-simple"        % slf4jVersion
-    )
+    ),
+    
   )

docker-compose.yml

@@ -0,0 +1,22 @@
+# Use postgres/example user/password credentials
+version: '3.1'
+
+services:
+
+  db:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: world
+    ports:
+      - 5432:5432
+    volumes:
+      - ./init/:/docker-entrypoint-initdb.d/
+
+  adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 8686:8080

init/01-tables.sql

@@ -0,0 +1,8 @@
+create table cities
+(
+  id         serial       primary key not null,
+  name       varchar(100) not null,
+  country_id varchar(2)   not null,
+  district   varchar(20)  not null,
+  population bigint
+);

init/02-cities-data.sql

@@ -0,0 +1,7 @@
+
+INSERT INTO cities (name, country_id, district, population)
+values
+       ('Montevideo',     'UY', 'Montevideo', 150000),
+       ('Paysandú',       'UY', 'Paysandú',   75000),
+       ('New York',       'US', 'New York',   8623000000),
+       ('San Francisco',  'US', 'California', 884363  )

modules/core/src/main/resources/assets/graphiql.html

@@ -106,12 +106,15 @@ object GraphQL {
           }
 
           // Parse `query` and execute.
-          def query(query: String, operationName: Option[String], variables: JsonObject): F[Either[Json, Json]] =
-            QueryParser.parse(query) match {
-              case Success(ast)                       => exec(schema, userContext, ast, operationName, variables)(blockingExecutionContext)
-              case Failure(e @ SyntaxError(_, _, pe)) => fail(formatSyntaxError(e))
-              case Failure(e)                         => fail(formatThrowable(e))
+          def query(query: String, operationName: Option[String], variables: JsonObject): F[Either[Json, Json]] = {
+           val q =  QueryParser.parse(query)
+            println(q)
+           q match {
+              case Success(ast) => exec(schema, userContext, ast, operationName, variables)(blockingExecutionContext)
+              case Failure(e@SyntaxError(_, _, pe)) => fail(formatSyntaxError(e))
+              case Failure(e) => fail(formatThrowable(e))
             }
+          }
 
           // Lift a `Json` into the error side of our effect.
           def fail(j: Json): F[Either[Json, Json]] =

modules/core/src/main/resources/assets/playground.html

@@ -12,20 +12,22 @@ import schema._
 import org.http4s._
 import org.http4s.circe._
 import org.http4s.dsl._
+import org.http4s.headers.Location
 import org.http4s.implicits._
 import org.http4s.server.Server
 import org.http4s.server.blaze._
+
 import scala.concurrent.ExecutionContext
 
 object Main extends IOApp {
 
-  // Construct a transctor for connecting to the database.
+  // Construct a transactor for connecting to the database.
   def transactor[F[_]: Async: ContextShift] =
     Transactor.fromDriverManager[F](
       "org.postgresql.Driver",
       "jdbc:postgresql:world",
-      "postgres",
-      ""
+      "user",
+      "password"
     )
 
   // Construct a GraphQL implementation based on our Sangria definitions.
@@ -44,20 +46,25 @@ object Main extends IOApp {
     graphQL:         GraphQL[F],
     blockingContext: ExecutionContext
   ): HttpRoutes[F] = {
+    
     object dsl extends Http4sDsl[F]; import dsl._
+    
     HttpRoutes.of[F] {
 
-      case GET -> Root =>
+      case GET -> Root / "playground.html" =>
         StaticFile
-          .fromResource[F]("/assets/graphiql.html", blockingContext)
+          .fromResource[F]("/assets/playground.html", blockingContext)
           .getOrElseF(NotFound())
-
+        
       case req @ POST -> Root / "graphql" ⇒
         req.as[Json].flatMap(graphQL.query).flatMap {
           case Right(json) => Ok(json)
           case Left(json)  => BadRequest(json)
         }
 
+      case _ =>
+        PermanentRedirect(Location(Uri.uri("/playground.html")))
+
     }
   }
 

modules/core/src/main/scala/GraphQL.scala

@@ -9,5 +9,5 @@ final case class City(
   name:         String,
   countryId:    String,
   district:     String,
-  population:   Int,
+  population:   Long,
 )

modules/core/src/main/scala/Main.scala

@@ -22,8 +22,8 @@ object CityRepo {
 
       val select: Fragment =
         fr"""
-          select id, name, countrycode, district, population
-          from city
+          select id, name, country_id, district, population
+          from cities
         """
 
       def fetchById(id: Int): F[Option[City]] =

modules/core/src/main/scala/model/City.scala

@@ -19,7 +19,7 @@ object CitySchema {
         Field("id",         IntType,    resolve = _.value.id),
         Field("name",       StringType, resolve = _.value.name),
         Field("district",   StringType, resolve = _.value.district),
-        Field("population", IntType,    resolve = _.value.population)
+        Field("population", LongType,    resolve = _.value.population)
       )
     )
 

modules/core/src/main/scala/repo/CityRepo.scala

@@ -1,2 +1,4 @@
 addSbtPlugin("com.timushev.sbt"   % "sbt-updates"     % "0.3.4")
 addSbtPlugin("de.heikoseeberger"  % "sbt-header"      % "5.0.0")
+addSbtPlugin("io.spray"           % "sbt-revolver"    % "0.9.1")
+