Merge branch 'return_feedbacks_instead_of_batch_loader_instance' into 'master'

Return an instance of Feedback from Occurrence#_feedback methods

See merge request gitlab-org/gitlab!32459

ee/app/models/vulnerabilities/feedback.rb

@@ -75,5 +75,13 @@ module Vulnerabilities
     def has_comment?
       comment.present? && comment_author.present?
     end
+
+    def occurrence_key
+      {
+        project_id: project_id,
+        category: category,
+        project_fingerprint: project_fingerprint
+      }
+    end
   end
 end

ee/app/models/vulnerabilities/occurrence.rb

@@ -186,30 +186,26 @@ module Vulnerabilities
     end
 
     def feedback(feedback_type:)
-      params = {
-        project_id: project_id,
-        category: report_type,
-        project_fingerprint: project_fingerprint,
-        feedback_type: feedback_type
-      }
+      load_feedback.find { |f| f.feedback_type == feedback_type }
+    end
 
-      BatchLoader.for(params).batch do |items, loader|
-        project_ids = items.map { |i| i[:project_id] }
-        categories = items.map { |i| i[:category] }
-        fingerprints = items.map { |i| i[:project_fingerprint] }
+    def load_feedback
+      BatchLoader.for(occurrence_key).batch do |occurrence_keys, loader|
+        project_ids = occurrence_keys.map { |key| key[:project_id] }
+        categories = occurrence_keys.map { |key| key[:category] }
+        fingerprints = occurrence_keys.map { |key| key[:project_fingerprint] }
 
-        Vulnerabilities::Feedback.all_preloaded.where(
+        feedback = Vulnerabilities::Feedback.all_preloaded.where(
           project_id: project_ids.uniq,
           category: categories.uniq,
           project_fingerprint: fingerprints.uniq
-        ).each do |feedback|
-          loaded_params = {
-            project_id: feedback.project_id,
-            category: feedback.category,
-            project_fingerprint: feedback.project_fingerprint,
-            feedback_type: feedback.feedback_type
-          }
-          loader.call(loaded_params, feedback)
+        ).to_a
+
+        occurrence_keys.each do |occurrence_key|
+          loader.call(
+            occurrence_key,
+            feedback.select { |f| occurrence_key = f.occurrence_key }
+          )
         end
       end
     end
@@ -296,5 +292,15 @@ module Vulnerabilities
     def first_fingerprint
       identifiers.first&.fingerprint
     end
+
+    private
+
+    def occurrence_key
+      {
+        project_id: project_id,
+        category: report_type,
+        project_fingerprint: project_fingerprint
+      }
+    end
   end
 end

ee/app/models/vulnerability.rb

@@ -97,7 +97,7 @@ class Vulnerability < ApplicationRecord
   end
 
   def dismissed_by_id
-    super || finding&.dismissal_feedback.try(:author_id)
+    super || finding&.dismissal_feedback&.author_id
   end
 
   delegate :scanner_name, :metadata, :message, :cve,

ee/lib/gitlab/vulnerabilities/findings_preloader.rb

@@ -14,11 +14,7 @@ module Gitlab
       end
 
       def self.preload_feedback!(findings)
-        findings.each do |finding|
-          finding.dismissal_feedback
-          finding.issue_feedback
-          finding.merge_request_feedback
-        end
+        findings.each(&:load_feedback)
       end
     end
   end

ee/spec/models/vulnerabilities/feedback_spec.rb

@@ -220,4 +220,16 @@ describe Vulnerabilities::Feedback do
       end
     end
   end
+
+  describe '#occurrence_key' do
+    let(:project_id) { 1 }
+    let(:category) { 'sast' }
+    let(:project_fingerprint) { Digest::SHA1.hexdigest('foo') }
+    let(:expected_occurrence_key) { { project_id: project_id, category: category, project_fingerprint: project_fingerprint } }
+    let(:feedback) { build(:vulnerability_feedback, expected_occurrence_key) }
+
+    subject { feedback.occurrence_key }
+
+    it { is_expected.to eq(expected_occurrence_key) }
+  end
 end

ee/spec/models/vulnerabilities/occurrence_spec.rb

@@ -495,6 +495,32 @@ describe Vulnerabilities::Occurrence do
     end
   end
 
+  describe '#load_feedback' do
+    let_it_be(:project) { create(:project) }
+    let_it_be(:occurrence) do
+      create(
+        :vulnerabilities_occurrence,
+        report_type: :dependency_scanning,
+        project: project
+      )
+    end
+    let_it_be(:feedback) do
+      create(
+        :vulnerability_feedback,
+        :dependency_scanning,
+        :dismissal,
+        project: project,
+        project_fingerprint: occurrence.project_fingerprint
+      )
+    end
+
+    let(:expected_feedback) { [feedback] }
+
+    subject(:load_feedback) { occurrence.load_feedback.to_a }
+
+    it { is_expected.to eq(expected_feedback) }
+  end
+
   describe '#state' do
     before do
       create(:vulnerability, :dismissed, project: finding_with_issue.project, findings: [finding_with_issue])