Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove obsolete repository methods

Manav Rathibf494b43c179
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 8096da9e25..b426618f63 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -199,7 +199,7 @@ func main() {
usageRepo := &repo.UsageRepository{DB: db, UserRepo: userRepo}
fileRepo := &repo.FileRepository{DB: db, S3Config: s3Config, QueueRepo: queueRepo,
ObjectRepo: objectRepo, ObjectCleanupRepo: objectCleanupRepo,
- ObjectCopiesRepo: objectCopiesRepo, UsageRepo: usageRepo}
+ ObjectCopiesRepo: objectCopiesRepo}
fileLinkRepo := public.NewFileLinkRepo(db)
pasteRepo := public.NewPasteRepository(db)
fileDataRepo := &fileDataRepo.Repository{DB: db, ObjectCleanupRepo: objectCleanupRepo}
diff --git a/server/pkg/controller/user/user_details.go b/server/pkg/controller/user/user_details.go
index 8d63582a7d..95cf6fc3d0 100644
--- a/server/pkg/controller/user/user_details.go
+++ b/server/pkg/controller/user/user_details.go
@@ -84,7 +84,7 @@ func (c *UserController) GetDetailsV2(ctx *gin.Context, userID int64, fetchMemor
})
g.Go(func() error {
- return recover.Int64ToInt64RecoverWrapper(userID, c.FileRepo.GetUsage, &usage)
+ return recover.Int64ToInt64RecoverWrapper(userID, c.UsageRepo.GetUsage, &usage)
})
g.Go(func() error {
cnt, err := c.PasskeyRepo.GetPasskeyCount(userID)
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index 723fcd618b..fd48222a67 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -1161,13 +1161,3 @@ func (repo *CollectionRepository) UpdateMagicMetadata(ctx context.Context,
}
return stacktrace.Propagate(err, "")
}
-
-func (repo *CollectionRepository) GetSharedCollectionsCount(userID int64) (int64, error) {
- row := repo.DB.QueryRow(`SELECT count(*) FROM collection_shares WHERE from_user_id = $1`, userID)
- var count int64 = 0
- err := row.Scan(&count)
- if err != nil {
- return -1, stacktrace.Propagate(err, "")
- }
- return count, nil
-}
diff --git a/server/pkg/repo/file.go b/server/pkg/repo/file.go
index 155040d070..fa1c293c46 100644
--- a/server/pkg/repo/file.go
+++ b/server/pkg/repo/file.go
@@ -24,7 +24,6 @@ type FileRepository struct {
ObjectRepo *ObjectRepository
ObjectCleanupRepo *ObjectCleanupRepository
ObjectCopiesRepo *ObjectCopiesRepository
- UsageRepo *UsageRepository
}
func (repo *FileRepository) Create(
@@ -694,12 +693,6 @@ func (repo *FileRepository) GetFileAttributes(fileID int64) (*ente.File, error)
return &file, nil
}
-// GetUsage gets the Storage usage of a user
-// Deprecated: GetUsage is deprecated, use UsageRepository.GetUsage
-func (repo *FileRepository) GetUsage(userID int64) (int64, error) {
- return repo.UsageRepo.GetUsage(userID)
-}
-
func (repo *FileRepository) DropFilesMetadata(ctx context.Context, fileIDs []int64) error {
// ensure that the fileIDs are not present in object_keys
rows, err := repo.DB.QueryContext(ctx, `SELECT distinct(file_id) FROM object_keys WHERE file_id = ANY($1)`, pq.Array(fileIDs))