Recording job creation time in printer queues

3 files changed, 33 insertions, 17 deletions

diff --git a/spec/src/Thermoprint/API.hs b/spec/src/Thermoprint/API.hs
index e3d4b61..4f9d074 100644
--- a/spec/src/Thermoprint/API.hs
+++ b/spec/src/Thermoprint/API.hs
@@ -14,29 +14,33 @@ module Thermoprint.API
        , module Thermoprint.Printout
        ) where
 
-import Thermoprint.Printout
-import Thermoprint.Identifiers
+import           Thermoprint.Printout
+import           Thermoprint.Identifiers
 
-import Servant.API
-import Data.Aeson
+import           Servant.API
+import           Data.Aeson
 
-import Data.Set (Set)
-import Data.Map (Map)
+import           Data.Set (Set)
+import           Data.Map (Map)
 import qualified Data.Map as Map (foldMapWithKey, singleton)
-import Data.Sequence (Seq)
+import           Data.Sequence (Seq)
 
-import Data.IntMap.Strict (IntMap)
+import           Data.IntMap.Strict (IntMap)
 import qualified Data.IntMap.Strict as IntMap (foldMapWithKey, singleton)
 
-import Data.Text (Text)
+import           Data.Text (Text)
+import qualified Data.Text as T
 
-import Data.Typeable (Typeable)
-import GHC.Generics (Generic)
-import Control.DeepSeq (NFData)
+import           Data.Typeable (Typeable)
+import           GHC.Generics (Generic)
+import           Control.DeepSeq (NFData)
 
-import Data.Proxy (Proxy(..))
+import           Data.Proxy (Proxy(..))
 
-import Control.Exception (Exception)
+import           Control.Exception (Exception)
+
+import           Data.Time (UTCTime)
+import           Data.Time.Format
 
 instance (Integral k, Ord k, ToJSON v) => ToJSON (Map k v) where
   toJSON = toJSON . Map.foldMapWithKey (IntMap.singleton . castId)
@@ -60,9 +64,20 @@ data PrintingError = UnknownError
 
 type DraftTitle = Text
 
+instance FromText UTCTime where
+  fromText = parseTimeM True defaultTimeLocale "%s%Q" . T.unpack
+
+instance ToText UTCTime where
+  toText = T.pack . formatTime defaultTimeLocale "%s%Q"
+
 type ThermoprintAPI = "printers" :> Get '[JSON] (Map PrinterId PrinterStatus)
                       :<|> "jobs" :> (
-                        QueryParam "printer" PrinterId :> QueryParam "min" JobId :> QueryParam "max" JobId :> Get '[JSON] (Seq (JobId, JobStatus))
+                        QueryParam "printer" PrinterId
+                          :> QueryParam "min" JobId
+                          :> QueryParam "max" JobId
+                          :> QueryParam "minTime" UTCTime
+                          :> QueryParam "maxTime" UTCTime
+                          :> Get '[JSON] (Seq (JobId, UTCTime, JobStatus))
                         :<|> QueryParam "printer" PrinterId :> ReqBody '[JSON] Printout :> Post '[JSON] JobId
                       )
                       :<|> "job" :> Capture "jobId" JobId :> (
diff --git a/spec/thermoprint-spec.cabal b/spec/thermoprint-spec.cabal
index da79ee8..7446da3 100644
--- a/spec/thermoprint-spec.cabal
+++ b/spec/thermoprint-spec.cabal
@@ -44,6 +44,7 @@ library
                      , aeson >=0.9.0 && <1
                      , base64-bytestring >=1.0.0 && <2
                      , encoding >=0.8 && <1
+                     , time >=1.5.0 && <2
   -- hs-source-dirs:      
   default-language:    Haskell2010
 
diff --git a/spec/thermoprint-spec.nix b/spec/thermoprint-spec.nix
index 1825ddd..b67273a 100644
--- a/spec/thermoprint-spec.nix
+++ b/spec/thermoprint-spec.nix
@@ -1,6 +1,6 @@
 { mkDerivation, aeson, base, base64-bytestring, bytestring, Cabal
 , cabal-test-quickcheck, containers, deepseq, encoding, hspec
-, QuickCheck, quickcheck-instances, servant, stdenv, text
+, QuickCheck, quickcheck-instances, servant, stdenv, text, time
 }:
 mkDerivation {
   pname = "thermoprint-spec";
@@ -9,7 +9,7 @@ mkDerivation {
   libraryHaskellDepends = [
     aeson base base64-bytestring bytestring Cabal cabal-test-quickcheck
     containers deepseq encoding QuickCheck quickcheck-instances servant
-    text
+    text time
   ];
   testHaskellDepends = [
     aeson base hspec QuickCheck quickcheck-instances