Skip to content

[TSD-119] Update version, run debugger #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ksaric merged 1 commit into from
Aug 14, 2018
Merged

[TSD-119] Update version, run debugger #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cabal2nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}:
mkDerivation {
pname = "log-classifier";
version = "1.4.0.0";
version = "1.4.1.0";
src = ./.;
isLibrary = true;
isExecutable = true;
Expand Down
2 changes: 1 addition & 1 deletion log-classifier.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: log-classifier
version: 1.4.0.0
version: 1.4.1.0
synopsis: Log classifier for a Cardano node
description: Please see the README
homepage: https://github.com/input-output-hk/log-classifier#readme
Expand Down
2 changes: 1 addition & 1 deletion src/DataSource/Http.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ postTicketComment ticketInfo zendeskResponse = do
-- | Create response ticket
createResponseTicket :: Integer -> TicketInfo -> ZendeskResponse -> Ticket
createResponseTicket agentId TicketInfo{..} ZendeskResponse{..} =
let analyzedTag = renderTicketStatus AnalyzedByScriptV1_4
let analyzedTag = renderTicketStatus AnalyzedByScriptV1_4_1
-- Nub so it won't post duplicate tags
allTags = nub $ [analyzedTag] <> getTicketTags tiTags <> getTicketTags zrTags
-- We remove the @ToBeAnalyzed@ tag.
Expand Down
36 changes: 19 additions & 17 deletions src/DataSource/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,15 +441,16 @@ data TicketInfo = TicketInfo
-- TODO(ks): @Generic@ type migrations. Also possible to provide the version from runtime,
-- we need to weigh these options later on.
data TicketTag
= AnalyzedByScript -- ^ Ticket has been analyzed
| AnalyzedByScriptV1_0 -- ^ Ticket has been analyzed by the version 1.0
| AnalyzedByScriptV1_1 -- ^ Ticket has been analyzed by the version 1.1
| AnalyzedByScriptV1_2 -- ^ Ticket has been analyzed by the version 1.2
| AnalyzedByScriptV1_3 -- ^ Ticket has been analyzed by the version 1.3
| AnalyzedByScriptV1_4 -- ^ Ticket has been analyzed by the version 1.4
| ToBeAnalyzed -- ^ Ticket needs to be analyzed
| NoKnownIssue -- ^ Ticket had no known issue
| NoLogAttached -- ^ Log file not attached
= AnalyzedByScript -- ^ Ticket has been analyzed
| AnalyzedByScriptV1_0 -- ^ Ticket has been analyzed by the version 1.0
| AnalyzedByScriptV1_1 -- ^ Ticket has been analyzed by the version 1.1
| AnalyzedByScriptV1_2 -- ^ Ticket has been analyzed by the version 1.2
| AnalyzedByScriptV1_3 -- ^ Ticket has been analyzed by the version 1.3
| AnalyzedByScriptV1_4 -- ^ Ticket has been analyzed by the version 1.4
| AnalyzedByScriptV1_4_1 -- ^ Ticket has been analyzed by the version 1.4.1
| ToBeAnalyzed -- ^ Ticket needs to be analyzed
| NoKnownIssue -- ^ Ticket had no known issue
| NoLogAttached -- ^ Log file not attached

newtype UserId = UserId
{ getUserId :: Int
Expand Down Expand Up @@ -947,11 +948,12 @@ parseComments = withObject "comments" $ \o -> o .: "comments"
-- | Defining it's own show instance to use it as tags
renderTicketStatus :: TicketTag -> Text
renderTicketStatus AnalyzedByScript = "analyzed-by-script"
renderTicketStatus AnalyzedByScriptV1_0 = "analyzed-by-script-v1.0"
renderTicketStatus AnalyzedByScriptV1_1 = "analyzed-by-script-v1.1"
renderTicketStatus AnalyzedByScriptV1_2 = "analyzed-by-script-v1.2"
renderTicketStatus AnalyzedByScriptV1_3 = "analyzed-by-script-v1.3"
renderTicketStatus AnalyzedByScriptV1_4 = "analyzed-by-script-v1.4"
renderTicketStatus ToBeAnalyzed = "to_be_analysed" -- https://iohk.zendesk.com/agent/admin/tags
renderTicketStatus NoKnownIssue = "no-known-issues"
renderTicketStatus NoLogAttached = "no-log-files"
renderTicketStatus AnalyzedByScriptV1_0 = "analyzed-by-script-v1.0"
renderTicketStatus AnalyzedByScriptV1_1 = "analyzed-by-script-v1.1"
renderTicketStatus AnalyzedByScriptV1_2 = "analyzed-by-script-v1.2"
renderTicketStatus AnalyzedByScriptV1_3 = "analyzed-by-script-v1.3"
renderTicketStatus AnalyzedByScriptV1_4 = "analyzed-by-script-v1.4"
renderTicketStatus AnalyzedByScriptV1_4_1 = "analyzed-by-script-v1.4.1"
renderTicketStatus ToBeAnalyzed = "to_be_analysed" -- https://iohk.zendesk.com/agent/admin/tags
renderTicketStatus NoKnownIssue = "no-known-issues"
renderTicketStatus NoLogAttached = "no-log-files"
1 change: 1 addition & 0 deletions src/Lib.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ filterAnalyzedTickets ticketsInfo =
, AnalyzedByScriptV1_2
, AnalyzedByScriptV1_3
, AnalyzedByScriptV1_4
, AnalyzedByScriptV1_4_1
]

isTicketAnalyzed :: TicketInfo -> Bool
Expand Down
2 changes: 1 addition & 1 deletion test/Spec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ createResponseTicketSpec =
responseTags = getTicketTags $ tTag responseTicket
-- in summary, the response tags have the debuggers `analyzed-by-script-version` tag AND
-- they remove the `to_be_analysed` tag AND they are unique.
in (filter (/= renderTicketStatus ToBeAnalyzed) . nub $ renderTicketStatus AnalyzedByScriptV1_4 : mergedTags) === responseTags
in (filter (/= renderTicketStatus ToBeAnalyzed) . nub $ renderTicketStatus AnalyzedByScriptV1_4_1 : mergedTags) === responseTags


exportZendeskDataToLocalDBSpec :: Spec
Expand Down