88b35bf · typeable/swagger2

git.iko.soy/typeable/swagger2

Fix ToSchema & ToParamSchema instances for NominalDiffTime

commit88b35bff8419fc70e438ef9e8736e7425dc6fdb9 authorGregor Kleen <rmpvqzvcjxvlhbkb@141.li> dateTue 19 Sep 2017, 15:19 (9 years ago) parent6d0b53c

2 files changed+4−4

unifiedsplit

src/Data/Swagger/Internal/ParamSchema.hs+2−2

@@ -31,7 +31,7 @@ import "unordered-containers" Data.HashSet (HashSet)

3131import Data.Monoid

3232import Data.Set (Set)

3333import Data.Scientific

34−import Data.Fixed (HasResolution(..), Fixed)

34+import Data.Fixed (HasResolution(..), Fixed, Pico)

3535import qualified Data.Text as T

3636import qualified Data.Text.Lazy as TL

3737import Data.Time

@@ -203,7 +203,7 @@ instance ToParamSchema UTCTime where

203203 toParamSchema _ = timeParamSchema "yyyy-mm-ddThh:MM:ssZ"

204204

205205instance ToParamSchema NominalDiffTime where

206− toParamSchema _ = toParamSchema (Proxy :: Proxy Integer)

206+ toParamSchema _ = toParamSchema (Proxy :: Proxy Pico)

207207

208208instance ToParamSchema T.Text where

209209 toParamSchema _ = toParamSchema (Proxy :: Proxy String)

src/Data/Swagger/Internal/Schema.hs+2−2

@@ -47,7 +47,7 @@ import Data.IntMap (IntMap)

4747import Data.Map (Map)

4848import Data.Proxy

4949import Data.Scientific (Scientific)

50−import Data.Fixed (Fixed, HasResolution)

50+import Data.Fixed (Fixed, HasResolution, Pico)

5151import Data.Set (Set)

5252import qualified Data.Text as T

5353import qualified Data.Text.Lazy as TL

@@ -483,7 +483,7 @@ instance ToSchema ZonedTime where

483483 & example ?~ toJSON (ZonedTime (LocalTime (fromGregorian 2016 7 22) (TimeOfDay 7 40 0)) (hoursToTimeZone 3))

484484

485485instance ToSchema NominalDiffTime where

486− declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy Integer)

486+ declareNamedSchema _ = declareNamedSchema (Proxy :: Proxy Pico)

487487

488488-- |

489489-- >>> toSchema (Proxy :: Proxy UTCTime) ^. format