refactor(evaluated-model): Factor out some mapping to a function

Prepare for applying further logic common to both code paths, without
adding code redundancy.

Signed-off-by: Frank Viernau <frank_viernau@epam.com>

plugins/reporters/evaluated-model/src/main/kotlin/EvaluatedModelMapper.kt

@@ -277,9 +277,7 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
 
         issues += addAnalyzerIssues(project.id, evaluatedPackage)
 
-        input.ortResult.getScanResultsForId(project.id).mapTo(scanResults) { result ->
-            convertScanResult(result, findings, evaluatedPackage)
-        }
+        scanResults += convertScanResultsForPackage(evaluatedPackage, findings)
 
         findings.filter { it.type == EvaluatedFindingType.LICENSE }.mapNotNullTo(detectedLicenses) { it.license }
 
@@ -342,9 +340,7 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
 
         issues += addAnalyzerIssues(pkg.id, evaluatedPackage)
 
-        input.ortResult.getScanResultsForId(pkg.id).mapTo(scanResults) { result ->
-            convertScanResult(result, findings, evaluatedPackage)
-        }
+        scanResults += convertScanResultsForPackage(evaluatedPackage, findings)
 
         findings.filter { it.type == EvaluatedFindingType.LICENSE }.mapNotNullTo(detectedLicenses) { it.license }
 
@@ -410,6 +406,14 @@ internal class EvaluatedModelMapper(private val input: ReporterInput) {
         )
     }
 
+    private fun convertScanResultsForPackage(
+        pkg: EvaluatedPackage,
+        findings: MutableList<EvaluatedFinding>
+    ): List<EvaluatedScanResult> =
+        input.ortResult.getScanResultsForId(pkg.id).map { scanResult ->
+            convertScanResult(scanResult, findings, pkg)
+        }
+
     private fun convertScanResult(
         result: ScanResult,
         findings: MutableList<EvaluatedFinding>,