fix: commit session after attaching entity types to directories

Author: rimu-stack

app/alembic/versions/c4888c68e221_fix_admin_attr_and_policy.py

@@ -44,33 +44,8 @@ async def _attach_entity_type_to_directories(
             session,
             object_class_dao=object_class_dao,
         )
-        await session.execute(
-            sa.text("""
-WITH directory_classes AS (
-    SELECT
-        a."directoryId" as directory_id,
-        ARRAY_AGG(LOWER(a.value) ORDER BY LOWER(a.value)) as sorted_classes
-    FROM public."Attributes" a
-    WHERE LOWER(a."name") = 'objectclass'
-    GROUP BY a."directoryId"
-),
-entity_type_classes AS (
-    SELECT
-        et.id as entity_type_id,
-        ARRAY_AGG(LOWER(obj_class) ORDER BY LOWER(obj_class)) as sorted_classes
-    FROM public."EntityTypes" et
-    CROSS JOIN LATERAL unnest(et.object_class_names) AS obj_class
-    GROUP BY et.id
-)
-UPDATE public."Directory" d
-SET entity_type_id = etc.entity_type_id
-FROM directory_classes dc
-JOIN entity_type_classes etc ON dc.sorted_classes = etc.sorted_classes
-WHERE d.id = dc.directory_id
-AND d.entity_type_id IS NULL;
-            """),
-        )
         await entity_type_dao.attach_entity_type_to_directories()
+        await session.commit()
 
     async def _change_uid_admin(connection: AsyncConnection) -> None:
         session = AsyncSession(bind=connection)
@@ -101,6 +76,7 @@ async def _change_uid_admin(connection: AsyncConnection) -> None:
                 ),
             ),
         )
+        await session.commit()
 
     async def _change_ldap_session_ttl(connection: AsyncConnection) -> None:
         session = AsyncSession(bind=connection)
@@ -115,6 +91,7 @@ async def _change_ldap_session_ttl(connection: AsyncConnection) -> None:
                 ldap_session_ttl=7200,
             ),
         )
+        await session.commit()
 
     op.run_async(_change_uid_admin)
     op.run_async(_change_ldap_session_ttl)

app/ldap_protocol/ldap_schema/entity_type_dao.py

@@ -303,7 +303,7 @@ async def attach_entity_type_to_directories(self) -> None:
                 is_system_entity_type=False,
             )
 
-        return None
+        await self.__session.flush()
 
     async def attach_entity_type_to_directory(
         self,