From 2a406ba59e551bd18444a3cdfc69d8a1827b2b43 Mon Sep 17 00:00:00 2001
From: mcrakhman <rakhmanov.m@gmail.com>
Date: Tue, 17 Oct 2023 22:22:22 +0200
Subject: [PATCH] GO-2059 Few fixes

---
 space/deletioncontroller.go | 7 ++++---
 space/load.go               | 6 +++---
 space/status.go             | 3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/space/deletioncontroller.go b/space/deletioncontroller.go
index fdc00ff45..1dba98d1c 100644
--- a/space/deletioncontroller.go
+++ b/space/deletioncontroller.go
@@ -14,7 +14,7 @@ import (
 
 const (
 	loopPeriodSecs = 60
-	loopTimeout    = time.Second * 10
+	loopTimeout    = time.Second * 120
 )
 
 type localDeleter interface {
@@ -70,8 +70,9 @@ func (d *deletionController) updateStatuses(ctx context.Context) (statuses []spa
 		switch status {
 		case coordinatorproto.SpaceStatus_SpaceStatusCreated:
 			return spaceinfo.RemoteStatusOk
-		case coordinatorproto.SpaceStatus_SpaceStatusPendingDeletion:
-			return spaceinfo.RemoteStatusWaitingDeletion
+		// TODO: [MR] uncomment when coordinator is updated
+		//case coordinatorproto.SpaceStatus_SpaceStatusPendingDeletion:
+		//	return spaceinfo.RemoteStatusWaitingDeletion
 		default:
 			return spaceinfo.RemoteStatusDeleted
 		}
diff --git a/space/load.go b/space/load.go
index df56ac3c8..05b2f3dbf 100644
--- a/space/load.go
+++ b/space/load.go
@@ -13,13 +13,13 @@ func (s *service) startLoad(ctx context.Context, spaceID string) (err error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	status := s.getStatus(spaceID)
+	if status.AccountStatus == spaceinfo.AccountStatusDeleted {
+		return ErrSpaceDeleted
+	}
 	// Do nothing if space is already loading
 	if status.LocalStatus != spaceinfo.LocalStatusUnknown {
 		return nil
 	}
-	if status.AccountStatus == spaceinfo.AccountStatusDeleted {
-		return ErrSpaceDeleted
-	}
 
 	exists, err := s.techSpace.SpaceViewExists(ctx, spaceID)
 	if err != nil {
diff --git a/space/status.go b/space/status.go
index a0c4033ca..868d3d1a9 100644
--- a/space/status.go
+++ b/space/status.go
@@ -54,7 +54,8 @@ func (s *service) allStatuses() (statuses []spaceinfo.SpaceInfo) {
 	defer s.mu.Unlock()
 	statuses = make([]spaceinfo.SpaceInfo, 0, len(s.statuses))
 	for _, status := range s.statuses {
-		if status.SpaceID != addr.AnytypeMarketplaceWorkspace {
+		// TODO: check why we have them in statuses
+		if status.SpaceID != addr.AnytypeMarketplaceWorkspace && status.SpaceID != s.techSpace.TechSpaceId() {
 			statuses = append(statuses, status)
 		}
 	}