π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Name usage changes at call sites
Neeraj Gupta98d394dd9a96
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.goindex a5551923c7..72e214121e 100644--- a/server/pkg/repo/collection.go+++ b/server/pkg/repo/collection.go@@ -815,7 +815,10 @@ func (repo *CollectionRepository) RestoreFiles(ctx context.Context, userID int64if !ok {return stacktrace.Propagate(ente.ErrInvalidApp, "unsupported collection app %s", app)}- if _, err := applyUsageDelta(ctx, tx, userID, 0, photosFileDelta, lockerFileDelta, false); err != nil {+ if _, err := applyUsageChange(ctx, tx, userID, usageChange{+ PhotosFileDelta: photosFileDelta,+ LockerFileDelta: lockerFileDelta,+ }); err != nil {return stacktrace.Propagate(err, "failed to update file counts")}}diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.goindex a3af8b1f7f..1a95786019 100644--- a/server/pkg/repo/file.go+++ b/server/pkg/repo/file.go@@ -313,7 +313,7 @@ func (repo *FileRepository) Update(file ente.File, fileSize int64, thumbnailSizeif err != nil {return stacktrace.Propagate(err, "")}- _, err = repo.updateUsage(ctx, tx, file.OwnerID, usageDiff, 0, 0)+ _, err = applyUsageChange(ctx, tx, file.OwnerID, usageChange{StorageDelta: usageDiff})if err != nil {return stacktrace.Propagate(err, "")}@@ -450,7 +450,7 @@ func (repo *FileRepository) UpdateThumbnail(ctx context.Context, fileID int64, uif err != nil {return stacktrace.Propagate(err, "")}- _, err = repo.updateUsage(ctx, tx, userID, usageDiff, 0, 0)+ _, err = applyUsageChange(ctx, tx, userID, usageChange{StorageDelta: usageDiff})if err != nil {return stacktrace.Propagate(err, "")}@@ -775,7 +775,7 @@ func (repo *FileRepository) scheduleDeletion(ctx context.Context, tx *sql.Tx, fitotalObjectSize += object.FileSize}diff = diff - (totalObjectSize)- _, err = repo.updateUsage(ctx, tx, userID, diff, 0, 0)+ _, err = applyUsageChange(ctx, tx, userID, usageChange{StorageDelta: diff})return stacktrace.Propagate(err, "")}@@ -784,9 +784,9 @@ func (repo *FileRepository) updateUsageForFileCreation(ctx context.Context, tx *if !ok {return -1, stacktrace.Propagate(ente.ErrInvalidApp, "")}- return repo.updateUsage(ctx, tx, userID, storageDiff, photosFileCountDiff, lockerFileCountDiff)-}--func (repo *FileRepository) updateUsage(ctx context.Context, tx *sql.Tx, userID, storageDiff, photosFileCountDiff, lockerFileCountDiff int64) (int64, error) {- return applyUsageDelta(ctx, tx, userID, storageDiff, photosFileCountDiff, lockerFileCountDiff, false)+ return applyUsageChange(ctx, tx, userID, usageChange{+ StorageDelta: storageDiff,+ PhotosFileDelta: photosFileCountDiff,+ LockerFileDelta: lockerFileCountDiff,+ })}diff --git a/server/pkg/repo/file_usage_test.go b/server/pkg/repo/file_usage_test.goindex 863ab4054a..b5020c307b 100644--- a/server/pkg/repo/file_usage_test.go+++ b/server/pkg/repo/file_usage_test.go@@ -71,7 +71,7 @@ func TestUpdateUsageForFileCreationMaintainsCounterState(t *testing.T) {}}-func TestUpdateUsageRequiresUsageRow(t *testing.T) {+func TestApplyUsageChangeRequiresUsageRow(t *testing.T) {db := setupFileUsageTest(t)userID := testutil.InsertUser(t, db, testutil.UserFixture{UserID: 1,@@ -84,12 +84,12 @@ func TestUpdateUsageRequiresUsageRow(t *testing.T) {}defer tx.Rollback()- _, err = (&FileRepository{}).updateUsage(t.Context(), tx, userID, 5, 1, 0)+ _, err = applyUsageChange(t.Context(), tx, userID, usageChange{StorageDelta: 5, PhotosFileDelta: 1})if err == nil {- t.Fatal("updateUsage() created a missing usage row")+ t.Fatal("applyUsageChange() created a missing usage row")}if errors.Is(err, sql.ErrNoRows) {- t.Fatal("updateUsage() exposed missing usage row as not found")+ t.Fatal("applyUsageChange() exposed missing usage row as not found")}var count intdiff --git a/server/pkg/repo/trash.go b/server/pkg/repo/trash.goindex df3a5734e7..13d51c0a3c 100644--- a/server/pkg/repo/trash.go+++ b/server/pkg/repo/trash.go@@ -171,7 +171,11 @@ func (t *TrashRepository) TrashFiles(ctx context.Context, userID int64, trash enreturn stacktrace.Propagate(err, "failed to disable file links for files being trashed")}if photosFileDelta != 0 || lockerFileDelta != 0 || ambiguousFileApp {- if _, err := applyUsageDelta(ctx, tx, userID, 0, photosFileDelta, lockerFileDelta, ambiguousFileApp); err != nil {+ if _, err := applyUsageChange(ctx, tx, userID, usageChange{+ PhotosFileDelta: photosFileDelta,+ LockerFileDelta: lockerFileDelta,+ InvalidateFileCounts: ambiguousFileApp,+ }); err != nil {return stacktrace.Propagate(err, "failed to update file counts")}}@@ -219,7 +223,7 @@ func (t *TrashRepository) CleanUpDeletedFilesFromCollection(ctx context.Context,return stacktrace.Propagate(err, "")}if removedOwnedMembership {- if _, err := applyUsageDelta(ctx, tx, userID, 0, 0, 0, true); err != nil {+ if _, err := applyUsageChange(ctx, tx, userID, usageChange{InvalidateFileCounts: true}); err != nil {return stacktrace.Propagate(err, "failed to invalidate file counts")}}diff --git a/server/pkg/repo/usage_file_count.go b/server/pkg/repo/usage_file_count.goindex 0a9e07d2c1..c197d87ecb 100644--- a/server/pkg/repo/usage_file_count.go+++ b/server/pkg/repo/usage_file_count.go@@ -11,15 +11,14 @@ import ("github.com/sirupsen/logrus")-func applyUsageDelta(- ctx context.Context,- tx *sql.Tx,- userID int64,- storageDelta int64,- photosFileDelta int64,- lockerFileDelta int64,- invalidateFileCounts bool,-) (int64, error) {+type usageChange struct {+ StorageDelta int64+ PhotosFileDelta int64+ LockerFileDelta int64+ InvalidateFileCounts bool+}++func applyUsageChange(ctx context.Context, tx *sql.Tx, userID int64, change usageChange) (int64, error) {row := tx.QueryRowContext(ctx, `WITH current_usage AS (SELECT user_id, storage_consumed, photos_file_count, locker_file_count, file_count_source_versionFROM usage@@ -55,10 +54,10 @@ func applyUsageDelta(AND current_usage.locker_file_count IS NOT NULLAND ($5 OR current_usage.photos_file_count + $3 < 0 OR current_usage.locker_file_count + $4 < 0)`,userID,- storageDelta,- photosFileDelta,- lockerFileDelta,- invalidateFileCounts,+ change.StorageDelta,+ change.PhotosFileDelta,+ change.LockerFileDelta,+ change.InvalidateFileCounts,)var storageConsumed int64var fileCountsInvalidated bool@@ -71,8 +70,8 @@ func applyUsageDelta(if fileCountsInvalidated {logrus.WithFields(logrus.Fields{"user_id": userID,- "photos_file_delta": photosFileDelta,- "locker_file_delta": lockerFileDelta,+ "photos_file_delta": change.PhotosFileDelta,+ "locker_file_delta": change.LockerFileDelta,}).Error("invalidated file counts")}return storageConsumed, nil