healthdatalayer 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

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/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/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.dist-info → healthdatalayer-1.5.2.dist-info}/METADATA

@@ -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.dist-info → healthdatalayer-1.5.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ healthdatalayer/config/db.py,sha256=b_SWTINJSVUhR0uyD4h93jPLKUzRm6Ky0tmALWbjM18,
 healthdatalayer/config/vault.py,sha256=9yUMXjaTYSnqr0npcQXDsg6Z7G3DityqpmHl1x42zS0,748
 healthdatalayer/dtos/__init__.py,sha256=yNIWA7EF04esaVDpSymVyeuaotsHdOjLzqk3ygbh59o,71
 healthdatalayer/dtos/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/dtos/collaborator/schedule_collaborator.py,sha256=liF-UDijHIVZdyzvGuniqcXbA6avns65ey1hfnLI0J4,367
+healthdatalayer/dtos/collaborator/schedule_collaborator.py,sha256=SUD7BIMownZuW9h9GUaFy2U9jaDjZ1tB_9-KCv4H0mk,369
 healthdatalayer/models/__init__.py,sha256=ZBY7CL172P68TWRWVTpzHO0_cnFzDRGz7aTy85Z8HPI,2056
 healthdatalayer/models/bridge_area_floor_branch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/bridge_area_floor_branch/area.py,sha256=g_u6RoorLJ7XUx7qcqXLavrHxpflHGi0p77f-3RPbVU,201
@@ -70,7 +70,7 @@ healthdatalayer/repositories/client_repositories/pet_repository.py,sha256=aUjti4
 healthdatalayer/repositories/client_repositories/profession_repository.py,sha256=ALnx_y_z9Jfx9rBDvOdnK1P1_lkqKmFBeR1GVXj3m3Q,2620
 healthdatalayer/repositories/client_repositories/px_repository.py,sha256=cTXDfKolG5aLdlQzXV98_r4Y1Qm5jYW9cUtntdw7e0k,10116
 healthdatalayer/repositories/collaborator_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=xDyLO0DqrbojaXzMBgweamKPDtPYFwURVEFoV0pgBIg,8228
+healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=NBCYH3ziSZ6-SZJDsDVvMrM9oCWYqXpDAUIkh7bzEOo,8261
 healthdatalayer/repositories/collaborator_repositories/collaborator_type_repository.py,sha256=7-bJqbxgsJtyRU7nV_YCZhKufYLlighWBWjglw70nUw,2858
 healthdatalayer/repositories/collaborator_repositories/speciality_repository.py,sha256=tcAjp2OzFAnHpRKNdmw2Zsqvs7XdsO51h7cIJHt105s,2940
 healthdatalayer/repositories/infraestructure_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -89,7 +89,7 @@ healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_
 healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py,sha256=6rubP_KtheyJSvLmpBJwYuPKNsjhSvKi-_HM2QoP1hM,3141
 healthdatalayer/repositories/medical_visit_repositories/medical_drug_repository.py,sha256=mJNN6_aAK3eY9IpFc16nT3IshObGcFE5fi27SK-Sjio,2401
 healthdatalayer/repositories/medical_visit_repositories/medical_recipe_visit_repository.py,sha256=j4cJ4zURKILN3lkqfpXya29MQYFIMiTmJukOADBj5_c,4551
-healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=BmPLxuB22QOPukAAduIKwWq5lQkhKdILF4AuCF7Bj-s,11693
+healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py,sha256=EcnFzcj0wyZN3AVpqNc8SGYJVCG_OUHvajQt3b2a9H4,13853
 healthdatalayer/repositories/medical_visit_repositories/organ_system_review_repository.py,sha256=-BTfgzvt8VlE2FsBHX3snzRl2VDrRClqz-dJL3bLheE,4192
 healthdatalayer/repositories/medical_visit_repositories/physical_exam_repository.py,sha256=Q4R2-6fv57jqZrGUMFQw4YZgZGQbn8UmSRS3UhUSZQg,3877
 healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py,sha256=9Up5M7wWo5GnaYdl6QvTamYaIG4dG_ALM0Su66rlj44,4140
@@ -97,7 +97,7 @@ healthdatalayer/repositories/user_repositories/__init__.py,sha256=47DEQpj8HBSa-_
 healthdatalayer/repositories/user_repositories/permission_repository.py,sha256=3L4y-zCkI2PIRo-L3FJRSk4g3nZnu6q35lEY4ACJyq4,9630
 healthdatalayer/repositories/user_repositories/role_repository.py,sha256=jIsbeAFFQQ_CZJqBMcOskuMXtT1Il6eiN0Y2BpVO1JE,6821
 healthdatalayer/repositories/user_repositories/user_repository.py,sha256=FUCNdRRGc12dq5XuwDT3btvDETt6HGXh_xQIPTLCAvk,9839
-healthdatalayer-1.5.0.dist-info/METADATA,sha256=PSPVrGaysLeAPs1TvTjrEB8abDmrrCIoowfLdrJ0eYw,827
-healthdatalayer-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.5.0.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.5.0.dist-info/RECORD,,
+healthdatalayer-1.5.2.dist-info/METADATA,sha256=ZMt-9bN5bYCyFoch-0_KY6QObIEfsPfB8HSkSLJfwC4,827
+healthdatalayer-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.5.2.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.5.2.dist-info/RECORD,,