Refine the deps

Author: nikita-volkov

src/PostgREST/Error/PgError.hs

@@ -7,16 +7,12 @@ module PostgREST.Error.PgError
     Authenticated,
   ) where
 
-import qualified Data.Aeson                          as JSON
-import qualified Hasql.Pool                          as SQL
-import qualified Hasql.Session                       as SQL
-import qualified Network.HTTP.Types                  as HTTP
-import qualified PostgREST.Error.PgError.ResultError as ResultError
+import qualified Data.Aeson                         as JSON
+import qualified Hasql.Pool                         as SQL
+import qualified Network.HTTP.Types                 as HTTP
+import qualified PostgREST.Error.PgError.UsageError as UsageError
 
 import PostgREST.Error.Algebra
-import PostgREST.Error.PgError.CommandError ()
-import PostgREST.Error.PgError.ResultError ()
-import PostgREST.Error.PgError.UsageError ()
 import Protolude
 
 data PgError = PgError Authenticated SQL.UsageError
@@ -25,9 +21,9 @@ data PgError = PgError Authenticated SQL.UsageError
 type Authenticated = Bool
 
 instance PgrstError PgError where
-  status (PgError authed usageError) = pgErrorStatus authed usageError
+  status (PgError authed usageError) = UsageError.pgErrorStatus authed usageError
 
-  headers (PgError _ (SQL.SessionUsageError (SQL.QueryError _ _ (SQL.ResultError (ResultError.maybeHeaders -> Just matchingHeaders))))) =
+  headers (PgError _ (UsageError.maybeHeaders -> Just matchingHeaders)) =
     matchingHeaders
 
   headers err =
@@ -44,10 +40,3 @@ instance ErrorBody PgError where
   message (PgError _ usageError) = message usageError
   details (PgError _ usageError) = details usageError
   hint    (PgError _ usageError) = hint usageError
-
-pgErrorStatus :: Bool -> SQL.UsageError -> HTTP.Status
-pgErrorStatus _      (SQL.ConnectionUsageError _) = HTTP.status503
-pgErrorStatus _      SQL.AcquisitionTimeoutUsageError = HTTP.status504
-pgErrorStatus _      (SQL.SessionUsageError (SQL.QueryError _ _ (SQL.ClientError _)))      = HTTP.status503
-pgErrorStatus authed (SQL.SessionUsageError (SQL.QueryError _ _ (SQL.ResultError rError))) =
-  ResultError.pgErrorStatus authed rError

src/PostgREST/Error/PgError/CommandError.hs

@@ -5,8 +5,9 @@ module PostgREST.Error.PgError.CommandError where
 import qualified Data.Aeson as JSON
 import qualified Data.Text.Encoding as T
 import qualified Hasql.Session as SQL
+import qualified Network.HTTP.Types as HTTP
 import PostgREST.Error.Algebra
-import PostgREST.Error.PgError.ResultError ()
+import qualified PostgREST.Error.PgError.ResultError as ResultError
 import Protolude
 
 instance JSON.ToJSON SQL.CommandError where
@@ -30,3 +31,12 @@ instance ErrorBody SQL.CommandError where
 
   hint (SQL.ResultError resultError) = hint resultError
   hint _ = Nothing
+
+pgErrorStatus :: Bool -> SQL.CommandError -> HTTP.Status
+pgErrorStatus _      (SQL.ClientError _)      = HTTP.status503
+pgErrorStatus authed (SQL.ResultError rError) =
+  ResultError.pgErrorStatus authed rError
+
+maybeHeaders :: SQL.CommandError -> Maybe [HTTP.Header]
+maybeHeaders (SQL.ResultError rError) = ResultError.maybeHeaders rError
+maybeHeaders _ = Nothing

src/PostgREST/Error/PgError/UsageError.hs

@@ -2,13 +2,14 @@
 
 module PostgREST.Error.PgError.UsageError where
 
-import qualified Data.Aeson                  as JSON
-import qualified Data.Text.Encoding          as T
-import qualified Hasql.Pool                  as SQL
-import qualified Hasql.Session               as SQL
+import qualified Data.Aeson                           as JSON
+import qualified Data.Text.Encoding                   as T
+import qualified Hasql.Pool                           as SQL
+import qualified Hasql.Session                        as SQL
+import qualified Network.HTTP.Types                   as HTTP
+import qualified PostgREST.Error.PgError.CommandError as CommandError
 
 import PostgREST.Error.Algebra
-import PostgREST.Error.PgError.CommandError ()
 import Protolude
 
 
@@ -32,3 +33,14 @@ instance ErrorBody SQL.UsageError where
   hint    (SQL.ConnectionUsageError _)                   = Nothing
   hint    (SQL.SessionUsageError (SQL.QueryError _ _ e)) = hint e
   hint    SQL.AcquisitionTimeoutUsageError               = Nothing
+
+pgErrorStatus :: Bool -> SQL.UsageError -> HTTP.Status
+pgErrorStatus _      (SQL.ConnectionUsageError _) = HTTP.status503
+pgErrorStatus _      SQL.AcquisitionTimeoutUsageError = HTTP.status504
+pgErrorStatus authed (SQL.SessionUsageError (SQL.QueryError _ _ commandError)) =
+  CommandError.pgErrorStatus authed commandError
+
+maybeHeaders :: SQL.UsageError -> Maybe [HTTP.Header]
+maybeHeaders (SQL.SessionUsageError (SQL.QueryError _ _ commandError)) =
+  CommandError.maybeHeaders commandError
+maybeHeaders _ = Nothing