Add wiki size to project statistics

8 files changed, 103 insertions, 20 deletions

diff --git a/spec/features/admin/admin_sees_project_statistics_spec.rb b/spec/features/admin/admin_sees_project_statistics_spec.rb
index 95d1fc5b57a..b5323a1c76d 100644
--- a/spec/features/admin/admin_sees_project_statistics_spec.rb
+++ b/spec/features/admin/admin_sees_project_statistics_spec.rb
@@ -15,7 +15,7 @@ describe "Admin > Admin sees project statistics" do
     let(:project) { create(:project, :repository) }
 
     it "shows project statistics" do
-      expect(page).to have_content("Storage: 0 Bytes (0 Bytes repositories, 0 Bytes build artifacts, 0 Bytes LFS)")
+      expect(page).to have_content("Storage: 0 Bytes (0 Bytes repositories, 0 Bytes wikis, 0 Bytes build artifacts, 0 Bytes LFS)")
     end
   end
 
diff --git a/spec/helpers/storage_helper_spec.rb b/spec/helpers/storage_helper_spec.rb
index 50c74a7c2f9..62c00964524 100644
--- a/spec/helpers/storage_helper_spec.rb
+++ b/spec/helpers/storage_helper_spec.rb
@@ -26,11 +26,12 @@ describe StorageHelper do
              namespace: namespace,
              statistics: build(:project_statistics,
                                repository_size:      10.kilobytes,
+                               wiki_size:            10.bytes,
                                lfs_objects_size:     20.gigabytes,
                                build_artifacts_size: 30.megabytes))
     end
 
-    let(:message) { '10 KB repositories, 30 MB build artifacts, 20 GB LFS' }
+    let(:message) { '10 KB repositories, 10 Bytes wikis, 30 MB build artifacts, 20 GB LFS' }
 
     it 'works on ProjectStatistics' do
       expect(helper.storage_counters_details(project.statistics)).to eq(message)
diff --git a/spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb b/spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb
new file mode 100644
index 00000000000..d494ce68c5b
--- /dev/null
+++ b/spec/lib/gitlab/background_migration/schedule_calculate_wiki_sizes_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20190527194900_schedule_calculate_wiki_sizes.rb')
+
+describe ScheduleCalculateWikiSizes, :migration, :sidekiq do
+  let(:migration_class) { Gitlab::BackgroundMigration::CalculateWikiSizes }
+  let(:migration_name)  { migration_class.to_s.demodulize }
+
+  let(:namespaces) { table(:namespaces) }
+  let(:projects) { table(:projects) }
+  let(:project_statistics) { table(:project_statistics) }
+
+  context 'when missing wiki sizes exist' do
+    before do
+      namespaces.create!(id: 1, name: 'wiki-migration', path: 'wiki-migration')
+      projects.create!(id: 1, name: 'wiki-project-1', path: 'wiki-project-1', namespace_id: 1)
+      projects.create!(id: 2, name: 'wiki-project-2', path: 'wiki-project-2', namespace_id: 1)
+      projects.create!(id: 3, name: 'wiki-project-3', path: 'wiki-project-3', namespace_id: 1)
+      project_statistics.create!(id: 1, project_id: 1, namespace_id: 1, wiki_size: 1000)
+      project_statistics.create!(id: 2, project_id: 2, namespace_id: 1, wiki_size: nil)
+      project_statistics.create!(id: 3, project_id: 3, namespace_id: 1, wiki_size: nil)
+    end
+
+    it 'schedules a background migration' do
+      Sidekiq::Testing.fake! do
+        Timecop.freeze do
+          migrate!
+
+          expect(migration_name).to be_scheduled_delayed_migration(5.minutes, 2, 3)
+          expect(BackgroundMigrationWorker.jobs.size).to eq 1
+        end
+      end
+    end
+
+    it 'calculates missing wiki sizes' do
+      expect(project_statistics.find_by(id: 2).wiki_size).to be_nil
+      expect(project_statistics.find_by(id: 3).wiki_size).to be_nil
+
+      migrate!
+
+      expect(project_statistics.find_by(id: 2).wiki_size).not_to be_nil
+      expect(project_statistics.find_by(id: 3).wiki_size).not_to be_nil
+    end
+  end
+
+  context 'when missing wiki sizes do not exist' do
+    before do
+      namespaces.create!(id: 1, name: 'wiki-migration', path: 'wiki-migration')
+      projects.create!(id: 1, name: 'wiki-project-1', path: 'wiki-project-1', namespace_id: 1)
+      project_statistics.create!(id: 1, project_id: 1, namespace_id: 1, wiki_size: 1000)
+    end
+
+    it 'does not schedule a background migration' do
+      Sidekiq::Testing.fake! do
+        Timecop.freeze do
+          migrate!
+
+          expect(BackgroundMigrationWorker.jobs.size).to eq 0
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index bfde367c47f..d80183af33e 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -147,6 +147,7 @@ describe Namespace do
              namespace: namespace,
              statistics: build(:project_statistics,
                                repository_size:      101,
+                               wiki_size:            505,
                                lfs_objects_size:     202,
                                build_artifacts_size: 303,
                                packages_size:        404))
@@ -157,6 +158,7 @@ describe Namespace do
              namespace: namespace,
              statistics: build(:project_statistics,
                                repository_size:      10,
+                               wiki_size:            50,
                                lfs_objects_size:     20,
                                build_artifacts_size: 30,
                                packages_size:        40))
@@ -167,8 +169,9 @@ describe Namespace do
       project2
       statistics = described_class.with_statistics.find(namespace.id)
 
-      expect(statistics.storage_size).to eq 1110
+      expect(statistics.storage_size).to eq 1665
       expect(statistics.repository_size).to eq 111
+      expect(statistics.wiki_size).to eq 555
       expect(statistics.lfs_objects_size).to eq 222
       expect(statistics.build_artifacts_size).to eq 333
       expect(statistics.packages_size).to eq 444
@@ -179,6 +182,7 @@ describe Namespace do
 
       expect(statistics.storage_size).to eq 0
       expect(statistics.repository_size).to eq 0
+      expect(statistics.wiki_size).to eq 0
       expect(statistics.lfs_objects_size).to eq 0
       expect(statistics.build_artifacts_size).to eq 0
       expect(statistics.packages_size).to eq 0
diff --git a/spec/models/project_statistics_spec.rb b/spec/models/project_statistics_spec.rb
index 738398a06f9..af429544d84 100644
--- a/spec/models/project_statistics_spec.rb
+++ b/spec/models/project_statistics_spec.rb
@@ -16,16 +16,18 @@ describe ProjectStatistics do
       statistics.update!(
         commit_count: 8.exabytes - 1,
         repository_size: 2.exabytes,
+        wiki_size: 1.exabytes,
         lfs_objects_size: 2.exabytes,
-        build_artifacts_size: 4.exabytes - 1
+        build_artifacts_size: 3.exabytes - 1
       )
 
       statistics.reload
 
       expect(statistics.commit_count).to eq(8.exabytes - 1)
       expect(statistics.repository_size).to eq(2.exabytes)
+      expect(statistics.wiki_size).to eq(1.exabytes)
       expect(statistics.lfs_objects_size).to eq(2.exabytes)
-      expect(statistics.build_artifacts_size).to eq(4.exabytes - 1)
+      expect(statistics.build_artifacts_size).to eq(3.exabytes - 1)
       expect(statistics.storage_size).to eq(8.exabytes - 1)
     end
   end
@@ -33,6 +35,7 @@ describe ProjectStatistics do
   describe '#total_repository_size' do
     it "sums repository and LFS object size" do
       statistics.repository_size = 2
+      statistics.wiki_size = 6
       statistics.lfs_objects_size = 3
       statistics.build_artifacts_size = 4
 
@@ -40,10 +43,17 @@ describe ProjectStatistics do
     end
   end
 
+  describe '#wiki_size' do
+    it "is initialized with not null value" do
+      expect(statistics.wiki_size).to eq 0
+    end
+  end
+
   describe '#refresh!' do
     before do
       allow(statistics).to receive(:update_commit_count)
       allow(statistics).to receive(:update_repository_size)
+      allow(statistics).to receive(:update_wiki_size)
       allow(statistics).to receive(:update_lfs_objects_size)
       allow(statistics).to receive(:update_storage_size)
     end
@@ -56,6 +66,7 @@ describe ProjectStatistics do
       it "sums all counters" do
         expect(statistics).to have_received(:update_commit_count)
         expect(statistics).to have_received(:update_repository_size)
+        expect(statistics).to have_received(:update_wiki_size)
         expect(statistics).to have_received(:update_lfs_objects_size)
       end
     end
@@ -69,6 +80,7 @@ describe ProjectStatistics do
         expect(statistics).to have_received(:update_lfs_objects_size)
         expect(statistics).not_to have_received(:update_commit_count)
         expect(statistics).not_to have_received(:update_repository_size)
+        expect(statistics).not_to have_received(:update_wiki_size)
       end
     end
   end
@@ -95,6 +107,17 @@ describe ProjectStatistics do
     end
   end
 
+  describe '#update_wiki_size' do
+    before do
+      allow(project.wiki.repository).to receive(:size).and_return(34)
+      statistics.update_wiki_size
+    end
+
+    it "stores the size of the wiki" do
+      expect(statistics.wiki_size).to eq 34.megabytes
+    end
+  end
+
   describe '#update_lfs_objects_size' do
     let!(:lfs_object1) { create(:lfs_object, size: 23.megabytes) }
     let!(:lfs_object2) { create(:lfs_object, size: 34.megabytes) }
@@ -114,12 +137,13 @@ describe ProjectStatistics do
     it "sums all storage counters" do
       statistics.update!(
         repository_size: 2,
+        wiki_size: 4,
         lfs_objects_size: 3
       )
 
       statistics.reload
 
-      expect(statistics.storage_size).to eq 5
+      expect(statistics.storage_size).to eq 9
     end
   end
 
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 7176bc23e34..c41408fba65 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -90,8 +90,9 @@ describe API::Groups do
 
       it "includes statistics if requested" do
         attributes = {
-          storage_size: 702,
+          storage_size: 1158,
           repository_size: 123,
+          wiki_size: 456,
           lfs_objects_size: 234,
           build_artifacts_size: 345
         }.stringify_keys
diff --git a/spec/services/projects/update_statistics_service_spec.rb b/spec/services/projects/update_statistics_service_spec.rb
index 5000ea58e5f..8534853fbc7 100644
--- a/spec/services/projects/update_statistics_service_spec.rb
+++ b/spec/services/projects/update_statistics_service_spec.rb
@@ -17,19 +17,9 @@ describe Projects::UpdateStatisticsService do
       end
     end
 
-    context 'with an existing project without a repository' do
+    context 'with an existing project' do
       let(:project) { create(:project) }
 
-      it 'does nothing' do
-        expect_any_instance_of(ProjectStatistics).not_to receive(:refresh!)
-
-        service.execute
-      end
-    end
-
-    context 'with an existing project with a repository' do
-      let(:project) { create(:project, :repository) }
-
       it 'refreshes the project statistics' do
         expect_any_instance_of(ProjectStatistics).to receive(:refresh!)
           .with(only: statistics.map(&:to_sym))
diff --git a/spec/workers/project_cache_worker_spec.rb b/spec/workers/project_cache_worker_spec.rb
index 3c40269adc7..51afb076da1 100644
--- a/spec/workers/project_cache_worker_spec.rb
+++ b/spec/workers/project_cache_worker_spec.rb
@@ -25,10 +25,11 @@ describe ProjectCacheWorker do
     end
 
     context 'with an existing project without a repository' do
-      it 'does nothing' do
+      it 'updates statistics but does not refresh the method cashes' do
         allow_any_instance_of(Repository).to receive(:exists?).and_return(false)
 
-        expect(worker).not_to receive(:update_statistics)
+        expect(worker).to receive(:update_statistics)
+        expect_any_instance_of(Repository).not_to receive(:refresh_method_caches)
 
         worker.perform(project.id)
       end