healthdatalayer 1.4.2__tar.gz → 1.4.3__tar.gz

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

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

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

@@ -23,20 +23,11 @@ class CollaboratorRepository:
         with get_session(self.tenant) as session:
             if load_relations:
                 statement = select(Collaborator).where(Collaborator.collaborator_id == collaborator_id).options(
-                    selectinload(Collaborator.specialties)
+                    selectinload(Collaborator.collaborator_type),
+                    joinedload(Collaborator.user),
+                    selectinload(Collaborator.specialties) 
                 )
                 collaborator = session.exec(statement).first()
-                if load_relations:
-                    
-                    if collaborator.collaborator_type_id:
-                        from healthdatalayer.models.collaborator.collaborator_type import CollaboratorType
-                        collab_type_obj = session.get(CollaboratorType, collaborator.collaborator_type_id)
-                        object.__setattr__(collaborator,'collaborator_type', collab_type_obj)
-                        
-                    if collaborator.user_id:
-                        from healthdatalayer.models.user.user import User
-                        user_obj = session.get(User, collaborator.user_id)
-                        object.__setattr__(collaborator,'user',user_obj)
                         
                 return collaborator
             else:
@@ -47,11 +38,15 @@ class CollaboratorRepository:
             statement = (
                 select(Collaborator)
                 .join(CollaboratorSpeciality)
-                .where(CollaboratorSpeciality.speciality_id == speciality_id)
+                .where(CollaboratorSpeciality.speciality_id == speciality_id, Collaborator.is_active == True)
             )
             
             if load_relations:
-                statement = statement.options(selectinload(Collaborator.specialties))
+                statement = statement.options(
+                    selectinload(Collaborator.collaborator_type),
+                    joinedload(Collaborator.user),
+                    selectinload(Collaborator.specialties)    
+                )
                 
             collaborators = session.exec(statement).all()
                         
@@ -92,29 +87,19 @@ class CollaboratorRepository:
     def get_all_command(self, active_only: bool = True,load_related: bool = False) -> List[Collaborator]:
         with get_session(self.tenant) as session:
             
+            statement = select(Collaborator)
             
             if load_related:
                 
-                statement = select(Collaborator).options(
-                    selectinload(Collaborator.specialties)
-                )
-                if active_only:
-                    statement = statement.where(Collaborator.is_active == True)
-                collaborators = session.exec(statement).all()
-                
-                for collaborator in collaborators:
-                    if collaborator.collaborator_type_id:
-                        from healthdatalayer.models.collaborator.collaborator_type import CollaboratorType
-                        collab_type_obj = session.get(CollaboratorType, collaborator.collaborator_type_id)
-                        object.__setattr__(collaborator,'collaborator_type', collab_type_obj)
-                        
-                    if collaborator.user_id:
-                        from healthdatalayer.models.user.user import User
-                        user_obj = session.get(User, collaborator.user_id)
-                        object.__setattr__(collaborator,'user',user_obj)
-                return collaborators
+                statement = statement.options(
+                    selectinload(Collaborator.collaborator_type),
+                    joinedload(Collaborator.user),
+                    selectinload(Collaborator.specialties) 
+                )         
             
-            statement = select(Collaborator)
+            if active_only:
+                statement = statement.where(Collaborator.is_active == True)
+                
             return session.exec(statement).all()
     
     def update_command(self, collaborator: Collaborator) -> Collaborator:

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

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

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

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