Revert "packages: Calculate package size quota using package creator ID instead of...

This reverts commit #28007 60522fc96f1fa4675e95010e4b1535e0eac21910.

diff --git a/models/packages/package_file.go b/models/packages/package_file.go
index a2ddae7325ee1cd4b0f628c93ef4c80b61ed106b..1c2c9ac072f417ad5868148b1eb4ad19e02271dc 100644 (file)
--- a/models/packages/package_file.go
+++ b/models/packages/package_file.go
@@ -230,15 +230,3 @@ func CalculateFileSize(ctx context.Context, opts *PackageFileSearchOptions) (int
                Join("INNER", "package_blob", "package_blob.id = package_file.blob_id").
                SumInt(new(PackageBlob), "size")
 }
-
-// CalculateCreatorPackageQuota sums up all blob sizes related to package
-// version creator id.
-// It does NOT respect the deduplication of blobs.
-func CalculateCreatorPackageQuota(ctx context.Context, creatorID int64) (int64, error) {
-       return db.GetEngine(ctx).
-               Table("package_version").
-               Where(builder.Eq{"creator_id": creatorID}).
-               Join("INNER", "package_file", "package_version.id = package_file.version_id").
-               Join("INNER", "package_blob", "package_blob.id = package_file.blob_id").
-               SumInt(new(PackageBlob), "size")
-}

diff --git a/services/packages/packages.go b/services/packages/packages.go
index 294ee6cc1a1be0330a367691680a07f4ad7842eb..56d5cc04de2dfb91057ff028995b24b0b7b8429f 100644 (file)
--- a/services/packages/packages.go
+++ b/services/packages/packages.go
@@ -401,7 +401,9 @@ func CheckSizeQuotaExceeded(ctx context.Context, doer, owner *user_model.User, p
        }
 
        if setting.Packages.LimitTotalOwnerSize > -1 {
-               totalSize, err := packages_model.CalculateCreatorPackageQuota(ctx, doer.ID)
+               totalSize, err := packages_model.CalculateFileSize(ctx, &packages_model.PackageFileSearchOptions{
+                       OwnerID: owner.ID,
+               })
                if err != nil {
                        log.Error("CalculateFileSize failed: %v", err)
                        return err