@@ -36,7 +36,6 @@ import Data.Conduit qualified as Conduit
36
36
import Data.Conduit.Combinators qualified as CC
37
37
import Data.Conduit.List qualified as CCL
38
38
import Data.Hashable (Hashable )
39
- import Data.Maybe (mapMaybe )
40
39
import Data.String.Conversion (ToText (toText ), toString )
41
40
import Data.Text (Text )
42
41
import Data.Text qualified as Text
@@ -127,31 +126,13 @@ analyzeWithFicusMain rootDir apiOpts revision filters snippetScanRetentionDays =
127
126
, ficusConfigSnippetScanRetentionDays = snippetScanRetentionDays
128
127
}
129
128
130
- extractAnalysisId :: FicusFinding -> Maybe Int
131
- extractAnalysisId (FicusFinding (FicusMessageData strategy payload))
129
+ findingToAnalysisId :: FicusFinding -> Maybe Int
130
+ findingToAnalysisId (FicusFinding (FicusMessageData strategy payload))
132
131
| Text. toLower strategy == " fingerprint" =
133
132
case decode (BL. fromStrict $ Text.Encoding. encodeUtf8 payload) :: Maybe Object of
134
133
Just obj -> parseMaybe (.: " analysis_id" ) obj
135
134
Nothing -> Nothing
136
- extractAnalysisId _ = Nothing
137
-
138
- ficusMessagesToFicusSnippetScanResults :: FicusMessages -> Maybe FicusSnippetScanResults
139
- ficusMessagesToFicusSnippetScanResults messages =
140
- let isFingerprintStrategy :: FicusFinding -> Bool
141
- isFingerprintStrategy (FicusFinding (FicusMessageData strategy _)) =
142
- Text. toLower strategy == " fingerprint"
143
-
144
- extractAnalysisId :: FicusFinding -> Maybe Int
145
- extractAnalysisId (FicusFinding (FicusMessageData _ payload)) =
146
- case decode (BL. fromStrict $ Text.Encoding. encodeUtf8 payload) :: Maybe Object of
147
- Just obj -> parseMaybe (.: " analysis_id" ) obj
148
- Nothing -> Nothing
149
-
150
- matchingFinding = filter isFingerprintStrategy (ficusMessageFindings messages)
151
- analysisId = mapMaybe extractAnalysisId matchingFinding
152
- in case analysisId of
153
- (aid : _) -> Just $ FicusSnippetScanResults {ficusSnippetScanResultsAnalysisId = aid}
154
- [] -> Nothing
135
+ findingToAnalysisId _ = Nothing
155
136
156
137
runFicus ::
157
138
( Has Diagnostics sig m
@@ -234,7 +215,7 @@ runFicus ficusConfig = do
234
215
pure acc
235
216
FicusMessageFinding finding -> do
236
217
putStrLn $ " [" ++ timestamp ++ " ] FINDING " <> toString (displayFicusFinding finding)
237
- pure $ acc <|> (FicusSnippetScanResults <$> extractAnalysisId finding)
218
+ pure $ acc <|> (FicusSnippetScanResults <$> findingToAnalysisId finding)
238
219
)
239
220
Nothing
240
221
0 commit comments