Repair DirectorySync (#2645)

* migrations for directorysync

* query interceptor

Author: matoszz

db/migrations-goose-postgres/20260728193957_directorymembershipindex.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+-- drop index "directorymembership_directory_account_id_directory_group_id" from table: "directory_memberships"
+DROP INDEX "directorymembership_directory_account_id_directory_group_id";
+-- create index "directorymembership_directory_account_id_directory_group_id" to table: "directory_memberships"
+CREATE UNIQUE INDEX "directorymembership_directory_account_id_directory_group_id" ON "directory_memberships" ("directory_account_id", "directory_group_id") WHERE (removed_at IS NULL);
+
+-- +goose Down
+-- reverse: create index "directorymembership_directory_account_id_directory_group_id" to table: "directory_memberships"
+DROP INDEX "directorymembership_directory_account_id_directory_group_id";
+-- reverse: drop index "directorymembership_directory_account_id_directory_group_id" from table: "directory_memberships"
+CREATE UNIQUE INDEX "directorymembership_directory_account_id_directory_group_id" ON "directory_memberships" ("directory_account_id", "directory_group_id");

db/migrations-goose-postgres/atlas.sum

@@ -1,4 +1,4 @@
-h1:x94pUKv95OWFoh4dw/OV5nFlMNw+yRJ3Mu9PjyE4Y/w=
+h1:oqCrggOTZtoGFcPdY+as7UG7lnf2sg77wM7PkIk+U1U=
 20251229183203_init.sql h1:g/05irCXoqKFObJV2PPLuvDRqma+da41VPsZ5fXQgfE=
 20251229183205_init_history.sql h1:P/q2kAHb8zfNMOWzYkKtPbOwoh9GdJUQljSNAiPEjYI=
 20251231045229_workflow.sql h1:uUPRLO4yw2y//fPGeqIXRrL+fiEN1TRGkF4wHiqPaPk=
@@ -169,3 +169,4 @@ h1:x94pUKv95OWFoh4dw/OV5nFlMNw+yRJ3Mu9PjyE4Y/w=
 20260722075926_onboarding_nda_requests.sql h1:kosPtxSY+cr5wBw3WMxQw2AaGti9+U7rwoEUY8W2f9o=
 20260722075934_onboarding_nda_requests_history.sql h1:TMW32Y3URxni4DuxayWqhzRlhmsZtoMJFDluTQ4oCTU=
 20260723204917_assessment_name.sql h1:J002Q+6j44zTuY4HGN5eyRo56knOypAp2hNVGotiAIs=
+20260728193957_directorymembershipindex.sql h1:v0+GK6MFeTEDEEg8Px5FbjuXO9uU8dRdM8RrAntQKxs=

db/migrations/20260728193948_directorymembershipindex.sql

@@ -0,0 +1,4 @@
+-- Drop index "directorymembership_directory_account_id_directory_group_id" from table: "directory_memberships"
+DROP INDEX "directorymembership_directory_account_id_directory_group_id";
+-- Create index "directorymembership_directory_account_id_directory_group_id" to table: "directory_memberships"
+CREATE UNIQUE INDEX "directorymembership_directory_account_id_directory_group_id" ON "directory_memberships" ("directory_account_id", "directory_group_id") WHERE (removed_at IS NULL);

db/migrations/atlas.sum

@@ -1,4 +1,4 @@
-h1:XMCfgUNSf6uYufp56GudDQU9PuzjyBxuWFjlUdr2rVg=
+h1:a04+WwgE24iL/+xkgQFAWTOB6I4jqCVGDstOKumBs7I=
 20251229183159_init.sql h1:3uf/ftr28zW8YUD9qAaY2GESQHC7pYmkhlI6oDWUCKU=
 20251229183201_init_history.sql h1:1tFSeCDWvZgb2Ctw80C/s3tqVPNLADQw9fSDACzL8WA=
 20251231045221_workflow.sql h1:5bLq4cHh2kxUV7xajK5bq5McKKpr88HmufYauTdsgUw=
@@ -169,3 +169,4 @@ h1:XMCfgUNSf6uYufp56GudDQU9PuzjyBxuWFjlUdr2rVg=
 20260722075902_onboarding_nda_requests.sql h1:jIGhCXYgFzvDeQez/DRRtVJrOwXWkURfQiM+8iCiNUE=
 20260722075914_onboarding_nda_requests_history.sql h1:h2Gq6sROKPreiAiM54UIjTHceGJacchauW0XDgUTDNo=
 20260723204906_assessment_name.sql h1:2yt7XqlG05AXHyzCje3SbjAzshIjeTW/77ANxnIp6/M=
+20260728193948_directorymembershipindex.sql h1:GMmB5LtkGz7WAmqILpbWGoqmZD1e8kq7eRcPyOrFs7Y=

internal/ent/checksum/.history_schema_checksum

@@ -1 +1 @@
-2f0d9744aceff8dd5f9b4ec024b9685fd9c6ff87c5cdfdf9f4b35ad12dea1283
+2f0d9744aceff8dd5f9b4ec024b9685fd9c6ff87c5cdfdf9f4b35ad12dea1283

internal/ent/checksum/.schema_checksum

@@ -1 +1 @@
-577a95aa56d8b31312e981d2f797e7db6a530eff98cc811bea7737ccc4a4d9d5
+577a95aa56d8b31312e981d2f797e7db6a530eff98cc811bea7737ccc4a4d9d5

internal/ent/generated/migrate/schema.go

@@ -21,7 +21,7 @@ func QueryLogger() ent.InterceptFunc {
 			start := time.Now()
 
 			defer func() {
-				logx.FromContext(ctx).Info().
+				logx.FromContext(ctx).Debug().
 					Str("duration", time.Since(start).String()).
 					Str("schema", q.Type()).
 					Msg("query duration")

internal/ent/interceptors/query.go

@@ -5,6 +5,7 @@ import (
 
 	"entgo.io/contrib/entgql"
 	"entgo.io/ent"
+	"entgo.io/ent/dialect/entsql"
 	"entgo.io/ent/schema"
 	"entgo.io/ent/schema/field"
 	"entgo.io/ent/schema/index"
@@ -215,6 +216,12 @@ func (DirectoryMembership) Indexes() []ent.Index {
 	return []ent.Index{
 		index.Fields("directory_account_id", "directory_group_id", "directory_sync_run_id").
 			Unique(),
+		// declaring the pair index ourselves keeps ent from adding its own fully-unique version
+		// for the M2M through edges; the partial predicate limits uniqueness to active rows so
+		// removed membership episodes can accumulate per (account, group) pair
+		index.Fields("directory_account_id", "directory_group_id").
+			Unique().
+			Annotations(entsql.IndexWhere("removed_at is NULL")),
 		index.Fields("directory_instance_id", "directory_account_id", "directory_group_id"),
 		index.Fields("directory_sync_run_id"),
 		index.Fields("integration_id", "directory_sync_run_id"),

internal/ent/schema/directorymembership.go

@@ -1 +1 @@
-62de8a38143f2b0a1928d89eaf8643ecc3136d68c8586f319bc61ebda29ca8ca
+62de8a38143f2b0a1928d89eaf8643ecc3136d68c8586f319bc61ebda29ca8ca