@@ -89,11 +89,11 @@ def _validate_organization_mapping_belongs_to_user(
8989 return False
9090
9191 @staticmethod
92- def _generate_org_snowflake_id (region_name : str ) -> int :
92+ def _generate_org_snowflake_id () -> int :
9393 return generate_snowflake_id (Organization .snowflake_redis_key )
9494
9595 @staticmethod
96- def _generate_org_slug (region_name : str , slug : str ) -> str :
96+ def _generate_org_slug (slug : str ) -> str :
9797 slug_base = slug .replace ("_" , "-" ).strip ("-" )
9898 surrogate_org_slug = OrganizationSlugReservation ()
9999 slugify_instance (surrogate_org_slug , slug_base , reserved = RESERVED_ORGANIZATION_SLUGS )
@@ -133,12 +133,10 @@ def provision_organization(
133133 org_provision_args : OrganizationProvisioningOptions ,
134134 ) -> RpcOrganizationSlugReservation :
135135 # Generate a new non-conflicting slug and org ID
136- org_id = self ._generate_org_snowflake_id (region_name = cell_name )
137- slug = self ._generate_org_slug (
138- region_name = cell_name , slug = org_provision_args .provision_options .slug
139- )
136+ org_id = self ._generate_org_snowflake_id ()
137+ slug = self ._generate_org_slug (slug = org_provision_args .provision_options .slug )
140138
141- # Generate a provisioning outbox for the region and drain
139+ # Generate a provisioning outbox for the cell and drain
142140 updated_provision_options = deepcopy (org_provision_args .provision_options )
143141 updated_provision_options .slug = slug
144142 provision_payload = OrganizationProvisioningOptions (
@@ -209,7 +207,7 @@ def update_organization_slug(
209207
210208 slug_base = desired_slug
211209 if not require_exact :
212- slug_base = self ._generate_org_slug (region_name = cell_name , slug = slug_base )
210+ slug_base = self ._generate_org_slug (slug = slug_base )
213211
214212 try :
215213 with outbox_context (
@@ -296,7 +294,7 @@ def bulk_create_organization_slug_reservations(
296294 with outbox_context (transaction .atomic (router .db_for_write (OrganizationSlugReservation ))):
297295 for org_id , slug in slug_mapping .items ():
298296 slug_reservation = OrganizationSlugReservation (
299- slug = self ._generate_org_slug (slug = slug , region_name = cell_name ),
297+ slug = self ._generate_org_slug (slug = slug ),
300298 organization_id = org_id ,
301299 reservation_type = OrganizationSlugReservationType .TEMPORARY_RENAME_ALIAS .value ,
302300 user_id = - 1 ,
0 commit comments