From 4272ceb5ac27da022954bc499f048ce89fc24841 Mon Sep 17 00:00:00 2001
From: Dominic Grimm <dominic.grimm@gmail.com>
Date: Fri, 25 Feb 2022 12:27:25 +0100
Subject: [PATCH] Simplified HTML minification for GraphQL playground macro
 statement

---
 docker/backend/src/backend/api/service.cr   | 4 +++-
 docker/backend/src/backend/api/webserver.cr | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docker/backend/src/backend/api/service.cr b/docker/backend/src/backend/api/service.cr
index 929b0cf..f7c1706 100644
--- a/docker/backend/src/backend/api/service.cr
+++ b/docker/backend/src/backend/api/service.cr
@@ -26,7 +26,9 @@ module Backend
       # Runs API service
       def run(_unit : ::Service::Unit) : ::Service::Unit?
         Log.info { "Starting Api service..." }
-        WebServer.new.run
+        server = WebServer.new
+        server.draw_routes
+        server.run
         Log.info { "Api service stopped." }
 
         ::Service::Unit.new(self)
diff --git a/docker/backend/src/backend/api/webserver.cr b/docker/backend/src/backend/api/webserver.cr
index 9b00291..66f1f9d 100644
--- a/docker/backend/src/backend/api/webserver.cr
+++ b/docker/backend/src/backend/api/webserver.cr
@@ -27,7 +27,11 @@ module Backend
       # GraphQL playground HTML code
       #
       # NOTE: Is minified in production
-      GRAPHQL_PLAYGROUND = {{ flag?(:development) ? read_file("#{__DIR__}/playground.html") : run("./macros/minify_html.cr", read_file("#{__DIR__}/playground.html")).stringify }}
+      GRAPHQL_PLAYGROUND = {% if flag?(:development) %}
+                              {{ read_file("#{__DIR__}/playground.html") }}
+                           {% else %}
+                              {{ run("./macros/minify_html.cr", read_file("#{__DIR__}/playground.html")).stringify }}
+                           {% end %}
 
       # GraphQL request data serializer
       struct GraphQLQueryData
@@ -80,8 +84,6 @@ module Backend
 
       # Runs the webserver with according middleware
       def run : Nil
-        draw_routes
-
         server = HTTP::Server.new([
           HTTP::LogHandler.new,
           HTTP::ErrorHandler.new,