update test with more cases

Emyrk · Emyrk · commit f1f6e6eff146 · 2025-04-15T13:08:21.000-05:00
diff --git a/coderd/database/dbfake/builder.go b/coderd/database/dbfake/builder.go
@@ -17,6 +17,7 @@ type OrganizationBuilder struct {
 	t                 *testing.T
 	db                database.Store
 	seed              database.Organization
+	delete            bool
 	allUsersAllowance int32
 	members           []uuid.UUID
 	groups            map[database.Group][]uuid.UUID
@@ -45,6 +46,12 @@ func (b OrganizationBuilder) EveryoneAllowance(allowance int) OrganizationBuilde
 	return b
 }
 
+func (b OrganizationBuilder) Deleted(deleted bool) OrganizationBuilder {
+	//nolint: revive // returns modified struct
+	b.delete = deleted
+	return b
+}
+
 func (b OrganizationBuilder) Seed(seed database.Organization) OrganizationBuilder {
 	//nolint: revive // returns modified struct
 	b.seed = seed
@@ -119,6 +126,17 @@ func (b OrganizationBuilder) Do() OrganizationResponse {
 		}
 	}
 
+	if b.delete {
+		now := dbtime.Now()
+		err = b.db.UpdateOrganizationDeletedByID(ctx, database.UpdateOrganizationDeletedByIDParams{
+			UpdatedAt: now,
+			ID:        org.ID,
+		})
+		require.NoError(b.t, err)
+		org.Deleted = true
+		org.UpdatedAt = now
+	}
+
 	return OrganizationResponse{
 		Org:           org,
 		AllUsersGroup: everyone,
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -4156,6 +4156,9 @@ func (q *FakeQuerier) GetOrganizations(_ context.Context, args database.GetOrgan
 		if args.Name != "" && !strings.EqualFold(org.Name, args.Name) {
 			continue
 		}
+		if args.Deleted != org.Deleted {
+			continue
+		}
 		tmp = append(tmp, org)
 	}
 
diff --git a/coderd/idpsync/organizations_test.go b/coderd/idpsync/organizations_test.go
@@ -1,6 +1,7 @@
 package idpsync_test
 
 import (
+	"database/sql"
 	"testing"
 
 	"github.com/golang-jwt/jwt/v4"
@@ -9,9 +10,10 @@ import (
 
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/coderd/database"
+	"github.com/coder/coder/v2/coderd/database/db2sdk"
+	"github.com/coder/coder/v2/coderd/database/dbfake"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/idpsync"
 	"github.com/coder/coder/v2/coderd/runtimeconfig"
 	"github.com/coder/coder/v2/testutil"
@@ -46,29 +48,28 @@ func TestParseOrganizationClaims(t *testing.T) {
 func TestSyncOrganizations(t *testing.T) {
 	t.Parallel()
 
+	// This test creates some deleted organizations and checks the behavior is
+	// correct.
 	t.Run("SyncUserToDeletedOrg", func(t *testing.T) {
 		ctx := testutil.Context(t, testutil.WaitMedium)
 		db, _ := dbtestutil.NewDB(t)
 		user := dbgen.User(t, db, database.User{})
-		extra := dbgen.Organization(t, db, database.Organization{})
-		dbgen.OrganizationMember(t, db, database.OrganizationMember{
-			UserID:         user.ID,
-			OrganizationID: extra.ID,
-		})
 
-		// Create a new organization, add in the user as a member, then delete
-		// the org.
-		org := dbgen.Organization(t, db, database.Organization{})
-		dbgen.OrganizationMember(t, db, database.OrganizationMember{
-			UserID:         user.ID,
-			OrganizationID: org.ID,
-		})
-
-		err := db.UpdateOrganizationDeletedByID(ctx, database.UpdateOrganizationDeletedByIDParams{
-			UpdatedAt: dbtime.Now(),
-			ID:        org.ID,
-		})
-		require.NoError(t, err)
+		// Create orgs for:
+		//  - stays = User is a member, and stays
+		//  - leaves = User is a member, and leaves
+		//  - joins  = User is not a member, and joins
+		// For deleted orgs, the user **should not** be a member of afterwards.
+		//  - deletedStays = User is a member of deleted org, and wants to stay
+		//  - deletedLeaves = User is a member of deleted org, and wants to leave
+		//  - deletedJoins = User is not a member of deleted org, and wants to join
+		stays := dbfake.Organization(t, db).Members(user).Do()
+		leaves := dbfake.Organization(t, db).Members(user).Do()
+		joins := dbfake.Organization(t, db).Do()
+
+		deletedStays := dbfake.Organization(t, db).Members(user).Deleted(true).Do()
+		deletedLeaves := dbfake.Organization(t, db).Members(user).Deleted(true).Do()
+		deletedJoins := dbfake.Organization(t, db).Deleted(true).Do()
 
 		// Now sync the user to the deleted organization
 		s := idpsync.NewAGPLSync(
@@ -77,27 +78,34 @@ func TestSyncOrganizations(t *testing.T) {
 			idpsync.DeploymentSyncSettings{
 				OrganizationField: "orgs",
 				OrganizationMapping: map[string][]uuid.UUID{
-					"random": {org.ID},
-					"noise":  {uuid.New()},
+					"stay":  {stays.Org.ID, deletedStays.Org.ID},
+					"leave": {leaves.Org.ID, deletedLeaves.Org.ID},
+					"join":  {joins.Org.ID, deletedJoins.Org.ID},
 				},
 				OrganizationAssignDefault: false,
 			},
 		)
 
-		err = s.SyncOrganizations(ctx, db, user, idpsync.OrganizationParams{
+		err := s.SyncOrganizations(ctx, db, user, idpsync.OrganizationParams{
 			SyncEntitled: true,
 			MergedClaims: map[string]interface{}{
-				"orgs": []string{"random", "noise"},
+				"orgs": []string{"stay", "join"},
 			},
 		})
 		require.NoError(t, err)
 
-		mems, err := db.OrganizationMembers(ctx, database.OrganizationMembersParams{
-			OrganizationID: org.ID,
-			UserID:         user.ID,
-			IncludeSystem:  false,
+		orgs, err := db.GetOrganizationsByUserID(ctx, database.GetOrganizationsByUserIDParams{
+			UserID:  user.ID,
+			Deleted: sql.NullBool{},
 		})
 		require.NoError(t, err)
-		require.Len(t, mems, 1)
+		require.Len(t, orgs, 2)
+
+		// Verify the user only exists in 2 orgs. The one they stayed, and the one they
+		// joined.
+		inIDs := db2sdk.List(orgs, func(org database.Organization) uuid.UUID {
+			return org.ID
+		})
+		require.ElementsMatch(t, []uuid.UUID{stays.Org.ID, joins.Org.ID}, inIDs)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -4156,6 +4156,9 @@ func (q *FakeQuerier) GetOrganizations(_ context.Context, args database.GetOrgan`
`4156`	`4156`	`if args.Name != "" && !strings.EqualFold(org.Name, args.Name) {`
`4157`	`4157`	`continue`
`4158`	`4158`	`}`
	`4159`	`+ if args.Deleted != org.Deleted {`
	`4160`	`+ continue`
	`4161`	`+ }`
`4159`	`4162`	`tmp = append(tmp, org)`
`4160`	`4163`	`}`
`4161`	`4164`