Merge branch 'fix_statistic_calculation_logic' into 'master'

Fix vulnerability statistics calculation

See merge request gitlab-org/gitlab!38320

ee/app/services/vulnerabilities/base_service.rb

@@ -15,9 +15,9 @@ module Vulnerabilities
     def update_with_note(vulnerability, params)
       return false unless vulnerability.update(params)
 
-      SystemNoteService.change_vulnerability_state(vulnerability, @user) if vulnerability.state_previously_changed?
       Vulnerabilities::Statistics::UpdateService.update_for(vulnerability)
       Vulnerabilities::HistoricalStatistics::UpdateService.update_for(vulnerability.project)
+      SystemNoteService.change_vulnerability_state(vulnerability, @user) if vulnerability.state_previously_changed?
       true
     end
 

ee/spec/services/vulnerabilities/confirm_service_spec.rb

@@ -21,8 +21,7 @@ RSpec.describe Vulnerabilities::ConfirmService do
       project.add_developer(user)
     end
 
-    it_behaves_like 'calls Vulnerabilities::Statistics::UpdateService'
-    it_behaves_like 'calls Vulnerabilities::HistoricalStatistics::UpdateService'
+    it_behaves_like 'calls vulnerability statistics utility services in order'
 
     it 'confirms a vulnerability' do
       Timecop.freeze do

ee/spec/services/vulnerabilities/dismiss_service_spec.rb

@@ -21,8 +21,7 @@ RSpec.describe Vulnerabilities::DismissService do
       project.add_developer(user)
     end
 
-    it_behaves_like 'calls Vulnerabilities::Statistics::UpdateService'
-    it_behaves_like 'calls Vulnerabilities::HistoricalStatistics::UpdateService'
+    it_behaves_like 'calls vulnerability statistics utility services in order'
 
     it 'dismisses a vulnerability and its associated findings' do
       Timecop.freeze do

ee/spec/services/vulnerabilities/resolve_service_spec.rb

@@ -21,8 +21,7 @@ RSpec.describe Vulnerabilities::ResolveService do
       project.add_developer(user)
     end
 
-    it_behaves_like 'calls Vulnerabilities::Statistics::UpdateService'
-    it_behaves_like 'calls Vulnerabilities::HistoricalStatistics::UpdateService'
+    it_behaves_like 'calls vulnerability statistics utility services in order'
 
     it 'resolves a vulnerability' do
       Timecop.freeze do

ee/spec/support/shared_examples/services/vulnerabilities/calls_vulnerability_statistics_utility_services_in_order.rb

+# frozen_string_literal: true
+
+RSpec.shared_examples 'calls vulnerability statistics utility services in order' do
+  before do
+    allow(Vulnerabilities::Statistics::UpdateService).to receive(:update_for)
+    allow(Vulnerabilities::HistoricalStatistics::UpdateService).to receive(:update_for)
+    allow(SystemNoteService).to receive(:change_vulnerability_state)
+  end
+
+  it 'calls the service classes in order' do
+    subject
+
+    expect(Vulnerabilities::Statistics::UpdateService).to have_received(:update_for).ordered
+    expect(Vulnerabilities::HistoricalStatistics::UpdateService).to have_received(:update_for).ordered
+    expect(SystemNoteService).to have_received(:change_vulnerability_state).ordered
+  end
+end