[TSD-89] Run the debugger, bump version. (#41)

Author: ksaric

cabal2nix.nix

@@ -6,7 +6,7 @@
 }:
 mkDerivation {
   pname = "log-classifier";
-  version = "1.2.0.0";
+  version = "1.3.0.0";
   src = ./.;
   isLibrary = true;
   isExecutable = true;

log-classifier.cabal

@@ -1,5 +1,5 @@
 name:                log-classifier
-version:             1.2.0.0
+version:             1.3.0.0
 synopsis:            Log classifier for a Cardano node
 description:         Please see the README
 homepage:            https://github.com/input-output-hk/log-classifier#readme

schema.sql

@@ -18,15 +18,15 @@ import           Data.Aeson.Text (encodeToLazyText)
 import           Data.List (nub)
 import           Network.HTTP.Simple (Request, getResponseBody, httpLBS, parseRequest_)
 
-import           HttpLayer
+import           HttpLayer (HTTPNetworkLayer (..), apiRequest, apiRequestAbsolute)
 
 import           DataSource.Types (Attachment (..), AttachmentContent (..), Comment (..),
-                                   CommentBody (..), CommentId (..), Config (..),
+                                   CommentBody (..), CommentId (..), Config (..), DataLayer (..),
                                    DeletedTicket (..), ExportFromTime (..), FromPageResultList (..),
                                    PageResultList (..), Ticket (..), TicketId (..), TicketInfo (..),
                                    TicketTag (..), TicketTags (..), User, UserId (..),
-                                   ZendeskAPIUrl (..), DataLayer (..), ZendeskResponse (..),
-                                   asksHTTPNetworkLayer, parseComments, renderTicketStatus, showURL)
+                                   ZendeskAPIUrl (..), ZendeskResponse (..), asksHTTPNetworkLayer,
+                                   parseComments, parseTicket, renderTicketStatus, showURL)
 
 -- ./mitmproxy --mode reverse:https://iohk.zendesk.com -p 4001
 
@@ -74,7 +74,7 @@ emptyDataLayer = DataLayer
 
 -- | Get single ticket info.
 getTicketInfo
-    :: (MonadIO m, MonadReader Config m)
+    :: (HasCallStack, MonadIO m, MonadReader Config m)
     => TicketId
     -> m (Maybe TicketInfo)
 getTicketInfo ticketId = do
@@ -85,7 +85,7 @@ getTicketInfo ticketId = do
 
     apiCall <- asksHTTPNetworkLayer hnlApiCall
 
-    Just <$> apiCall parseJSON req
+    Just <$> apiCall parseTicket req
 
 -- | Return list of deleted tickets.
 listDeletedTickets
@@ -211,7 +211,7 @@ postTicketComment ticketInfo zendeskResponse = do
 -- | Create response ticket
 createResponseTicket :: Integer -> TicketInfo -> ZendeskResponse -> Ticket
 createResponseTicket agentId TicketInfo{..} ZendeskResponse{..} =
-    let analyzedTag = renderTicketStatus AnalyzedByScriptV1_2
+    let analyzedTag = renderTicketStatus AnalyzedByScriptV1_3
     -- Nub so it won't post duplicate tags
         mergedTags = TicketTags . nub $ [analyzedTag] <> getTicketTags tiTags <> getTicketTags zrTags
     in (Ticket

src/DataSource/Http.hs

@@ -445,6 +445,7 @@ data TicketTag
     | 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
     | ToBeAnalyzed          -- ^ Ticket needs to be analyzed
     | NoKnownIssue          -- ^ Ticket had no known issue
     | NoLogAttached         -- ^ Log file not attached
@@ -847,6 +848,7 @@ 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 ToBeAnalyzed         = "to_be_analysed" -- https://iohk.zendesk.com/agent/admin/tags
 renderTicketStatus NoKnownIssue         = "no-known-issues"
 renderTicketStatus NoLogAttached        = "no-log-files"

src/DataSource/Types.hs

@@ -254,7 +254,7 @@ processTicketSafe tId = catch (void $ processTicket tId)
         appendF "./logs/errors.log" (show e <> "\n"))
 
 -- | Process ticket with given 'TicketId'
-processTicket :: TicketId -> App ZendeskResponse
+processTicket :: HasCallStack => TicketId -> App ZendeskResponse
 processTicket tId = do
 
     -- We first fetch the function from the configuration
@@ -334,7 +334,7 @@ processTicketsFromTime exportFromTime = do
 
 
 -- | When we want to process all possible tickets.
-processTickets :: App ()
+processTickets :: HasCallStack => App ()
 processTickets = do
 
     allTickets          <- fetchTickets
@@ -390,7 +390,7 @@ fetchAndShowTicketsFrom exportFromTime = do
     putTextLn "All the tickets has been processed."
 
 -- TODO(ks): Extract repeating code, generalize.
-listAndSortTickets :: App [TicketInfo]
+listAndSortTickets :: HasCallStack => App [TicketInfo]
 listAndSortTickets = do
 
     Config{..}  <- ask
@@ -416,7 +416,7 @@ listAndSortTickets = do
 
     pure sortedTicketIds
 
-listAndSortUnassignedTickets :: App [TicketInfo]
+listAndSortUnassignedTickets :: HasCallStack => App [TicketInfo]
 listAndSortUnassignedTickets = do
 
     -- We first fetch the function from the configuration
@@ -616,6 +616,7 @@ filterAnalyzedTickets ticketsInfo =
                         [ AnalyzedByScriptV1_0
                         , AnalyzedByScriptV1_1
                         , AnalyzedByScriptV1_2
+                        , AnalyzedByScriptV1_3
                         ]
 
     isTicketAnalyzed :: TicketInfo -> Bool