oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-09-30 19:22:08 +00:00
Code Wiki Activity

[v12.0/forgejo] fix: quotas double counting repo size when calculating size:all (#9255)

Browse source 
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/9234

Fixes forgejo/forgejo#7860

Co-authored-by: Brook <brook@noreply.codeberg.org>
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9255
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
This commit is contained in:
forgejo-backport-action 2025-09-11 16:32:10 +02:00 • committed by Gusted
parent cc16887081
commit ad62bf220d
2 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/quota/used.go
View file

@ -25,7 +25,7 @@ type UsedSize struct {
}
func (u UsedSize) All() int64 {
return u.Repos.All() + u.Git.All(u.Repos) + u.Assets.All()
return u.Git.All(u.Repos) + u.Assets.All()
}
type UsedSizeRepos struct {

37
models/quota/used_test.go
View file

@ -1,23 +1,54 @@
// Copyright 2025 The Forgejo Authors. All rights reserved.
// SPDX-License-Identifier: GPL-3.0-or-later
package quota
package quota_test
import (
"testing"
quota_model "forgejo.org/models/quota"
"forgejo.org/models/unittest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestGetUsedForUser(t *testing.T) {
func TestQuotaUsedGetUsedForUser(t *testing.T) {
defer unittest.OverrideFixtures("models/fixtures/TestGetUsedForUser/")()
require.NoError(t, unittest.PrepareTestDatabase())
used, err := GetUsedForUser(t.Context(), 5)
used, err := quota_model.GetUsedForUser(t.Context(), 5)
require.NoError(t, err)
assert.EqualValues(t, 4096, used.Size.Assets.Artifacts)
}
func TestQuotaUsedTotals(t *testing.T) {
used := quota_model.Used{
Size: quota_model.UsedSize{
Repos: quota_model.UsedSizeRepos{
Public: 2,
Private: 3,
},
Git: quota_model.UsedSizeGit{
LFS: 7,
},
Assets: quota_model.UsedSizeAssets{
Attachments: quota_model.UsedSizeAssetsAttachments{
Issues: 11,
Releases: 13,
},
Artifacts: 17,
Packages: quota_model.UsedSizeAssetsPackages{
All: 19,
},
},
},
}
assert.EqualValues(t, 5, used.Size.Repos.All()) // repos public + repos private
assert.EqualValues(t, 12, used.Size.Git.All(used.Size.Repos)) // repos all + git lfs
assert.EqualValues(t, 24, used.Size.Assets.Attachments.All()) // issues + releases
assert.EqualValues(t, 60, used.Size.Assets.All()) // attachments all + artifacts + packages
assert.EqualValues(t, 72, used.Size.All()) // git all + assets all
}