Merge pull request #619 from MultiDirectoryLab/fix_modify_entry

add: modify_dn: attach entity to dir

Author: rimu-stack

app/ldap_protocol/ldap_requests/modify_dn.py

@@ -19,6 +19,7 @@
     INVALID_ACCESS_RESPONSE,
     ModifyDNResponse,
 )
+from ldap_protocol.ldap_schema.entity_type_dao import EntityTypeDAO
 from ldap_protocol.policies.access_policy import mutate_ap
 from ldap_protocol.utils.queries import (
     get_filter_from_path,
@@ -89,6 +90,7 @@ async def handle(
         self,
         ldap_session: LDAPSession,
         session: AsyncSession,
+        entity_type_dao: EntityTypeDAO,
     ) -> AsyncGenerator[ModifyDNResponse, None]:
         """Handle message with current user."""
         if not ldap_session.user:
@@ -254,10 +256,20 @@ async def handle(
 
             # NOTE: update relationship, don't delete row
             await session.refresh(directory)
-
             await session.delete(directory)
             await session.flush()
 
+            await session.refresh(
+                instance=new_directory,
+                attribute_names=["attributes"],
+                with_for_update=None,
+            )
+            await entity_type_dao.attach_entity_type_to_directory(
+                directory=new_directory,
+                is_system_entity_type=False,
+            )
+            await session.flush()
+
         await session.commit()
 
         yield ModifyDNResponse(result_code=LDAPCodes.SUCCESS)

tests/test_ldap/test_util/test_modify.py

@@ -450,7 +450,10 @@ async def test_ldap_modify_dn(
 
     assert await session.scalar(
         select(Directory)
-        .filter(Directory.path == ["dc=test", "dc=md", "ou=users", "cn=user2"])
+        .filter(
+            Directory.path == ["dc=test", "dc=md", "ou=users", "cn=user2"],
+            Directory.entity_type_name.isnot(None),
+        )
     )  # fmt: skip