healthdatalayer 1.4.0__tar.gz → 1.4.2__tar.gz

{healthdatalayer-1.4.0 → healthdatalayer-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: healthdatalayer
-Version: 1.4.0
+Version: 1.4.2
 Summary: Health Datalayer to access data from different sources
 Author: Jesus Martinez
 Author-email: jesusmartinez@noosds.com

{healthdatalayer-1.4.0 → healthdatalayer-1.4.2}/healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -1,9 +1,9 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select, or_, join
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import Collaborator
-from healthdatalayer.models import Speciality
+from healthdatalayer.models import Speciality, CollaboratorSpeciality
 from healthdatalayer.config.db import engines, get_session
 
 class CollaboratorRepository:
@@ -41,6 +41,21 @@ class CollaboratorRepository:
                 return collaborator
             else:
                 return session.get(Collaborator, collaborator_id)
+            
+    def get_by_speciality_id_command(self, speciality_id: UUID, load_relations: bool = False) -> List[Collaborator]:
+        with get_session(self.tenant) as session:
+            statement = (
+                select(Collaborator)
+                .join(CollaboratorSpeciality)
+                .where(CollaboratorSpeciality.speciality_id == speciality_id)
+            )
+            
+            if load_relations:
+                statement = statement.options(selectinload(Collaborator.specialties))
+                
+            collaborators = session.exec(statement).all()
+                        
+            return collaborators
     
     def get_by_ruc_name_code_command(self, content: str, active_only: bool = True, load_relations : bool = False)->List[Collaborator]:
         with get_session(self.tenant) as session:

{healthdatalayer-1.4.0 → healthdatalayer-1.4.2}/healthdatalayer/repositories/infraestructure_repositories/bridge_repository.py

@@ -27,7 +27,8 @@ class BridgeAreaFloorBranchRepository:
                 statement = statement.options(
                     selectinload(BridgeAreaFloorBranch.branch).selectinload(Branch.system),
                     selectinload(BridgeAreaFloorBranch.area),
-                    selectinload(BridgeAreaFloorBranch.floor)
+                    selectinload(BridgeAreaFloorBranch.floor),
+                    selectinload(BridgeAreaFloorBranch.room)
                 )
             bridge = session.exec(statement).first()
             
@@ -45,7 +46,8 @@ class BridgeAreaFloorBranchRepository:
                 statement = statement.options(
                     selectinload(BridgeAreaFloorBranch.branch).selectinload(Branch.system),
                     selectinload(BridgeAreaFloorBranch.area),
-                    selectinload(BridgeAreaFloorBranch.floor)
+                    selectinload(BridgeAreaFloorBranch.floor),
+                    selectinload(BridgeAreaFloorBranch.room)
                 )
                
             results = session.exec(statement).all()

{healthdatalayer-1.4.0 → healthdatalayer-1.4.2}/healthdatalayer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: healthdatalayer
-Version: 1.4.0
+Version: 1.4.2
 Summary: Health Datalayer to access data from different sources
 Author: Jesus Martinez
 Author-email: jesusmartinez@noosds.com

{healthdatalayer-1.4.0 → healthdatalayer-1.4.2}/setup.py

@@ -5,7 +5,7 @@ with open('requirements.txt') as f:
 
 setup(
     name="healthdatalayer",
-    version="1.4.0",
+    version="1.4.2",
     include_package_data=True,
     python_requires='>=3.10',
     packages=find_packages(),