Commit 4307a2fa authored by James Fargher's avatar James Fargher

Merge branch '225424-fix-package-file-storage-counter' into 'master'

Fix package_file storage computation

Closes #36426 and #225424

See merge request gitlab-org/gitlab!37386
parents 6dc3874c 72f5dc0a
......@@ -37,11 +37,12 @@ class Packages::PackageFile < ApplicationRecord
update_project_statistics project_statistics_name: :packages_size
before_save :update_size_from_file
def update_file_metadata
# The file.object_store is set during `uploader.store!`
# which happens after object is inserted/updated
self.update_column(:file_store, file.object_store)
self.update_column(:size, file.size) unless file.size == self.size
end
def download_path
......@@ -51,6 +52,12 @@ class Packages::PackageFile < ApplicationRecord
def local?
file_store == ::Packages::PackageFileUploader::Store::LOCAL
end
private
def update_size_from_file
self.size ||= file.size
end
end
Packages::PackageFile.prepend_if_ee('EE::Packages::PackageFileGeo')
---
title: Fix Pypi and Nuget Storage Statistics
merge_request: 37386
author:
type: fixed
......@@ -32,11 +32,17 @@ RSpec.describe Packages::PackageFile, type: :model do
end
end
it_behaves_like 'UpdateProjectStatistics' do
subject { build(:package_file, :jar, size: 42) }
context 'updating project statistics' do
context 'when the package file has an explicit size' do
it_behaves_like 'UpdateProjectStatistics' do
subject { build(:package_file, :jar, size: 42) }
end
end
before do
allow_any_instance_of(Packages::PackageFileUploader).to receive(:size).and_return(42)
context 'when the package file does not have a size' do
it_behaves_like 'UpdateProjectStatistics' do
subject { build(:package_file, size: nil) }
end
end
end
......
......@@ -17,11 +17,14 @@ RSpec.shared_examples 'UpdateProjectStatistics' do
context 'when creating' do
it 'updates the project statistics' do
delta = read_attribute
delta0 = reload_stat
expect { subject.save! }
.to change { reload_stat }
.by(delta)
subject.save!
delta1 = reload_stat
expect(delta1).to eq(delta0 + read_attribute)
expect(delta1).to be > delta0
end
it 'schedules a namespace statistics worker' do
......@@ -80,15 +83,14 @@ RSpec.shared_examples 'UpdateProjectStatistics' do
end
it 'updates the project statistics' do
delta = -read_attribute
delta0 = reload_stat
expect(ProjectStatistics)
.to receive(:increment_statistic)
.and_call_original
subject.destroy!
expect { subject.destroy! }
.to change { reload_stat }
.by(delta)
delta1 = reload_stat
expect(delta1).to eq(delta0 - read_attribute)
expect(delta1).to be < delta0
end
it 'schedules a namespace statistics worker' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment