From e9d4e07a08c43f517393f159c23a16a1f7c12441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Fri, 12 May 2023 09:00:05 +0200 Subject: [PATCH] constify the "trashed" space state --- services/graph/pkg/service/v0/drives.go | 3 ++- services/search/pkg/search/service.go | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index bb77f93bcf..3494b211a8 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -40,6 +40,7 @@ import ( const ( _spaceTypePersonal = "personal" _spaceTypeProject = "project" + _spaceStateTrashed = "trashed" _sortDescending = "desc" ) @@ -535,7 +536,7 @@ func (g Graph) formatDrives(ctx context.Context, baseURL *url.URL, storageSpaces } // can't access disabled space - if utils.ReadPlainFromOpaque(storageSpace.Opaque, "trashed") != "trashed" { + if utils.ReadPlainFromOpaque(storageSpace.Opaque, "trashed") != _spaceStateTrashed { res.Special = g.getSpecialDriveItems(ctx, baseURL, storageSpace) quota, err := g.getDriveQuota(ctx, storageSpace) res.Quota = "a diff --git a/services/search/pkg/search/service.go b/services/search/pkg/search/service.go index c256009dfe..9c2eeb0dc5 100644 --- a/services/search/pkg/search/service.go +++ b/services/search/pkg/search/service.go @@ -28,6 +28,10 @@ import ( //go:generate mockery --name=Searcher +const ( + _spaceStateTrashed = "trashed" +) + // Searcher is the interface to the SearchService type Searcher interface { Search(ctx context.Context, req *searchsvc.SearchRequest) (*searchsvc.SearchResponse, error) @@ -85,7 +89,7 @@ func (s *Service) Search(ctx context.Context, req *searchsvc.SearchRequest) (*se spaces := []*provider.StorageSpace{} for _, space := range listSpacesRes.StorageSpaces { - if utils.ReadPlainFromOpaque(space.Opaque, "trashed") == "trashed" { + if utils.ReadPlainFromOpaque(space.Opaque, "trashed") == _spaceStateTrashed { // Do not consider disabled spaces continue }