Add: LDAP schema move from models to directories

.github/instructions/*.instructions.md

@@ -0,0 +1,7 @@
+# Instructions for Large PR Reviews
+
+## General Approach for Big Changesets
+- Prioritize high-impact issues: security, performance, errors.
+- Review files individually; skip minor style if >1000 lines total diff.
+- Group feedback by file; limit to 5-10 key comments per file.
+- If diff too large, comment on architecture/summary + top 3 files.

Makefile

@@ -30,9 +30,12 @@ launch:  ## run standalone app without tty container
 	docker compose down
 	docker compose run sh -c "python multidirectory.py --migrate && python ."
 
-rerun_last_migration:  ## re-run migration
+rerun_last_migration:
 	docker exec -it multidirectory_api sh -c "alembic downgrade -1; python multidirectory.py --migrate;"
 
+rerun_all_migrations:
+	docker exec -it multidirectory_api sh -c "alembic downgrade base; python multidirectory.py --migrate;"
+
 down:  ## shutdown services
 	docker compose -f docker-compose.test.yml down --remove-orphans
 	docker compose down --remove-orphans

app/alembic/versions/01f3f05a5b11_add_primary_group_id.py

@@ -21,7 +21,10 @@
 from ldap_protocol.ldap_schema.attribute_value_validator import (
     AttributeValueValidator,
 )
-from ldap_protocol.ldap_schema.entity_type_dao import EntityTypeDAO
+from ldap_protocol.ldap_schema.entity_type.entity_type_dao import EntityTypeDAO
+from ldap_protocol.ldap_schema.entity_type.entity_type_use_case import (
+    EntityTypeUseCase,
+)
 from ldap_protocol.roles.role_use_case import RoleUseCase
 from ldap_protocol.utils.queries import (
     create_group,
@@ -38,14 +41,15 @@
 depends_on: None = None
 
 
-@temporary_stub_column("is_system", sa.Boolean())
+@temporary_stub_column("Directory", "is_system", sa.Boolean())
 def upgrade(container: AsyncContainer) -> None:
     """Upgrade."""
 
     async def _add_domain_computers_group(connection: AsyncConnection) -> None:  # noqa: ARG001
         async with container(scope=Scope.REQUEST) as cnt:
             session = await cnt.get(AsyncSession)
             entity_type_dao = await cnt.get(EntityTypeDAO)
+            entity_type_use_case = await cnt.get(EntityTypeUseCase)
             role_use_case = await cnt.get(RoleUseCase)
 
         base_dn_list = await get_base_directories(session)
@@ -104,7 +108,10 @@ async def _add_domain_computers_group(connection: AsyncConnection) -> None:  # n
                 attribute_names=["attributes"],
                 with_for_update=None,
             )
-            await entity_type_dao.attach_entity_type_to_directory(dir_, False)
+            await entity_type_use_case.attach_entity_type_to_directory(
+                dir_,
+                False,
+            )
             await role_use_case.inherit_parent_aces(
                 parent_directory=parent,
                 directory=dir_,
@@ -169,7 +176,7 @@ async def _add_primary_group_id(connection: AsyncConnection) -> None:  # noqa: A
     op.run_async(_add_primary_group_id)
 
 
-@temporary_stub_column("is_system", sa.Boolean())
+@temporary_stub_column("Directory", "is_system", sa.Boolean())
 def downgrade(container: AsyncContainer) -> None:
     """Downgrade."""
     bind = op.get_bind()

app/alembic/versions/05ddc0bd562a_add_roles.py

@@ -24,7 +24,7 @@
 depends_on: None = None
 
 
-@temporary_stub_column("is_system", sa.Boolean())
+@temporary_stub_column("Directory", "is_system", sa.Boolean())
 def upgrade(container: AsyncContainer) -> None:
     """Upgrade."""
     op.create_table(

app/alembic/versions/16a9fa2c1f1e_rename_readonly_group.py

@@ -25,7 +25,7 @@
 depends_on: None | list[str] = None
 
 
-@temporary_stub_column("is_system", sa.Boolean())
+@temporary_stub_column("Directory", "is_system", sa.Boolean())
 def upgrade(container: AsyncContainer) -> None:  # noqa: ARG001
     """Upgrade."""
     bind = op.get_bind()
@@ -72,7 +72,7 @@ def upgrade(container: AsyncContainer) -> None:  # noqa: ARG001
         session.close()
 
 
-@temporary_stub_column("is_system", sa.Boolean())
+@temporary_stub_column("Directory", "is_system", sa.Boolean())
 def downgrade(container: AsyncContainer) -> None:  # noqa: ARG001
     """Downgrade."""
     bind = op.get_bind()

app/alembic/versions/19d86e660cf2_fix_krbadmin_access.py

@@ -6,11 +6,13 @@
 
 """
 
+import sqlalchemy as sa
 from alembic import op
 from dishka import AsyncContainer, Scope
 from sqlalchemy.ext.asyncio import AsyncConnection, AsyncSession
 
 from enums import RoleConstants
+from extra.alembic_utils import temporary_stub_column
 from ldap_protocol.roles.exceptions import RoleNotFoundError
 from ldap_protocol.roles.role_dao import RoleDAO
 from ldap_protocol.roles.role_use_case import RoleUseCase
@@ -23,6 +25,11 @@
 depends_on: None | list[str] = None
 
 
+@temporary_stub_column(
+    "AccessControlEntries",
+    "attribute_type_name",
+    sa.String(),
+)
 def upgrade(container: AsyncContainer) -> None:
     """Upgrade."""
 

app/alembic/versions/1b71cafba681_replace_attributeTypeId.py

@@ -0,0 +1,101 @@
+"""Delete attributeTypeId add attribute_type_name from AccessControlEntries.
+
+Revision ID: 1b71cafba681
+Revises: 708b01eaf025
+Create Date: 2026-03-24 16:28:49.116712
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from dishka import AsyncContainer, Scope
+from sqlalchemy.ext.asyncio import AsyncConnection, AsyncSession
+
+from ldap_protocol.roles.migrations_ace_dao import (
+    AccessControlEntryDirectoryMappingDAO,
+)
+from ldap_protocol.utils.queries import get_base_directories
+
+# revision identifiers, used by Alembic.
+revision: None | str = "1b71cafba681"
+down_revision: None | str = "708b01eaf025"
+branch_labels: None | list[str] = None
+depends_on: None | list[str] = None
+
+
+def upgrade(container: AsyncContainer) -> None:
+    """Upgrade."""
+
+    async def _map_ace_to_directory_name(connection: AsyncConnection) -> None:  # noqa: ARG001
+        async with container(scope=Scope.REQUEST) as cnt:
+            session = await cnt.get(AsyncSession)
+            ace_dao = await cnt.get(AccessControlEntryDirectoryMappingDAO)
+
+        if not await get_base_directories(session):
+            return
+
+        await ace_dao.upgrade()
+        await session.commit()
+
+    op.add_column(
+        "AccessControlEntries",
+        sa.Column("attribute_type_name", sa.String(), nullable=True),
+    )
+
+    op.run_async(_map_ace_to_directory_name)
+
+    op.drop_index(
+        op.f("idx_ace_attribute_type_id"),
+        table_name="AccessControlEntries",
+        postgresql_using="hash",
+    )
+    op.drop_constraint(
+        op.f("AccessControlEntries_directoryAttributeTypeId_fkey"),
+        "AccessControlEntries",
+        type_="foreignkey",
+    )
+    op.drop_column("AccessControlEntries", "attributeTypeId")
+
+
+def downgrade(container: AsyncContainer) -> None:
+    """Downgrade."""
+
+    async def _map_ace_to_directory_id(connection: AsyncConnection) -> None:  # noqa: ARG001
+        async with container(scope=Scope.REQUEST) as cnt:
+            session = await cnt.get(AsyncSession)
+            ace_dao = await cnt.get(AccessControlEntryDirectoryMappingDAO)
+
+        if not await get_base_directories(session):
+            return
+
+        await ace_dao.downgrade()
+        await session.commit()
+
+    op.add_column(
+        "AccessControlEntries",
+        sa.Column(
+            "attributeTypeId",
+            sa.INTEGER(),
+            autoincrement=False,
+            nullable=True,
+        ),
+    )
+
+    op.run_async(_map_ace_to_directory_id)
+
+    op.create_foreign_key(
+        op.f("AccessControlEntries_directoryAttributeTypeId_fkey"),
+        "AccessControlEntries",
+        "Directory",
+        ["attributeTypeId"],
+        ["id"],
+        ondelete="CASCADE",
+    )
+    op.create_index(
+        op.f("idx_ace_attribute_type_id"),
+        "AccessControlEntries",
+        ["attributeTypeId"],
+        unique=False,
+        postgresql_using="hash",
+    )
+    op.drop_column("AccessControlEntries", "attribute_type_name")