healthdatalayer 1.4.5__tar.gz → 1.5.0__tar.gz

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

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

healthdatalayer-1.5.0/healthdatalayer/dtos/__init__.py

@@ -0,0 +1 @@
+from .collaborator.schedule_collaborator import ScheduleCollaboratorDTO

healthdatalayer-1.5.0/healthdatalayer/dtos/collaborator/schedule_collaborator.py

@@ -0,0 +1,13 @@
+from pydantic import BaseModel, Field
+from typing import List
+from datetime import time
+
+class ScheduleCollaboratorDTO(BaseModel):
+    
+    available_schedules: List[str] = Field(default_factory=list)
+    busy_schedules: List[str] = Field(default_factory=list)
+    
+    class Config:
+        json_encoders = {
+            time: lambda v: v.strftime('%H:%M')
+        }

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

@@ -1,9 +1,11 @@
+from datetime import date
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_, join
+from sqlmodel import select, or_, join, text
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import Collaborator
 from healthdatalayer.models import Speciality, CollaboratorSpeciality
+from healthdatalayer.dtos import ScheduleCollaboratorDTO
 from healthdatalayer.config.db import engines, get_session
 
 class CollaboratorRepository:
@@ -147,4 +149,48 @@ class CollaboratorRepository:
                 session.commit()
                 session.refresh(collab)
             
-            return collab
+            return collab
+    
+    def get_availability_schedules_command(self, visit_date: date, collaborator_id: str) -> ScheduleCollaboratorDTO:
+    
+        with get_session(self.tenant) as session:
+            
+            query = text("""
+                WITH horarios_generados AS (
+                    SELECT horario::TIME as hora
+                    FROM generate_series(
+                        :fecha::DATE + TIME '08:00:00',
+                        :fecha::DATE + TIME '17:00:00',
+                        INTERVAL '30 minutes'
+                    ) AS horario
+                ),
+                horarios_ocupados AS (
+                    SELECT t.visit_date::TIME as hora
+                    FROM medical_visit t
+                    WHERE t.visit_date::DATE = :fecha
+                    AND t.collaborator_id = :colab_id
+                )
+                SELECT 
+                    hg.hora,
+                    CASE WHEN ho.hora IS NOT NULL THEN true ELSE false END as ocupado
+                FROM horarios_generados hg
+                LEFT JOIN horarios_ocupados ho ON hg.hora = ho.hora
+                ORDER BY hg.hora
+            """)
+            
+            result = session.exec(query, {"fecha": visit_date, "colab_id": collaborator_id})
+            
+            availables = []
+            busy = []
+            
+            for row in result:
+                hour, is_busy = row[0], row[1]
+                if is_busy:
+                    busy.append(hour)
+                else:
+                    availables.append(hour)
+            
+            return ScheduleCollaboratorDTO(
+                available_schedules=availables,
+                busy_schedules=busy
+            )

{healthdatalayer-1.4.5 → healthdatalayer-1.5.0}/healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py

@@ -21,6 +21,36 @@ class MedicalDiagnosisRepository:
     def get_by_id_command(self, medical_diagnosis_id: UUID) -> Optional[MedicalDiagnosis]:
         with get_session(self.tenant) as session:
             return session.get(MedicalDiagnosis, medical_diagnosis_id)
+
+    def get_by_name_command(self, name:str, active_only: bool = True) -> Optional[MedicalDiagnosis]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.name == name)
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).first()
+            return medical_diagnosis
+    
+    def get_by_name_ilike_command(self, name:str, active_only: bool = True) -> List[MedicalDiagnosis]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.name.ilike(f"%{name}%"))
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).all()
+            return medical_diagnosis
+    
+    def get_by_code_command(self, code:str, active_only: bool = True) -> Optional[MedicalDiagnosis]:
+        with get_session(self.tenant) as session:
+            statement = select(MedicalDiagnosis).where(MedicalDiagnosis.cie_10_code == code)
+            
+            if active_only:
+                statement = statement.where(MedicalDiagnosis.is_active == True)
+            
+            medical_diagnosis = session.exec(statement).first()
+            return medical_diagnosis
     
     def list_all_command(self, active_only: bool = True) -> List[MedicalDiagnosis]:
         with get_session(self.tenant) as session:

{healthdatalayer-1.4.5 → healthdatalayer-1.5.0}/healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py

@@ -33,10 +33,27 @@ class MedicalDiagnosisVisitRepository:
             else:
                 return session.get(MedicalDiagnosisVisit, medical_diagnosis_visit_id)
     
-    def get_by_medical_visit_id_command(self, medical_visit_id: UUID, load_relations: bool = False) ->Optional[MedicalDiagnosisVisit]:
+    def get_by_medical_visit_id_command(self, medical_visit_id: UUID, load_relations: bool = False) ->List[MedicalDiagnosisVisit]:
         with get_session(self.tenant) as session:
             
             statement = select(MedicalDiagnosisVisit).where(MedicalDiagnosisVisit.medical_visit_id == medical_visit_id)
+            if load_relations:
+                statement = statement.options(
+                    joinedload(MedicalDiagnosisVisit.medical_visit),
+                    joinedload(MedicalDiagnosisVisit.medical_diagnosis)
+                )
+            medical_diagnosis_visits = session.exec(statement).all()
+            
+            return medical_diagnosis_visits
+    
+    def get_by_medicalvisitid_and_diagnosisid_command(self, medical_visit_id: UUID, medical_diagnosis_id: UUID, load_relations: bool = False) ->Optional[MedicalDiagnosisVisit]:
+        with get_session(self.tenant) as session:
+            
+            statement = select(MedicalDiagnosisVisit).where(
+                MedicalDiagnosisVisit.medical_visit_id == medical_visit_id,
+                MedicalDiagnosisVisit.medical_diagnosis_id == medical_diagnosis_id
+            )
+
             if load_relations:
                 statement = statement.options(
                     joinedload(MedicalDiagnosisVisit.medical_visit),
@@ -46,7 +63,7 @@ class MedicalDiagnosisVisitRepository:
             
             return medical_diagnosis_visit
     
-    def get_all_command(self, active_only: bool = True,load_related: bool = False) -> List[MedicalDiagnosisVisit]:
+    def list_all_command(self, active_only: bool = True,load_related: bool = False) -> List[MedicalDiagnosisVisit]:
         with get_session(self.tenant) as session:
             
             statement = select(MedicalDiagnosisVisit)

{healthdatalayer-1.4.5 → healthdatalayer-1.5.0}/healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py

@@ -1,6 +1,6 @@
 from typing import Optional, List
 from uuid import UUID
-from sqlmodel import select, or_
+from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
 from healthdatalayer.models import VisitTriage
 from healthdatalayer.models import MedicalVisit
@@ -86,4 +86,10 @@ class VisitTriageRepository:
             else:
                 session.delete(existing_visit_triage)
 
-            session.commit()
+            session.commit()
+
+    def exists_by_medical_visit_id_command(self, medical_visit_id: UUID) -> bool:
+        with get_session(self.tenant) as session:
+            statement = select(VisitTriage).where(VisitTriage.medical_visit_id == medical_visit_id)
+            result = session.exec(statement).first()
+            return result is not None

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

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

{healthdatalayer-1.4.5 → healthdatalayer-1.5.0}/healthdatalayer.egg-info/SOURCES.txt

@@ -10,6 +10,9 @@ healthdatalayer/config/__init__.py
 healthdatalayer/config/config.py
 healthdatalayer/config/db.py
 healthdatalayer/config/vault.py
+healthdatalayer/dtos/__init__.py
+healthdatalayer/dtos/collaborator/__init__.py
+healthdatalayer/dtos/collaborator/schedule_collaborator.py
 healthdatalayer/models/__init__.py
 healthdatalayer/models/bridge_area_floor_branch/__init__.py
 healthdatalayer/models/bridge_area_floor_branch/area.py

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

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