More fleshed out API

3 files changed, 81 insertions, 8 deletions

diff --git a/spec/src/Thermoprint/API.hs b/spec/src/Thermoprint/API.hs
index f2ffd02..d722903 100644
--- a/spec/src/Thermoprint/API.hs
+++ b/spec/src/Thermoprint/API.hs
@@ -1,21 +1,74 @@
-{-# LANGUAGE GeneralizedNewtypeDeriving, NoDeriveAnyClass #-}
+{-# LANGUAGE DeriveGeneric, DeriveAnyClass #-}
 {-# LANGUAGE TypeOperators, DataKinds #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Thermoprint.API
-       ( PrinterId(..)
-       , JobId(..)
+       ( PrinterStatus(..)
+       , JobStatus(..)
        , ThermoprintAPI
+       , thermoprintAPI
+       , module Thermoprint.Identifiers
+       , module Thermoprint.Printout
        ) where
 
 import Thermoprint.Printout
+import Thermoprint.Identifiers
 
 import Servant.API
+import Servant.Docs
 import Data.Aeson
 
-newtype PrinterId = PrinterId Integer
-                  deriving (Show, Eq, FromText, ToText, FromJSON, ToJSON)
+import Data.Set (Set)
+import Data.Sequence (Seq)
 
-newtype JobId = JobId Integer
-              deriving (Show, Eq, FromText, ToText, FromJSON, ToJSON)
+import GHC.Generics (Generic)
 
-type ThermoprintAPI = "print" :> Capture "printerId" PrinterId :> ReqBody '[JSON] Printout :> Post '[JSON] JobId
+import Data.Proxy (Proxy(..))
+
+import Data.Functor.Identity (Identity(..))
+import Control.Exception (Exception)
+import Data.Typeable (Typeable)
+
+data PrinterStatus = Busy JobId
+                   | Available
+                   deriving (Generic, Show, FromJSON, ToJSON)
+
+data JobInfo = JobInfo
+               { jobPrinter :: PrinterId
+               , jobStatus :: JobStatus
+               }
+
+data JobStatus = Queued
+               | Printing
+               | Done
+               | Failed PrintingError
+               deriving (Generic, Show, FromJSON, ToJSON)
+
+data PrintingError = UnknownError
+                   deriving (Typeable, Generic, Show, FromJSON, ToJSON, Exception)
+
+type ThermoprintAPI = "printers" :> Get '[JSON] (Set PrinterId)
+                      :<|> "printer" :> Capture "printerId" PrinterId :> (
+                        ReqBody '[JSON] Printout :> Post '[JSON] JobId
+                        :<|> "status" :> Get '[JSON] PrinterStatus
+                      )
+                      :<|> "jobs" :> (
+                        QueryParam "printer" PrinterId :> QueryParam "min" JobId :> QueryParam "max" JobId :> Get '[JSON] (Seq JobId)
+                      )
+                      :<|> "job" :> Capture "jobId" JobId :> (
+                        Get '[JSON] Printout
+                        :<|> "status" :> Get '[JSON] JobInfo
+                        :<|> Delete '[] ()
+                      )
+                      :<|> "drafts" :> (
+                        Get '[JSON] (Set DraftId)
+                        :<|> ReqBody '[JSON] Printout :> Post '[JSON] DraftId
+                      )
+                      :<|> "draft" :> Capture "draftId" DraftId :> (
+                        ReqBody '[JSON] Printout :> Put '[] ()
+                        :<|> Get '[JSON] Printout
+                        :<|> Delete '[] ()
+                      )
+
+thermoprintAPI :: Proxy ThermoprintAPI
+thermoprintAPI = Proxy
diff --git a/spec/src/Thermoprint/Identifiers.hs b/spec/src/Thermoprint/Identifiers.hs
new file mode 100644
index 0000000..bd0b7a6
--- /dev/null
+++ b/spec/src/Thermoprint/Identifiers.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE GeneralizedNewtypeDeriving, NoDeriveAnyClass #-}
+
+module Thermoprint.Identifiers
+       ( PrinterId(..)
+       , JobId(..)
+       , DraftId(..)
+       ) where
+
+import Servant.API (ToText, FromText)
+import Data.Aeson (FromJSON, ToJSON)
+
+newtype PrinterId = PrinterId Integer
+                  deriving (Show, Eq, Ord, Enum, FromText, ToText, FromJSON, ToJSON)
+
+newtype JobId = JobId Integer
+              deriving (Show, Eq, Ord, Enum, FromText, ToText, FromJSON, ToJSON)
+
+newtype DraftId = DraftId Integer
+              deriving (Show, Eq, Ord, Enum, FromText, ToText, FromJSON, ToJSON)
diff --git a/spec/thermoprint-spec.cabal b/spec/thermoprint-spec.cabal
index f7227ca..b9f7fd6 100644
--- a/spec/thermoprint-spec.cabal
+++ b/spec/thermoprint-spec.cabal
@@ -19,6 +19,7 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:     Thermoprint.Printout
+                     , Thermoprint.Identifiers
                      , Thermoprint.API
   -- other-modules:       
   -- other-extensions: