π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[server] Maintain file counts during file creation (#12474)
Neerajc16787abc1b3
diff --cc server/pkg/repo/file.goindex 4984a66881,b7c1ad9e37..90ffc7ec11--- a/server/pkg/repo/file.go+++ b/server/pkg/repo/file.go@@@ -97,10 -102,12 +97,10 @@@ func (repo *FileRepository) Create}err = repo.ObjectCleanupRepo.RemoveTempObjectKey(ctx, tx, file.Thumbnail.ObjectKey, hotDC)if err != nil {- tx.Rollback()return file, -1, stacktrace.Propagate(err, "")}- usage, err := repo.updateUsage(ctx, tx, file.OwnerID, usageDiff)+ usage, err := repo.updateUsageForFileCreation(ctx, tx, file.OwnerID, usageDiff, app)if err != nil {- tx.Rollback()return file, -1, stacktrace.Propagate(err, "")}@@@ -159,8 -168,14 +159,13 @@@ func (repo *FileRepository) CreateMetaF_, err = tx.ExecContext(ctx, `UPDATE collections SET updation_time = $1WHERE collection_id = $2`, metaFile.UpdationTime, metaFile.CollectionID)if err != nil {- tx.Rollback()return nil, stacktrace.Propagate(err, "")}+ _, err = repo.updateUsageForFileCreation(ctx, tx, metaFile.OwnerID, 0, app)+ if err != nil {+ tx.Rollback()+ return nil, stacktrace.Propagate(err, "")+ }err = tx.Commit()if err != nil {return nil, stacktrace.Propagate(err, "")@@@ -306,10 -325,12 +311,10 @@@ func (repo *FileRepository) Update(filSET object_key = $1, size = $2, datacenters = $3 WHERE file_id = $4 AND o_type = $5`,file.Thumbnail.ObjectKey, thumbnailSize, dcsForNewEntry, file.ID, ente.THUMBNAIL)if err != nil {- tx.Rollback()return stacktrace.Propagate(err, "")}- _, err = repo.updateUsage(ctx, tx, file.OwnerID, usageDiff)+ _, err = repo.updateUsage(ctx, tx, file.OwnerID, usageDiff, 0, 0)if err != nil {- tx.Rollback()return stacktrace.Propagate(err, "")}for _, objectKey := range stagedObjects {@@@ -443,10 -482,12 +448,10 @@@ func (repo *FileRepository) UpdateThumbSET object_key = $1, size = $2, datacenters = $3 WHERE file_id = $4 AND o_type = $5`,thumbnail.ObjectKey, thumbnailSize, dcsForNewEntry, fileID, ente.THUMBNAIL)if err != nil {- tx.Rollback()return stacktrace.Propagate(err, "")}- _, err = repo.updateUsage(ctx, tx, userID, usageDiff)+ _, err = repo.updateUsage(ctx, tx, userID, usageDiff, 0, 0)if err != nil {- tx.Rollback()return stacktrace.Propagate(err, "")}