healthdatalayer 1.5.1__tar.gz → 1.5.3__tar.gz

{healthdatalayer-1.5.1 → healthdatalayer-1.5.3}/PKG-INFO

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

{healthdatalayer-1.5.1 → healthdatalayer-1.5.3}/healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -1,5 +1,5 @@
 from typing import Optional, List
-from datetime import datetime
+from datetime import datetime, date, time
 from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
@@ -149,6 +149,15 @@ class MedicalVisitRepository:
     def get_by_collaboratorid_and_targetdate_command(self, collaborator_id: UUID, target_date: datetime, active_only: bool = True, load_relations: bool = False) -> List[MedicalVisit]:
         with get_session(self.tenant) as session:
 
+            if isinstance(target_date, str):
+                try:
+                    target_date = datetime.strptime(target_date, "%Y-%m-%d")
+                except ValueError:
+                    raise ValueError("Invalid date format")
+
+            elif isinstance(target_date, date) and not isinstance(target_date, datetime):
+                target_date = datetime.combine(target_date, time.min)
+
             start_of_day = datetime.combine(target_date.date(), datetime.min.time())
             end_of_day = datetime.combine(target_date.date(), datetime.max.time())
 
@@ -197,6 +206,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.1 → healthdatalayer-1.5.3}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.5.1 → healthdatalayer-1.5.3}/setup.py

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