healthdatalayer 1.5.0__tar.gz → 1.5.2__tar.gz

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/PKG-INFO

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

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/healthdatalayer/dtos/collaborator/schedule_collaborator.py

@@ -4,8 +4,8 @@ from datetime import time
 
 class ScheduleCollaboratorDTO(BaseModel):
     
-    available_schedules: List[str] = Field(default_factory=list)
-    busy_schedules: List[str] = Field(default_factory=list)
+    available_schedules: List[time] = Field(default_factory=list)
+    busy_schedules: List[time] = Field(default_factory=list)
     
     class Config:
         json_encoders = {

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -159,8 +159,8 @@ class CollaboratorRepository:
                 WITH horarios_generados AS (
                     SELECT horario::TIME as hora
                     FROM generate_series(
-                        :fecha::DATE + TIME '08:00:00',
-                        :fecha::DATE + TIME '17:00:00',
+                        CAST(:fecha AS DATE)+ TIME '08:00:00',
+                        CAST(:fecha AS DATE) + TIME '17:00:00',
                         INTERVAL '30 minutes'
                     ) AS horario
                 ),
@@ -178,12 +178,12 @@ class CollaboratorRepository:
                 ORDER BY hg.hora
             """)
             
-            result = session.exec(query, {"fecha": visit_date, "colab_id": collaborator_id})
+            result = session.exec(query, params={"fecha": visit_date, "colab_id": collaborator_id})
             
             availables = []
             busy = []
             
-            for row in result:
+            for row in result.fetchall():
                 hour, is_busy = row[0], row[1]
                 if is_busy:
                     busy.append(hour)

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -197,6 +197,48 @@ class MedicalVisitRepository:
             
             medical_visit = session.exec(statement).first()
             return medical_visit
+        
+    def get_first_by_clientid_command(self, client_id: UUID, active_only: bool = True, load_relations: bool = False) -> Optional[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            statement = select(MedicalVisit).where(MedicalVisit.client_id == client_id).order_by(MedicalVisit.visit_date.asc())
+
+            if active_only:
+                statement = statement.where(MedicalVisit.is_active == True)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalVisit.client),
+                    joinedload(MedicalVisit.collaborator),
+                    joinedload(MedicalVisit.speciality),
+                    selectinload(MedicalVisit.medical_diagnosis_visits),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visit = session.exec(statement).first()
+            return medical_visit
+    
+    def get_last_by_clientid_command(self, client_id: UUID, active_only: bool = True, load_relations: bool = False) -> Optional[MedicalVisit]:
+        with get_session(self.tenant) as session:
+
+            statement = select(MedicalVisit).where(MedicalVisit.client_id == client_id).order_by(MedicalVisit.visit_date.desc())
+
+            if active_only:
+                statement = statement.where(MedicalVisit.is_active == True)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalVisit.client),
+                    joinedload(MedicalVisit.collaborator),
+                    joinedload(MedicalVisit.speciality),
+                    selectinload(MedicalVisit.medical_diagnosis_visits),
+                    selectinload(MedicalVisit.medical_recipe_visits),
+                    selectinload(MedicalVisit.organ_system_reviews),
+                    selectinload(MedicalVisit.physical_exams)
+                )
+            
+            medical_visit = session.exec(statement).first()
+            return medical_visit
     
     def update_command(self, medical_visit: MedicalVisit) -> MedicalVisit:
         with get_session(self.tenant) as session:

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.5.0 → healthdatalayer-1.5.2}/setup.py

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