Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ data UpdateTicketResp = UpdateTicketResp
}
deriving (Show, Eq, Generic, ToJSON, FromJSON, ToSchema)

data TicketContext
= IssueTicket
| SOSAlert
| FeedbackTicket
deriving (Show, Eq, Generic, ToJSON, FromJSON, ToSchema)

data CreateTicketReq = CreateTicketReq
{ category :: Text,
subCategory :: Maybe Text,
Expand All @@ -62,7 +68,8 @@ data CreateTicketReq = CreateTicketReq
personId :: Text,
classification :: Classification,
rideDescription :: Maybe RideInfo,
becknIssueId :: Maybe Text
becknIssueId :: Maybe Text,
ticketContext :: Maybe TicketContext
}
deriving (Show, Eq, Generic, ToJSON, FromJSON, ToSchema)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ module Kernel.External.Ticket.Interface.Zendesk
)
where

import Control.Applicative ((<|>))
import qualified Data.Text as T
import Kernel.External.Encryption
import qualified Kernel.External.Ticket.Interface.Types as IT
Expand Down Expand Up @@ -48,6 +49,11 @@ createTicket config req = do
status = zendeskStatusToTicketStatus (fromMaybe "new" resp.ticket.status)
}

resolveGroupId :: ZendeskCfg -> Maybe IT.TicketContext -> Maybe Int
resolveGroupId cfg (Just IT.SOSAlert) = cfg.sosGroupId <|> cfg.groupId
resolveGroupId cfg (Just IT.FeedbackTicket) = cfg.feedbackGroupId <|> cfg.groupId
resolveGroupId cfg _ = cfg.groupId

mkZendeskCreateTicketReq :: ZendeskCfg -> IT.CreateTicketReq -> Zendesk.ZendeskCreateTicketReq
mkZendeskCreateTicketReq cfg IT.CreateTicketReq {..} =
Zendesk.ZendeskCreateTicketReq
Expand All @@ -61,7 +67,7 @@ mkZendeskCreateTicketReq cfg IT.CreateTicketReq {..} =
},
requester = Just $ Zendesk.ZendeskRequester {name = fromMaybe "Unknown" name, email = cfg.requesterEmail},
organizationId = cfg.organizationId,
groupId = cfg.groupId,
groupId = resolveGroupId cfg ticketContext,
priority = "normal",
ticketType = "incident",
customFields = buildCustomFields cfg rideDescription phoneNo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ data ZendeskCfg = ZendeskCfg
requesterEmail :: Maybe Text,
organizationId :: Maybe Int,
groupId :: Maybe Int,
sosGroupId :: Maybe Int,
feedbackGroupId :: Maybe Int,
rideIdFieldId :: Maybe Int,
driverPhoneFieldId :: Maybe Int,
customerPhoneFieldId :: Maybe Int,
Expand Down
Loading