Merge branch 'issue_47729' into 'master'

Fix refresh cache for open issues count service

Closes #47945

See merge request gitlab-org/gitlab-ce!19904

2 files changed, 89 insertions, 0 deletions

diff --git a/spec/services/projects/batch_open_issues_count_service_spec.rb b/spec/services/projects/batch_open_issues_count_service_spec.rb
new file mode 100644
index 00000000000..599aaf62080
--- /dev/null
+++ b/spec/services/projects/batch_open_issues_count_service_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Projects::BatchOpenIssuesCountService do
+  let!(:project_1) { create(:project) }
+  let!(:project_2) { create(:project) }
+
+  let(:subject) { described_class.new([project_1, project_2]) }
+
+  context '#refresh_cache', :use_clean_rails_memory_store_caching do
+    before do
+      create(:issue, project: project_1)
+      create(:issue, project: project_1, confidential: true)
+
+      create(:issue, project: project_2)
+      create(:issue, project: project_2, confidential: true)
+    end
+
+    context 'when cache is clean' do
+      it 'refreshes cache keys correctly' do
+        subject.refresh_cache
+
+        # It does not update total issues cache
+        expect(Rails.cache.read(get_cache_key(subject, project_1))).to eq(nil)
+        expect(Rails.cache.read(get_cache_key(subject, project_2))).to eq(nil)
+
+        expect(Rails.cache.read(get_cache_key(subject, project_1, true))).to eq(1)
+        expect(Rails.cache.read(get_cache_key(subject, project_1, true))).to eq(1)
+      end
+    end
+
+    context 'when issues count is already cached' do
+      before do
+        create(:issue, project: project_2)
+        subject.refresh_cache
+      end
+
+      it 'does update cache again' do
+        expect(Rails.cache).not_to receive(:write)
+
+        subject.refresh_cache
+      end
+    end
+  end
+
+  def get_cache_key(subject, project, public_key = false)
+    service = subject.count_service.new(project)
+
+    if public_key
+      service.cache_key(service.class::PUBLIC_COUNT_KEY)
+    else
+      service.cache_key(service.class::TOTAL_COUNT_KEY)
+    end
+  end
+end
diff --git a/spec/services/projects/open_issues_count_service_spec.rb b/spec/services/projects/open_issues_count_service_spec.rb
index 06b470849b3..562c14a8df8 100644
--- a/spec/services/projects/open_issues_count_service_spec.rb
+++ b/spec/services/projects/open_issues_count_service_spec.rb
@@ -50,5 +50,40 @@ describe Projects::OpenIssuesCountService do
         end
       end
     end
+
+    context '#refresh_cache', :use_clean_rails_memory_store_caching do
+      let(:subject) { described_class.new(project) }
+
+      before do
+        create(:issue, :opened, project: project)
+        create(:issue, :opened, project: project)
+        create(:issue, :opened, confidential: true, project: project)
+      end
+
+      context 'when cache is empty' do
+        it 'refreshes cache keys correctly' do
+          subject.refresh_cache
+
+          expect(Rails.cache.read(subject.cache_key(described_class::PUBLIC_COUNT_KEY))).to eq(2)
+          expect(Rails.cache.read(subject.cache_key(described_class::TOTAL_COUNT_KEY))).to eq(3)
+        end
+      end
+
+      context 'when cache is outdated' do
+        before do
+          subject.refresh_cache
+        end
+
+        it 'refreshes cache keys correctly' do
+          create(:issue, :opened, project: project)
+          create(:issue, :opened, confidential: true, project: project)
+
+          subject.refresh_cache
+
+          expect(Rails.cache.read(subject.cache_key(described_class::PUBLIC_COUNT_KEY))).to eq(3)
+          expect(Rails.cache.read(subject.cache_key(described_class::TOTAL_COUNT_KEY))).to eq(5)
+        end
+      end
+    end
   end
 end