From 5978ff72f2a374e991bef098555325dd95a9f509 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 25 Jan 2016 17:51:49 +0000 Subject: Renamed deleteJob to abortJob it was determined that the semantics should really be to remove the job iff it's queued but not currently being printed (per printer) --- server/src/Thermoprint/Server/API.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/Thermoprint/Server/API.hs b/server/src/Thermoprint/Server/API.hs index 66a594b..5fbb18e 100644 --- a/server/src/Thermoprint/Server/API.hs +++ b/server/src/Thermoprint/Server/API.hs @@ -80,7 +80,7 @@ thermoprintServer :: ServerT ThermoprintAPI Handler -- ^ A 'servant-server' for 'ThermoprintAPI' thermoprintServer = listPrinters :<|> (listJobs :<|> queueJob) - :<|> getJob <||> jobStatus <||> deleteJob + :<|> getJob <||> jobStatus <||> abortJob :<|> (listDrafts :<|> addDraft) :<|> updateDraft <||> getDraft <||> deleteDraft <||> printDraft where @@ -138,8 +138,8 @@ getJob jobId = fmap jobContent . maybe (left err404) return =<< runSqlPool (get jobStatus :: API.JobId -> Handler JobStatus jobStatus jobId = maybe (left err404) return . lookup jobId . toList =<< listJobs Nothing Nothing Nothing -deleteJob :: API.JobId -> Handler () -deleteJob jobId = do +abortJob :: API.JobId -> Handler () +abortJob jobId = do printerIds <- asks (Map.keys . printers) forM_ printerIds $ \pId -> do (pId', p) <- lookupPrinter $ Just pId -- cgit v1.2.3