From 19df7b59fef57b75d6dc6d23dc0cd0c79bc39028 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 23 Jan 2016 13:58:00 +0000
Subject: JobStatus in database is bad design

---
 server/src/Thermoprint/Server/Database.hs           | 9 ++++++++-
 server/src/Thermoprint/Server/Database/Instances.hs | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'server/src')

diff --git a/server/src/Thermoprint/Server/Database.hs b/server/src/Thermoprint/Server/Database.hs
index 65bfc37..29732e1 100644
--- a/server/src/Thermoprint/Server/Database.hs
+++ b/server/src/Thermoprint/Server/Database.hs
@@ -4,6 +4,7 @@
 {-# LANGUAGE TypeFamilies               #-}
 {-# LANGUAGE ExistentialQuantification  #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE FlexibleInstances          #-}
 
 module Thermoprint.Server.Database
        ( Job(..), JobId
@@ -11,17 +12,23 @@ module Thermoprint.Server.Database
        , migrateAll
        ) where
 
+import Control.DeepSeq
+
 import Thermoprint.API (Printout, DraftTitle, JobStatus)
 
 import Database.Persist.TH
+import Database.Persist.Sql (unSqlBackendKey)
+import Database.Persist.Class (Key)
 
 import Thermoprint.Server.Database.Instances
 
 share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase|
 Job
     content Printout
-    status JobStatus
 Draft
     title DraftTitle Maybe
     content Printout
 |]
+
+instance NFData (Key Job) where
+  rnf = rnf . unSqlBackendKey . unJobKey
diff --git a/server/src/Thermoprint/Server/Database/Instances.hs b/server/src/Thermoprint/Server/Database/Instances.hs
index e54f90e..888e7a0 100644
--- a/server/src/Thermoprint/Server/Database/Instances.hs
+++ b/server/src/Thermoprint/Server/Database/Instances.hs
@@ -9,5 +9,3 @@ import Thermoprint.API (Printout, JobStatus, PrintingError)
 import Database.Persist.TH
 
 derivePersistFieldJSON "Printout"
-derivePersistField "PrintingError"
-derivePersistField "JobStatus"
-- 
cgit v1.2.3