π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Read admin usage with file counts
Neeraj Gupta13b38046a3dd
diff --git a/server/pkg/api/admin.go b/server/pkg/api/admin.goindex 4c716cb9be..de734de944 100644--- a/server/pkg/api/admin.go+++ b/server/pkg/api/admin.go@@ -695,13 +695,15 @@ func (h *AdminHandler) alertIfAdminMissing2FA(ctx adminAlertContext) {}func (h *AdminHandler) attachSubscription(ctx *gin.Context, userID int64, response gin.H) {- storageConsumed, err := h.UsageRepo.GetUsage(userID)+ storageConsumed, photos, locker, err := h.UsageRepo.GetStoredFileCounts(ctx.Request.Context(), userID)if err != nil {logrus.WithError(err).WithField("user_id", userID).Error("failed to get user storage usage")response["storageConsumedStatus"] = "unavailable"} else {response["storageConsumed"] = storageConsumedresponse["storageConsumedStatus"] = "available"+ response["photosFileCount"] = photos+ response["lockerFileCount"] = locker}subscription, err := h.BillingRepo.GetUserSubscription(userID)if err == nil {@@ -711,11 +713,6 @@ func (h *AdminHandler) attachSubscription(ctx *gin.Context, userID int64, responif err == nil {response["details"] = details}- photos, locker, err := h.UsageRepo.GetStoredFileCounts(ctx.Request.Context(), userID)- if err == nil {- response["photosFileCount"] = photos- response["lockerFileCount"] = locker- }tokenInfos, err := h.UserAuthRepo.GetUserTokenInfo(userID)if err == nil {response["tokens"] = tokenInfosdiff --git a/server/pkg/repo/usage.go b/server/pkg/repo/usage.goindex 293de6567b..bfe51afe60 100644--- a/server/pkg/repo/usage.go+++ b/server/pkg/repo/usage.go@@ -43,15 +43,21 @@ func (repo *UsageRepository) GetUsage(userID int64) (int64, error) {return usage, stacktrace.Propagate(err, "")}-func (repo *UsageRepository) GetStoredFileCounts(ctx context.Context, userID int64) (int64, int64, error) {- var photos, locker int64- err := repo.DB.QueryRowContext(ctx, `SELECT photos_file_count, locker_file_count- FROM usage WHERE user_id = $1- AND photos_file_count IS NOT NULL AND locker_file_count IS NOT NULL`, userID).Scan(&photos, &locker)+func (repo *UsageRepository) GetStoredFileCounts(ctx context.Context, userID int64) (int64, int64, int64, error) {+ var photos, locker sql.NullInt64+ var storageConsumed int64+ err := repo.DB.QueryRowContext(ctx, `SELECT storage_consumed, photos_file_count, locker_file_count+ FROM usage WHERE user_id = $1`, userID).Scan(&storageConsumed, &photos, &locker)if errors.Is(err, sql.ErrNoRows) {- return -1, -1, nil+ return 0, -1, -1, nil}- return photos, locker, stacktrace.Propagate(err, "")+ if err != nil {+ return 0, 0, 0, stacktrace.Propagate(err, "")+ }+ if !photos.Valid || !locker.Valid {+ return storageConsumed, -1, -1, nil+ }+ return storageConsumed, photos.Int64, locker.Int64, nil}func (repo *UsageRepository) CreateTx(ctx context.Context, tx *sql.Tx, userID int64) error {diff --git a/server/pkg/repo/usage_file_count_init.go b/server/pkg/repo/usage_file_count_init.goindex da2324246c..0a841e5221 100644--- a/server/pkg/repo/usage_file_count_init.go+++ b/server/pkg/repo/usage_file_count_init.go@@ -9,7 +9,7 @@ import (var ErrFileCountIneligible = errors.New("file counts are ineligible")func (repo *UsageRepository) InitializeFileCounts(ctx context.Context, userID int64) (bool, error) {- photos, _, err := repo.GetStoredFileCounts(ctx, userID)+ _, photos, _, err := repo.GetStoredFileCounts(ctx, userID)if err != nil || photos != -1 {return false, err}diff --git a/server/pkg/repo/usage_file_count_test.go b/server/pkg/repo/usage_file_count_test.goindex b2bdb01c69..e6a2b7d0cc 100644--- a/server/pkg/repo/usage_file_count_test.go+++ b/server/pkg/repo/usage_file_count_test.go@@ -12,13 +12,13 @@ func TestGetStoredFileCountsReturnsMinusOneUntilInitialized(t *testing.T) {_, db, userID := setupCollectionMembershipTest(t)usageRepo := &UsageRepository{DB: db}for _, tt := range []struct {- name string- sql string- photos, locker int64+ name string+ sql string+ storageConsumed, photos, locker int64}{- {"uninitialized", "", -1, -1},- {"ready", `UPDATE usage SET photos_file_count = 0, locker_file_count = 7 WHERE user_id = $1`, 0, 7},- {"missing", `DELETE FROM usage WHERE user_id = $1`, -1, -1},+ {"uninitialized", "", 0, -1, -1},+ {"ready", `UPDATE usage SET storage_consumed = 42, photos_file_count = 0, locker_file_count = 7 WHERE user_id = $1`, 42, 0, 7},+ {"missing", `DELETE FROM usage WHERE user_id = $1`, 0, -1, -1},} {t.Run(tt.name, func(t *testing.T) {if tt.sql != "" {@@ -26,9 +26,9 @@ func TestGetStoredFileCountsReturnsMinusOneUntilInitialized(t *testing.T) {t.Fatal(err)}}- photos, locker, err := usageRepo.GetStoredFileCounts(t.Context(), userID)- if err != nil || photos != tt.photos || locker != tt.locker {- t.Fatalf("GetStoredFileCounts() = (%d, %d, %v), want (%d, %d, nil)", photos, locker, err, tt.photos, tt.locker)+ storageConsumed, photos, locker, err := usageRepo.GetStoredFileCounts(t.Context(), userID)+ if err != nil || storageConsumed != tt.storageConsumed || photos != tt.photos || locker != tt.locker {+ t.Fatalf("GetStoredFileCounts() = (%d, %d, %d, %v), want (%d, %d, %d, nil)", storageConsumed, photos, locker, err, tt.storageConsumed, tt.photos, tt.locker)}})}