From 32fd365fb546e7e2ad195b575be4bca457cba6e9 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 23 Jan 2016 12:58:14 +0000
Subject: cleanup of persistent-instances

---
 .../src/Thermoprint/Server/Database/Instances.hs   | 22 +---------------------
 server/thermoprint-server.cabal                    |  2 --
 server/thermoprint-server.nix                      | 14 +++++++-------
 3 files changed, 8 insertions(+), 30 deletions(-)

(limited to 'server')

diff --git a/server/src/Thermoprint/Server/Database/Instances.hs b/server/src/Thermoprint/Server/Database/Instances.hs
index f5c22fd..e54f90e 100644
--- a/server/src/Thermoprint/Server/Database/Instances.hs
+++ b/server/src/Thermoprint/Server/Database/Instances.hs
@@ -6,28 +6,8 @@ module Thermoprint.Server.Database.Instances where
 
 import Thermoprint.API (Printout, JobStatus, PrintingError)
 
-import Database.Persist (PersistField(..))
-import Database.Persist.Sql (PersistFieldSql(..))
 import Database.Persist.TH
 
-import Control.Monad ((<=<))
-import Data.Bifunctor
-
-import qualified Data.Aeson as JSON (encode, eitherDecodeStrict')
-
-import Data.ByteString (ByteString)
-import qualified Data.ByteString.Lazy as LBS (toStrict)
-import qualified Data.Text as T (pack)
-
-import Data.Proxy
-
--- | Instead of deriving an instance using 'derivePersistField', which would use 'show' and 'read', we write our own by hand in order to use json
-instance PersistField Printout where
-  toPersistValue   = toPersistValue . LBS.toStrict . JSON.encode
-  fromPersistValue = first T.pack . JSON.eitherDecodeStrict' <=< fromPersistValue
-
-instance PersistFieldSql Printout where
-  sqlType _ = sqlType (Proxy :: Proxy ByteString)
-
+derivePersistFieldJSON "Printout"
 derivePersistField "PrintingError"
 derivePersistField "JobStatus"
diff --git a/server/thermoprint-server.cabal b/server/thermoprint-server.cabal
index bd22482..8862255 100644
--- a/server/thermoprint-server.cabal
+++ b/server/thermoprint-server.cabal
@@ -40,8 +40,6 @@ library
                      , either >=4.4.1 && <5
                      , text >=1.2.1 && <2
                      , stm >=2.4.4 && <3
-                     , aeson >=0.9.0 && <1
-                     , bytestring >=0.10.6 && <1
   hs-source-dirs:      src
   default-language:    Haskell2010
 
diff --git a/server/thermoprint-server.nix b/server/thermoprint-server.nix
index 0f85c9d..57e94a3 100644
--- a/server/thermoprint-server.nix
+++ b/server/thermoprint-server.nix
@@ -1,7 +1,7 @@
-{ mkDerivation, aeson, base, bytestring, containers
-, data-default-class, dyre, either, monad-logger, mtl, persistent
-, persistent-sqlite, persistent-template, resourcet, servant-server
-, stdenv, stm, text, thermoprint-spec, transformers, wai, warp
+{ mkDerivation, base, containers, data-default-class, dyre, either
+, monad-logger, mtl, persistent, persistent-sqlite
+, persistent-template, resourcet, servant-server, stdenv, stm, text
+, thermoprint-spec, transformers, wai, warp
 }:
 mkDerivation {
   pname = "thermoprint-server";
@@ -10,9 +10,9 @@ mkDerivation {
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
-    aeson base bytestring containers data-default-class dyre either
-    monad-logger mtl persistent persistent-template resourcet
-    servant-server stm text thermoprint-spec transformers wai warp
+    base containers data-default-class dyre either monad-logger mtl
+    persistent persistent-template resourcet servant-server stm text
+    thermoprint-spec transformers wai warp
   ];
   executableHaskellDepends = [
     base monad-logger mtl persistent-sqlite resourcet
-- 
cgit v1.2.3