Skip to content

Commit

Permalink
feat: more building element relations
Browse files Browse the repository at this point in the history
  • Loading branch information
ymarcon committed Jan 27, 2025
1 parent 66acd7a commit 0c4d247
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
20 changes: 19 additions & 1 deletion backend/api/services/buildings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from sqlalchemy.orm import selectinload
from sqlmodel import select
from fastapi import HTTPException
from api.models.domain import FileItem, Building, BuildingMaterial, BuildingElement, Professional, BuildingBuildingMaterial, ProfessionalBuilding
from api.models.domain import FileItem, Building, BuildingMaterial, BuildingElement, BuildingElementProfessional, BuildingElementMaterial, Professional, BuildingBuildingMaterial, ProfessionalBuilding
from api.models.query import BuildingDraft, BuildingResult, BuildingElementDraft
from api.services.building_elements import BuildingElementService
from enacit4r_sql.utils.query import QueryBuilder
Expand Down Expand Up @@ -236,15 +236,33 @@ def _makeTags(self, entity: Building) -> list[str]:
return tags

async def _makeRelations(self, entity: Building) -> list[str]:
# building materials
relations = (await self.session.exec(select(BuildingBuildingMaterial).where(BuildingBuildingMaterial.building_id == entity.id))).all()
relates_to = [
f"building-material:{rel.building_material_id}" for rel in relations]
# professionals
relations = (await self.session.exec(select(ProfessionalBuilding).where(ProfessionalBuilding.building_id == entity.id))).all()
relates_to.extend(
[f"professional:{rel.professional_id}" for rel in relations])
# building elements
relations = (await self.session.exec(select(BuildingElement).where(BuildingElement.building_id == entity.id))).all()
relates_to.extend(
[f"technical-construction:{rel.technical_construction_id}" for rel in relations])
be_ids = [rel.id for rel in relations]
# building elelement professionals
for be_id in be_ids:
relations = (await self.session.exec(select(BuildingElementProfessional).where(BuildingElementProfessional.building_element_id == be_id))).all()
for rel in relations:
pid = f"professional:{rel.professional_id}"
if pid not in relates_to:
relates_to.append(pid)
for be_id in be_ids:
relations = (await self.session.exec(select(BuildingElementMaterial).where(BuildingElementMaterial.building_element_id == be_id))).all()
for rel in relations:
bmid = f"building-material:{rel.building_material_id}"
if bmid not in relates_to:
relates_to.append(bmid)

return relates_to

async def _get_building_materials(self, ids: list[int]):
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/DocumentPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function init() {
return searchService.getDocument(rel, fields);
}),
).then((docs) => {
relationSummaries.value.concat(docs);
relationSummaries.value = relationSummaries.value.concat(docs);
});
});
}
Expand Down

0 comments on commit 0c4d247

Please sign in to comment.