Merge pull request #65 from anyproto/GO-3125-shared-spaces-limit

GO-3125 use acl.IsEmpty

Author: cheggaaa

coordinator/coordinator.go

@@ -357,24 +357,13 @@ func (c *coordinator) MakeSpaceUnshareable(ctx context.Context, spaceId, aclHead
 		return coordinatorproto.ErrAclHeadIsMissing
 	}
 
-	var (
-		activeMembers int
-		hasInvites    bool
-	)
-	err = c.acl.ReadState(ctx, spaceId, func(s *list.AclState) error {
-		for _, acc := range s.CurrentAccounts() {
-			if acc.Permissions.NoPermissions() {
-				continue
-			}
-			activeMembers++
-		}
-		if len(s.Invites()) > 0 {
-			hasInvites = true
+	if err = c.acl.ReadState(ctx, spaceId, func(s *list.AclState) error {
+		if !s.IsEmpty() {
+			return coordinatorproto.ErrAclNonEmpty
 		}
 		return nil
-	})
-	if hasInvites || activeMembers > 1 {
-		return coordinatorproto.ErrAclNonEmpty
+	}); err != nil {
+		return
 	}
 
 	return c.spaceStatus.MakeUnshareable(ctx, spaceId)

coordinator/coordinator_test.go

@@ -138,9 +138,20 @@ func TestCoordinator_MakeSpaceUnshareable(t *testing.T) {
 			IsShareable: true,
 		}, nil)
 		fx.acl.EXPECT().HasRecord(ctx, spaceId, headId).Return(true, nil)
-		fx.acl.EXPECT().ReadState(ctx, spaceId, gomock.Any()).Do(func(ctx context.Context, spaceId string, f func(s *list.AclState) error) {
-			s := list.NewTestAclStateWithUsers(5, 5, 5)
-			require.NoError(t, f(s))
+		fx.acl.EXPECT().ReadState(ctx, spaceId, gomock.Any()).DoAndReturn(func(ctx context.Context, spaceId string, f func(s *list.AclState) error) error {
+			a := list.NewAclExecutor("spaceId")
+			cmds := []string{
+				"a.init::a",
+				"a.invite::invId",
+				"b.join::invId",
+				"a.revoke::invId",
+				"a.approve::b,r",
+			}
+			for _, cmd := range cmds {
+				err := a.Execute(cmd)
+				require.NoError(t, err)
+			}
+			return f(a.ActualAccounts()["a"].Acl.AclState())
 		})
 		require.ErrorIs(t, fx.MakeSpaceUnshareable(ctx, spaceId, headId), coordinatorproto.ErrAclNonEmpty)
 	})

go.mod

@@ -6,7 +6,7 @@ toolchain go1.22.1
 
 require (
 	github.com/ahmetb/govvv v0.3.0
-	github.com/anyproto/any-sync v0.4.0
+	github.com/anyproto/any-sync v0.4.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/stretchr/testify v1.9.0
 	go.mongodb.org/mongo-driver v1.14.0

go.sum

@@ -11,8 +11,8 @@ github.com/VictoriaMetrics/fastcache v1.12.1/go.mod h1:tX04vaqcNoQeGLD+ra5pU5sWk
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ahmetb/govvv v0.3.0 h1:YGLGwEyiUwHFy5eh/RUhdupbuaCGBYn5T5GWXp+WJB0=
 github.com/ahmetb/govvv v0.3.0/go.mod h1:4WRFpdWtc/YtKgPFwa1dr5+9hiRY5uKAL08bOlxOR6s=
-github.com/anyproto/any-sync v0.4.0 h1:EF9tjSd6er3zpuoO5gJhKuF65sx7YSSJjEvrWqVUZdI=
-github.com/anyproto/any-sync v0.4.0/go.mod h1:LclTfV2oKjwGqeMzWkRglivCg8+NmcDHZXeozyHho6w=
+github.com/anyproto/any-sync v0.4.1 h1:/MFgzCaUSUqRFYkCNbiwmIZtRR2+s4qqAq070KE+eew=
+github.com/anyproto/any-sync v0.4.1/go.mod h1:LclTfV2oKjwGqeMzWkRglivCg8+NmcDHZXeozyHho6w=
 github.com/anyproto/go-chash v0.1.0 h1:I9meTPjXFRfXZHRJzjOHC/XF7Q5vzysKkiT/grsogXY=
 github.com/anyproto/go-chash v0.1.0/go.mod h1:0UjNQi3PDazP0fINpFYu6VKhuna+W/V+1vpXHAfNgLY=
 github.com/anyproto/go-slip10 v1.0.0 h1:uAEtSuudR3jJBOfkOXf3bErxVoxbuKwdoJN55M1i6IA=