feat(workers): Assign the correct source for resolutions

Signed-off-by: Martin Nonnenmacher <martin.nonnenmacher@doubleopen.org>

Author: mnonnenmacher

workers/common/src/main/kotlin/resolutions/OrtServerResolutionProvider.kt

@@ -115,28 +115,34 @@ class OrtServerResolutionProvider(
         ruleViolations: List<RuleViolation>,
         vulnerabilities: List<Vulnerability>
     ): ResolvedItemsResult {
-        val issueResolutions = issues
-            .associateWith { getResolutionsFor(it) }
-            .filterValues { it.isNotEmpty() }
+        fun <T> resolutionSources(selector: (Resolutions) -> List<T>) = listOf(
+            selector(globalResolutions) to ResolutionSource.GLOBAL,
+            selector(repositoryConfigurationResolutions) to ResolutionSource.REPOSITORY,
+            selector(managedResolutions) to ResolutionSource.SERVER
+        )
+
+        val issueResolutions = issues.associateWith { issue ->
+            resolutionSources { it.issues }.flatMap { (resolutions, source) ->
+                resolutions.filter { it.matches(issue) }.map { it.mapToModel(source) }
+            }
+        }.filterValues { it.isNotEmpty() }.mapKeys { it.key.mapToModel() }
 
-        val ruleViolationResolutions = ruleViolations
-            .associateWith { getResolutionsFor(it) }
-            .filterValues { it.isNotEmpty() }
+        val ruleViolationResolutions = ruleViolations.associateWith { violation ->
+            resolutionSources { it.ruleViolations }.flatMap { (resolutions, source) ->
+                resolutions.filter { it.matches(violation) }.map { it.mapToModel(source) }
+            }
+        }.filterValues { it.isNotEmpty() }.mapKeys { it.key.mapToModel() }
 
-        val vulnerabilityResolutions = vulnerabilities
-            .associateWith { getResolutionsFor(it) }
-            .filterValues { it.isNotEmpty() }
+        val vulnerabilityResolutions = vulnerabilities.associateWith { vulnerability ->
+            resolutionSources { it.vulnerabilities }.flatMap { (resolutions, source) ->
+                resolutions.filter { it.matches(vulnerability) }.map { it.mapToModel(source) }
+            }
+        }.filterValues { it.isNotEmpty() }.mapKeys { it.key.mapToModel() }
 
         return ResolvedItemsResult(
-            issues = issueResolutions.map { (issue, resolutions) ->
-                issue.mapToModel() to resolutions.map { it.mapToModel(ResolutionSource.REPOSITORY) }
-            }.toMap(),
-            ruleViolations = ruleViolationResolutions.map { (violation, resolutions) ->
-                violation.mapToModel() to resolutions.map { it.mapToModel(ResolutionSource.REPOSITORY) }
-            }.toMap(),
-            vulnerabilities = vulnerabilityResolutions.map { (vulnerability, resolutions) ->
-                vulnerability.mapToModel() to resolutions.map { it.mapToModel(ResolutionSource.REPOSITORY) }
-            }.toMap()
+            issues = issueResolutions,
+            ruleViolations = ruleViolationResolutions,
+            vulnerabilities = vulnerabilityResolutions
         )
     }
 }

workers/common/src/test/kotlin/resolutions/OrtServerResolutionProviderTest.kt

@@ -466,15 +466,15 @@ class OrtServerResolutionProviderTest : WordSpec({
             val issue2 = Issue(source = "source", message = "match-2")
 
             val expectedResolutionsForIssue1 = listOf(
-                globalResolutions.issues[0].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.issues[0].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.issues[0].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.issues[0].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.issues[0].mapToModel(ResolutionSource.SERVER)
             )
 
             val expectedResolutionsForIssue2 = listOf(
-                globalResolutions.issues[1].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.issues[1].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.issues[1].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.issues[1].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.issues[1].mapToModel(ResolutionSource.SERVER)
             )
 
             val matchResult = provider.matchResolutions(listOf(issue1, issue2), emptyList(), emptyList())
@@ -558,15 +558,15 @@ class OrtServerResolutionProviderTest : WordSpec({
             )
 
             val expectedResolutionsForRuleViolation1 = listOf(
-                globalResolutions.ruleViolations[0].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.ruleViolations[0].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.ruleViolations[0].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.ruleViolations[0].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.ruleViolations[0].mapToModel(ResolutionSource.SERVER)
             )
 
             val expectedResolutionsForRuleViolation2 = listOf(
-                globalResolutions.ruleViolations[1].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.ruleViolations[1].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.ruleViolations[1].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.ruleViolations[1].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.ruleViolations[1].mapToModel(ResolutionSource.SERVER)
             )
 
             val matchResult =
@@ -634,15 +634,15 @@ class OrtServerResolutionProviderTest : WordSpec({
             val vulnerability2 = Vulnerability(id = "match-2", references = emptyList())
 
             val expectedResolutionsForVulnerability1 = listOf(
-                globalResolutions.vulnerabilities[0].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.vulnerabilities[0].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.vulnerabilities[0].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.vulnerabilities[0].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.vulnerabilities[0].mapToModel(ResolutionSource.SERVER)
             )
 
             val expectedResolutionsForVulnerability2 = listOf(
-                globalResolutions.vulnerabilities[1].mapToModel(ResolutionSource.REPOSITORY),
+                globalResolutions.vulnerabilities[1].mapToModel(ResolutionSource.GLOBAL),
                 repositoryConfigurationResolutions.vulnerabilities[1].mapToModel(ResolutionSource.REPOSITORY),
-                managedResolutions.vulnerabilities[1].mapToModel(ResolutionSource.REPOSITORY)
+                managedResolutions.vulnerabilities[1].mapToModel(ResolutionSource.SERVER)
             )
 
             val matchResult =