fix: drop index add members check to trigger

jaaydenh · jaaydenh · commit f15e68ed29c1 · 2025-02-21T12:34:41.000Z
diff --git a/coderd/database/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000296_organization_soft_delete.down.sql b/coderd/database/migrations/000296_organization_soft_delete.down.sql
@@ -1,6 +1,5 @@
 ALTER TABLE organizations DROP COLUMN deleted;
 
-DROP INDEX IF EXISTS idx_organization_name;
 DROP INDEX IF EXISTS idx_organization_name_lower;
 
 CREATE UNIQUE INDEX IF NOT EXISTS idx_organization_name ON organizations USING btree (name);
diff --git a/coderd/database/migrations/000296_organization_soft_delete.up.sql b/coderd/database/migrations/000296_organization_soft_delete.up.sql
@@ -3,8 +3,6 @@ ALTER TABLE organizations ADD COLUMN deleted boolean DEFAULT FALSE NOT NULL;
 DROP INDEX IF EXISTS idx_organization_name;
 DROP INDEX IF EXISTS idx_organization_name_lower;
 
-CREATE UNIQUE INDEX IF NOT EXISTS idx_organization_name ON organizations USING btree (name)
-	where deleted = false;
 CREATE UNIQUE INDEX IF NOT EXISTS idx_organization_name_lower ON organizations USING btree (lower(name))
 	where deleted = false;
 
@@ -18,6 +16,7 @@ DECLARE
     workspace_count int;
 	template_count int;
 	group_count int;
+	member_count int;
 BEGIN
     workspace_count := (
         SELECT count(*) as count FROM workspaces
@@ -39,19 +38,27 @@ BEGIN
             groups.organization_id = OLD.id
     );
 
+	member_count := (
+        SELECT count(*) as count FROM organization_members
+        WHERE
+            organization_members.organization_id = OLD.id
+    );
+
     -- Fail the deletion if one of the following:
     -- * the organization has 1 or more workspaces
 	-- * the organization has 1 or more templates
-	-- * the organization has 1 or more groups
+	-- * the organization has 1 or more groups other than "Everyone" group
+	-- * the organization has 1 or more members other than the organization owner
+
     IF (workspace_count + template_count) > 0 THEN
             RAISE EXCEPTION 'cannot delete organization: organization has % workspaces and % templates that must be deleted first', workspace_count, template_count;
     END IF;
 
-	IF (group_count) > 1 THEN
-            RAISE EXCEPTION 'cannot delete organization: organization has % groups that must be deleted first', group_count;
+	IF (group_count + member_count) > 2 THEN
+            RAISE EXCEPTION 'cannot delete organization: organization has % groups and % members that must be deleted first', group_count - 1, member_count - 1;
     END IF;
 
-    RETURN OLD;
+    RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
