feat(reporter): Take in account the scope includes

Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>

Author: nnobelis

plugins/reporters/opossum/src/main/kotlin/OpossumReporter.kt

@@ -36,6 +36,7 @@ import org.ossreviewtoolkit.model.Package
 import org.ossreviewtoolkit.model.Project
 import org.ossreviewtoolkit.model.ScanResult
 import org.ossreviewtoolkit.model.VcsInfo
+import org.ossreviewtoolkit.model.utils.isScopeIncluded
 import org.ossreviewtoolkit.model.utils.toPurl
 import org.ossreviewtoolkit.plugins.api.OrtPlugin
 import org.ossreviewtoolkit.plugins.api.OrtPluginOption
@@ -309,8 +310,8 @@ class OpossumReporter(
 
             addSignal(signalFromProject, setOf(definitionFilePath))
 
-            val scopeNames = ortResult.dependencyNavigator.scopeNames(project).filterNot {
-                ortResult.getExcludes().isScopeExcluded(it)
+            val scopeNames = ortResult.dependencyNavigator.scopeNames(project).filter {
+                isScopeIncluded(it, ortResult.getExcludes(), ortResult.getIncludes())
             }
 
             scopeNames.forEach { scopeName ->

reporter/src/main/kotlin/StatisticsCalculator.kt

@@ -22,6 +22,7 @@ package org.ossreviewtoolkit.reporter
 import java.time.Duration
 import java.time.Instant
 
+import kotlin.collections.filterNot
 import kotlin.time.toKotlinDuration
 
 import org.ossreviewtoolkit.model.Identifier
@@ -33,6 +34,7 @@ import org.ossreviewtoolkit.model.config.RuleViolationResolution
 import org.ossreviewtoolkit.model.licenses.LicenseInfoResolver
 import org.ossreviewtoolkit.model.licenses.LicenseView
 import org.ossreviewtoolkit.model.licenses.ResolvedLicenseInfo
+import org.ossreviewtoolkit.model.utils.isScopeIncluded
 
 /**
  * This class calculates [Statistics] for a given [OrtResult] and the applicable [IssueResolution]s and
@@ -94,15 +96,27 @@ object StatisticsCalculator {
             .flatMap { project ->
                 val scopes = ortResult.dependencyNavigator.scopeNames(project)
                 MutableList(scopes.size) { project }.zip(scopes)
-            }.filterNot { (_, scope) -> ignoreExcluded && ortResult.repository.config.excludes.isScopeExcluded(scope) }
+            }.filterNot { (_, scope) ->
+                ignoreExcluded && !isScopeIncluded(
+                    scope,
+                    ortResult.repository.config.excludes,
+                    ortResult.repository.config.includes
+                )
+            }
             .maxOfOrNull { (project, scope) -> ortResult.dependencyNavigator.dependencyTreeDepth(project, scope) } ?: 0
 
     private fun getIncludedScopes(ortResult: OrtResult): Set<String> =
         ortResult
             .getProjects()
             .filterNot { project -> ortResult.isExcluded(project.id) }
             .flatMap { project -> ortResult.dependencyNavigator.scopeNames(project) }
-            .filterNot { scope -> ortResult.repository.config.excludes.isScopeExcluded(scope) }
+            .filter { scope ->
+                isScopeIncluded(
+                    scope,
+                    ortResult.repository.config.excludes,
+                    ortResult.repository.config.includes
+                )
+            }
             .toSet()
 
     private fun getExcludedScopes(ortResult: OrtResult): Set<String> =