Merge branch '296098-created-issue-feedback' into 'master'

Bring back the ability to return issue feedback when there is no issue link associated to vulnerability

See merge request gitlab-org/gitlab!65191

ee/app/models/vulnerabilities/finding.rb

@@ -198,7 +198,8 @@ module Vulnerabilities
     end
 
     def issue_feedback
-      Vulnerabilities::Feedback.find_by(issue: vulnerability&.related_issues) if vulnerability
+      related_issues = vulnerability&.related_issues
+      related_issues.blank? ? feedback(feedback_type: 'issue') : Vulnerabilities::Feedback.find_by(issue: related_issues)
     end
 
     def merge_request_feedback

ee/spec/models/vulnerabilities/finding_spec.rb

@@ -521,7 +521,7 @@ RSpec.describe Vulnerabilities::Finding do
     describe 'feedback' do
       let_it_be(:project) { create(:project) }
 
-      let(:finding) do
+      let_it_be(:finding) do
         create(
           :vulnerabilities_finding,
           report_type: :dependency_scanning,
@@ -530,8 +530,8 @@ RSpec.describe Vulnerabilities::Finding do
       end
 
       describe '#issue_feedback' do
-        let(:issue) { create(:issue, project: project) }
-        let!(:issue_feedback) do
+        let_it_be(:issue) { create(:issue, project: project) }
+        let_it_be(:issue_feedback) do
           create(
             :vulnerability_feedback,
             :dependency_scanning,
@@ -543,15 +543,12 @@ RSpec.describe Vulnerabilities::Finding do
         end
 
         let(:vulnerability) { create(:vulnerability, findings: [finding]) }
+
+        context 'when there is issue link present' do
           let!(:issue_link) { create(:vulnerabilities_issue_link, vulnerability: vulnerability, issue: issue)}
 
           it 'returns associated feedback' do
-          feedback = finding.issue_feedback
-
-          expect(feedback).to be_present
-          expect(feedback[:project_id]).to eq project.id
-          expect(feedback[:feedback_type]).to eq 'issue'
-          expect(feedback[:issue_id]).to eq issue.id
+            expect(finding.issue_feedback).to eq(issue_feedback)
           end
 
           context 'when there is no feedback for the vulnerability' do
@@ -559,9 +556,7 @@ RSpec.describe Vulnerabilities::Finding do
             let!(:finding_no_feedback) { create(:vulnerabilities_finding, :dependency_scanning, project: project) }
 
             it 'does not return unassociated feedback' do
-            feedback = finding_no_feedback.issue_feedback
-
-            expect(feedback).not_to be_present
+              expect(finding_no_feedback.issue_feedback).to be_nil
             end
           end
 
@@ -569,9 +564,14 @@ RSpec.describe Vulnerabilities::Finding do
             let!(:finding_no_vulnerability) { create(:vulnerabilities_finding, :dependency_scanning, project: project) }
 
             it 'does not return feedback' do
-            feedback = finding_no_vulnerability.issue_feedback
+              expect(finding_no_vulnerability.issue_feedback).to be_nil
+            end
+          end
+        end
 
-            expect(feedback).not_to be_present
+        context 'when there is no issue link present' do
+          it 'returns associated feedback' do
+            expect(finding.issue_feedback).to eq(issue_feedback)
           end
         end
       end