jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactors app function to DRY header lookups

Browse Source
This commit is contained in:
Diogo Biazus
2015-08-14 11:04:26 -04:00
parent 894455f2cd
commit ca40ba1fda
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PostgREST/App.hs
+4 -3
View File
@@ -129,9 +129,9 @@ app conf reqBody req =
([table], "POST") -> do ([table], "POST") -> do
let qt = qualify table let qt = qualify table
echoRequested = lookup "Prefer" hdrs == Just "return=representation" echoRequested = lookupHeader "Prefer" == Just "return=representation"
parsed :: Either String (V.Vector Text, V.Vector (V.Vector Value)) parsed :: Either String (V.Vector Text, V.Vector (V.Vector Value))
parsed = if lookup "Content-Type" hdrs == Just "text/csv" parsed = if lookupHeader "Content-Type" == Just "text/csv"
then do then do
rows <- CSV.decode CSV.NoHeader reqBody rows <- CSV.decode CSV.NoHeader reqBody
if V.null rows then Left "CSV requires header" if V.null rows then Left "CSV requires header"
@@ -200,7 +200,7 @@ app conf reqBody req =
let (queryTotal, body) = let (queryTotal, body) =
fromMaybe (0 :: Int, Just "" :: Maybe Text) row fromMaybe (0 :: Int, Just "" :: Maybe Text) row
r = contentRangeH 0 (queryTotal-1) queryTotal r = contentRangeH 0 (queryTotal-1) queryTotal
echoRequested = lookup "Prefer" hdrs == Just "return=representation" echoRequested = lookupHeader "Prefer" == Just "return=representation"
s = case () of _ | queryTotal == 0 -> status404 s = case () of _ | queryTotal == 0 -> status404
| echoRequested -> status200 | echoRequested -> status200
| otherwise -> status204 | otherwise -> status204
@@ -232,6 +232,7 @@ app conf reqBody req =
jwtSecret = cs $ configJwtSecret conf jwtSecret = cs $ configJwtSecret conf
range = rangeRequested hdrs range = rangeRequested hdrs
allOrigins = ("Access-Control-Allow-Origin", "*") :: Header allOrigins = ("Access-Control-Allow-Origin", "*") :: Header
lookupHeader = flip lookup hdrs
sqlError :: t sqlError :: t
sqlError = undefined sqlError = undefined