ea2e9c1 · typeable/pagerduty

git.iko.soy/typeable/pagerduty

on develop help sign in

Ensuring newtype wrappers (Date etc) are not exposed via the lenses

ea2e9c1Brendan Hay12 years ago

src/Network/PagerDuty/REST/LogEntries.hs+6−6

compare with develop

unifiedsplit

@@ -491,6 +491,12 @@ newtype GetLog = GetLog

491

492deriveQuery ''GetLog

493

494+-- | Time zone in which dates in the result will be rendered.

495+--

496+-- Defaults to UTC.

497+glTimeZone :: Lens' (Request GetLog s b) TimeZone

498+glTimeZone = upd.glTimeZone'._TZ

499+

494-- | Get details for a specific incident log entry. This method provides additional

500-- | Get details for a specific incident log entry. This method provides additional

495-- information you can use to get at raw event data.

501-- information you can use to get at raw event data.

496--

502--

@@ -503,9 +509,3 @@ getLog l =

503 { _glTimeZone' = def

509 { _glTimeZone' = def

504 } & path .~ logs % l

510 } & path .~ logs % l

505 & query .~ includes

511 & query .~ includes

506−

507−-- | Time zone in which dates in the result will be rendered.

508−--

509−-- Defaults to UTC.

510−glTimeZone :: Lens' (Request GetLog s b) TimeZone

511−glTimeZone = upd.glTimeZone'._TZ

src/Network/PagerDuty/REST/Reports.hs+34−14

@@ -59,6 +59,7 @@ module Network.PagerDuty.REST.Reports

59import Control.Lens

60import Data.Aeson.Lens

61import Data.ByteString.Builder (Builder)

62+import Data.Time

62import Network.PagerDuty.TH

63import Network.PagerDuty.TH

63import Network.PagerDuty.Types

64import Network.PagerDuty.Types

@@ -85,13 +86,13 @@ deriveQuery ''Report

86-- | Start of the date range over which you want to search. The time element

87-- | Start of the date range over which you want to search. The time element

87-- is optional.

88-- is optional.

88−rSince :: Lens' (Request Report s b) Date

89+rSince :: Lens' (Request Report s b) UTCTime

89−rSince = upd.rSince'

90+rSince = upd.rSince'._Date

91-- | The end of the date range over which you want to search. This should be

92-- | The end of the date range over which you want to search. This should be

92-- in the same format as since.

93-- in the same format as since.

93−rUntil :: Lens' (Request Report s b) Date

94+rUntil :: Lens' (Request Report s b) UTCTime

94−rUntil = upd.rUntil'

95+rUntil = upd.rUntil'._Date

96-- | Specifies the bucket duration for each summation.

97-- | Specifies the bucket duration for each summation.

97--

98--

@@ -112,7 +113,18 @@ data AlertReport = AlertReport

112 , _arNumberOfEmailAlerts :: !Int

113 , _arNumberOfEmailAlerts :: !Int

113 } deriving (Eq, Show)

114 } deriving (Eq, Show)

114

115

115−deriveRecord ''AlertReport

116+deriveJSON ''AlertReport

117+

118+arStart :: Lens' AlertReport UTCTime

119+arStart = lens _arStart (\r x -> r { _arStart = x }) ._Date

120+

121+arEnd :: Lens' AlertReport UTCTime

122+arEnd = lens _arEnd (\r x -> r { _arEnd = x }) ._Date

123+

124+makeLens "_arNumberOfAlerts" ''AlertReport

125+makeLens "_arNumberOfPhoneAlerts" ''AlertReport

126+makeLens "_arNumberOfSmsAlerts" ''AlertReport

127+makeLens "_arNumberOfEmailAlerts" ''AlertReport

116

128

117data AlertTotals = AlertTotals

129data AlertTotals = AlertTotals

118 { _atAlerts :: [AlertReport]

130 { _atAlerts :: [AlertReport]

@@ -131,13 +143,13 @@ deriveRecord ''AlertTotals

131-- @GET \/reports\/alerts_per_time@

143-- @GET \/reports\/alerts_per_time@

132--

144--

133-- See: <http://developer.pagerduty.com/documentation/rest/reports/alerts_per_time>

145-- See: <http://developer.pagerduty.com/documentation/rest/reports/alerts_per_time>

134−alertsPerTime :: Date -- ^ 'rSince'

146+alertsPerTime :: UTCTime -- ^ 'rSince'

135− -> Date -- ^ 'rUntil'

147+ -> UTCTime -- ^ 'rUntil'

136 -> Request Report s AlertTotals

148 -> Request Report s AlertTotals

137alertsPerTime s u =

149alertsPerTime s u =

138 mk Report

150 mk Report

139− { _rSince' = s

151+ { _rSince' = Date s

140− , _rUntil' = u

152+ , _rUntil' = Date u

141 , _rRollup' = Monthly

153 , _rRollup' = Monthly

142 } & path .~ reports % "alerts_per_time"

154 } & path .~ reports % "alerts_per_time"

143

155

@@ -147,7 +159,15 @@ data IncidentReport = IncidentReport

147 , _irNumberOfIncidents :: !Int

159 , _irNumberOfIncidents :: !Int

148 } deriving (Eq, Show)

160 } deriving (Eq, Show)

149

161

162+deriveJSON ''IncidentReport

163+

164+irStart :: Lens' IncidentReport UTCTime

165+irStart = lens _irStart (\r x -> r { _irStart = x }) . _Date

166+

167+irEnd :: Lens' IncidentReport UTCTime

168+irEnd = lens _irEnd (\r x -> r { _irEnd = x }) . _Date

169+

150−deriveRecord ''IncidentReport

170+makeLens "_irNumberOfIncidents" ''IncidentReport

151

171

152-- | Get high level statistics about the number of incidents created for the

172-- | Get high level statistics about the number of incidents created for the

153-- desired time period, summed daily, weekly or monthly.

173-- desired time period, summed daily, weekly or monthly.

@@ -155,13 +175,13 @@ deriveRecord ''IncidentReport

155-- @GET \/reports\/incidents_per_time@

175-- @GET \/reports\/incidents_per_time@

156--

176--

157-- See: <http://developer.pagerduty.com/documentation/rest/reports/incidents_per_time>

177-- See: <http://developer.pagerduty.com/documentation/rest/reports/incidents_per_time>

158−incidentsPerTime :: Date -- ^ 'rSince'

178+incidentsPerTime :: UTCTime -- ^ 'rSince'

159− -> Date -- ^ 'rUntil'

179+ -> UTCTime -- ^ 'rUntil'

160 -> Request Report s [IncidentReport]

180 -> Request Report s [IncidentReport]

161incidentsPerTime s u =

181incidentsPerTime s u =

162 mk Report

182 mk Report

163− { _rSince' = s

183+ { _rSince' = Date s

164− , _rUntil' = u

184+ , _rUntil' = Date u

165 , _rRollup' = Monthly

185 , _rRollup' = Monthly

166 } & path .~ reports % "incidents_per_time"

186 } & path .~ reports % "incidents_per_time"

167 & unwrap .~ key "incidents"

187 & unwrap .~ key "incidents"