Merge branch 'fix_security_report_summary_service' into 'master'

Fix security report summary service

See merge request gitlab-org/gitlab!63807

ee/app/services/security/report_summary_service.rb

@@ -15,31 +15,35 @@ module Security
 
     def execute
       @selection_information.each_with_object({}) do |(report_type, summary_types), response|
-        response[report_type] = summary_counts_for_report_type(report_type, summary_types)
+        response[report_type] = summary_counts_for_report_type(report_type.to_s, summary_types)
       end
     end
 
     private
 
     def summary_counts_for_report_type(report_type, summary_types)
-      return if @pipeline.security_findings.by_report_types(report_type).empty?
+      return unless has_report?(report_type)
 
       summary_types.each_with_object({}) do |summary_type, response|
         case summary_type
         when :vulnerabilities_count
-          response[:vulnerabilities_count] = vulnerability_counts[report_type.to_s]
+          response[:vulnerabilities_count] = vulnerability_counts[report_type]
         when :scanned_resources_count
-          response[:scanned_resources_count] = scanned_resources_counts[report_type.to_s]
+          response[:scanned_resources_count] = scanned_resources_counts[report_type]
         when :scanned_resources
-          response[:scanned_resources] = scanned_resources[report_type.to_s]
+          response[:scanned_resources] = scanned_resources[report_type]
         when :scanned_resources_csv_path
           response[:scanned_resources_csv_path] = csv_path
         when :scans
-          response[:scans] = grouped_scans[report_type.to_s]
+          response[:scans] = grouped_scans[report_type]
         end
       end
     end
 
+    def has_report?(report_type)
+      grouped_scans[report_type].present?
+    end
+
     def csv_path
       ::Gitlab::Routing.url_helpers.project_security_scanned_resources_path(
         @pipeline.project,

ee/spec/services/security/report_summary_service_spec.rb

@@ -173,30 +173,13 @@ RSpec.describe Security::ReportSummaryService, '#execute' do
     end
   end
 
-  context 'When only the DAST scan ran' do
+  context 'When there is a scan but no findings' do
     let_it_be(:pipeline) { create(:ci_pipeline, :success) }
-    let_it_be(:build_dast) { create(:ci_build, :success, name: 'dast', pipeline: pipeline) }
-    let_it_be(:artifact_dast) { create(:ee_ci_job_artifact, :dast_large_scanned_resources_field, job: build_dast) }
-    let_it_be(:report_dast) { create(:ci_reports_security_report, type: :dast) }
-    let_it_be(:scan_dast) { create(:security_scan, scan_type: :dast, build: build_dast) }
 
     before do
-      stub_licensed_features(sast: true, dependency_scanning: true, container_scanning: true, dast: true)
-
-      dast_content = File.read(artifact_dast.file.path)
-      Gitlab::Ci::Parsers::Security::Dast.parse!(dast_content, report_dast)
-      report_dast.merge!(report_dast)
+      build_dast = create(:ci_build, :success, name: 'dast', pipeline: pipeline)
 
-      { artifact_dast => report_dast }.each do |artifact, report|
-        report.findings.each do |finding|
-          create(:security_finding,
-                severity: finding.severity,
-                confidence: finding.confidence,
-                project_fingerprint: finding.project_fingerprint,
-                deduplicated: true,
-                scan: artifact.job.security_scans.first)
-        end
-      end
+      create(:security_scan, scan_type: :dast, build: build_dast)
     end
 
     let(:selection_information) do
@@ -206,7 +189,7 @@ RSpec.describe Security::ReportSummaryService, '#execute' do
       }
     end
 
-    it 'returns nil for the other scans' do
+    it 'still returns data for the report ran' do
       expect(result[:dast]).not_to be_nil
       expect(result[:sast]).to be_nil
       expect(result[:container_scanning]).to be_nil