Issue #790: Fix entityIdPath

components/lif/mdr_dto/transformation_dto.py

@@ -1,8 +1,8 @@
-from pydantic import BaseModel
-from typing import List, Optional
 from datetime import datetime
+from typing import List, Optional
 
 from lif.datatypes.mdr_sql_model import ExpressionLanguageType
+from pydantic import BaseModel
 
 
 class TransformationAttributeDTO(BaseModel):
@@ -24,7 +24,7 @@ class Config:
 
 
 class CreateTransformationAttributeDTO(BaseModel):
-    AttributeId: int
+    AttributeId: Optional[int] = None  # No longer used
     EntityId: Optional[int] = None  # Existing column
     # AttributeName: Optional[str] = None
     # EntityName: Optional[str] = None

components/lif/mdr_services/entity_association_service.py

@@ -1,4 +1,5 @@
 from typing import List, Optional
+
 from fastapi import HTTPException
 from lif.datatypes.mdr_sql_model import DataModel, DataModelType, Entity, EntityAssociation, ExtInclusionsFromBaseDM
 from lif.mdr_dto.entity_association_dto import (
@@ -11,9 +12,8 @@
 from lif.mdr_services.helper_service import check_datamodel_by_id, check_entity_by_id
 from lif.mdr_utils.logger_config import get_logger
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlmodel import or_, select
 from sqlalchemy.orm import aliased
-
+from sqlmodel import or_, select
 
 logger = get_logger(__name__)
 
@@ -61,6 +61,24 @@ async def check_existing_association(
     return result.scalar_one_or_none() is not None
 
 
+async def check_entity_association_strict(
+    session: AsyncSession, parent_entity_id: int, child_entity_id: int, extended_by_data_model_id: int | None
+) -> None:
+    query = select(EntityAssociation).where(
+        EntityAssociation.ParentEntityId == parent_entity_id,
+        EntityAssociation.ChildEntityId == child_entity_id,
+        EntityAssociation.Deleted == False,
+        EntityAssociation.ExtendedByDataModelId == extended_by_data_model_id,
+    )
+    result = await session.execute(query)
+    association = result.scalar_one_or_none() is not None
+    if not association:
+        raise HTTPException(
+            status_code=404,
+            detail=f"Entity {child_entity_id} with parent {parent_entity_id} not found in data model association with extended-by data model of '{extended_by_data_model_id}'",
+        )
+
+
 async def validate_entity_associations_for_transformation_attribute(
     session: AsyncSession, transformation_attribute: TransformationAttributeDTO
 ) -> bool:

components/lif/mdr_services/entity_attribute_association_service.py

@@ -1,6 +1,6 @@
 from typing import List, Optional, Tuple
+
 from fastapi import HTTPException
-from sqlalchemy import Select, func, or_, select
 from lif.datatypes.mdr_sql_model import (
     Attribute,
     DataModelType,
@@ -15,6 +15,7 @@
 )
 from lif.mdr_services.helper_service import check_attribute_by_id, check_datamodel_by_id, check_entity_by_id
 from lif.mdr_utils.logger_config import get_logger
+from sqlalchemy import Select, func, or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 logger = get_logger(__name__)
@@ -41,6 +42,24 @@ async def check_existing_association(
     return result.scalar_one_or_none() is not None
 
 
+async def check_entity_attribute_association_strict(
+    session: AsyncSession, entity_id: int, attribute_id: int, extended_by_data_model_id: int | None
+) -> None:
+    query = select(EntityAttributeAssociation).where(
+        EntityAttributeAssociation.EntityId == entity_id,
+        EntityAttributeAssociation.AttributeId == attribute_id,
+        EntityAttributeAssociation.Deleted == False,
+        EntityAttributeAssociation.ExtendedByDataModelId == extended_by_data_model_id,
+    )
+    result = await session.execute(query)
+    association = result.scalar_one_or_none() is not None
+    if not association:
+        raise HTTPException(
+            status_code=404,
+            detail=f"Attribute {attribute_id} association with entity {entity_id} not found in data model association with extended-by data model of '{extended_by_data_model_id}'",
+        )
+
+
 async def create_entity_attribute_association(session: AsyncSession, data: CreateEntityAttributeAssociationDTO):
     # checking if provided entity id and attribute id exist or not
     entity = await check_entity_by_id(session=session, id=data.EntityId)

components/lif/mdr_services/inclusions_service.py

@@ -1,12 +1,12 @@
 from fastapi import HTTPException
+from lif.datatypes.mdr_sql_model import DatamodelElementType, EntityAttributeAssociation, ExtInclusionsFromBaseDM
 from lif.mdr_dto.inclusion_dto import CreateInclusionDTO, InclusionDTO, UpdateInclusionDTO
 from lif.mdr_services.attribute_service import get_attribute_by_id
 from lif.mdr_services.entity_service import get_entity_by_id
 from lif.mdr_services.helper_service import check_datamodel_by_id
 from lif.mdr_utils.logger_config import get_logger
 from sqlalchemy.ext.asyncio import AsyncSession
-from lif.datatypes.mdr_sql_model import EntityAttributeAssociation, ExtInclusionsFromBaseDM
-from sqlmodel import select, func
+from sqlmodel import func, select
 
 logger = get_logger(__name__)
 
@@ -229,3 +229,19 @@ async def get_attribute_inclusions_by_data_model_id_and_entity_id(
     inclusions = result.scalars().all()
     inclusion_dtos = [InclusionDTO.from_orm(inclusion) for inclusion in inclusions]
     return inclusion_dtos
+
+
+async def check_existing_inclusion(
+    session: AsyncSession, type: DatamodelElementType, node_id: int, included_by_data_model_id: int
+) -> None:
+    query = select(ExtInclusionsFromBaseDM).where(
+        ExtInclusionsFromBaseDM.ExtDataModelId == included_by_data_model_id,
+        ExtInclusionsFromBaseDM.IncludedElementId == node_id,
+        ExtInclusionsFromBaseDM.ElementType == type,
+        ExtInclusionsFromBaseDM.Deleted == False,
+    )
+    result = await session.execute(query)
+    if result.scalar_one_or_none() is None:
+        raise HTTPException(
+            status_code=404, detail=f"Inclusion of {type} {node_id} not found in data model {included_by_data_model_id}"
+        )