healthdatalayer 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

healthdatalayer/models/__init__.py

@@ -24,6 +24,8 @@ from .client.pathological_history import PathologicalHistory
 from .client.pet import Pet
 from .client.profession import Profession
 from .client.px import Px
+from .client.state import State
+from .client.city import City
 
 from .collaborator.collaborator_speciality import CollaboratorSpeciality
 from .collaborator.collaborator import Collaborator

healthdatalayer/models/client/city.py

@@ -0,0 +1,11 @@
+import uuid
+from sqlmodel import SQLModel,Field
+from typing import Optional
+
+class City(SQLModel,table=True):
+    __tablename__ = "city"
+    
+    city_id:uuid.UUID=Field(default_factory=uuid.uuid4,primary_key=True)
+    name:str
+    state_id: Optional[uuid.UUID] = Field(default=None, foreign_key="state.state_id")
+    is_active: bool = Field(default=True)

healthdatalayer/models/client/px.py

@@ -20,9 +20,11 @@ class Px(Client, table=True):
     profession_id: Optional[uuid.UUID] = Field(default=None, foreign_key="profession.profession_id")
     education_id: Optional[uuid.UUID] = Field(default=None, foreign_key="education.education_id")
     user_id: Optional[uuid.UUID] = Field(default=None, foreign_key="user.user_id")
+    nationality_id: Optional[uuid.UUID] = Field(default=None, foreign_key="nationality.nationality_id")
 
 Px.marriage_status = Relationship()
 Px.profession = Relationship()
 Px.education = Relationship()
 Px.user = Relationship()
+Px.nationality = Relationship()
 Px.medical_labs = Relationship(back_populates="pxs", link_model="ClientLab")

healthdatalayer/models/client/state.py

@@ -0,0 +1,9 @@
+import uuid
+from sqlmodel import SQLModel,Field
+
+class State(SQLModel,table=True):
+    __tablename__ = "state"
+    
+    state_id:uuid.UUID=Field(default_factory=uuid.uuid4,primary_key=True)
+    name:str
+    is_active: bool = Field(default=True)

healthdatalayer/repositories/client_repositories/address_repository.py

@@ -2,7 +2,7 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from healthdatalayer.models import Address
+from healthdatalayer.models import Address, City, State
 from healthdatalayer.config.db import engines, get_session
 
 class AddressRepository:
@@ -61,4 +61,34 @@ class AddressRepository:
                 session.delete(db_address)
             
             session.commit()
-            return True
+            return True
+        
+    def list_all_state_command(self, active_only: bool = True) -> List[Address]:
+        with get_session(self.tenant) as session:
+            statement = select(State)
+            
+            if active_only:
+                statement = statement.where(State.is_active == True)
+            
+            results = session.exec(statement)
+            return results.all()
+    
+    def list_all_city_command(self, active_only: bool = True) -> List[Address]:
+        with get_session(self.tenant) as session:
+            statement = select(City)
+            
+            if active_only:
+                statement = statement.where(City.is_active == True)
+            
+            results = session.exec(statement)
+            return results.all()
+    
+    def list_city_by_state_id_command(self,state_id: UUID, active_only: bool = True) -> List[Address]:
+        with get_session(self.tenant) as session:
+            statement = select(City).where(City.state_id == state_id)
+            
+            if active_only:
+                statement = statement.where(State.is_active == True)
+            
+            results = session.exec(statement)
+            return results.all()

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

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

{healthdatalayer-1.4.2.dist-info → healthdatalayer-1.4.4.dist-info}/RECORD

@@ -3,7 +3,7 @@ healthdatalayer/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 healthdatalayer/config/config.py,sha256=vyqrlHDgCGpYX7V9fDn4g671lUU1RuWlSYCIazI-SqQ,689
 healthdatalayer/config/db.py,sha256=b_SWTINJSVUhR0uyD4h93jPLKUzRm6Ky0tmALWbjM18,342
 healthdatalayer/config/vault.py,sha256=9yUMXjaTYSnqr0npcQXDsg6Z7G3DityqpmHl1x42zS0,748
-healthdatalayer/models/__init__.py,sha256=aHts_4fmmSgAGlKe-qZ9aCXjeYPBVaB-VM4LqH-y4_4,1994
+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
 healthdatalayer/models/bridge_area_floor_branch/branch.py,sha256=lW2pbZVKkQeEWuShOLKFiNJAKt01mBswczk1hRELInw,515
@@ -13,6 +13,7 @@ healthdatalayer/models/bridge_area_floor_branch/room.py,sha256=nub6QIFyl6ZxGENru
 healthdatalayer/models/bridge_area_floor_branch/system.py,sha256=10r59kLMsLEv9cKa4hEZJoFAicVPS0rw4UNiN5nhsnI,212
 healthdatalayer/models/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/client/address.py,sha256=rc_Vw9qWECmGcf0GGTChZZj8m6whWSFFGA3xIcsYaBk,343
+healthdatalayer/models/client/city.py,sha256=TYSthPrhdb9iTzDSUC9ZGmx7ZZ0PacxNS2S3ajMhnJU,355
 healthdatalayer/models/client/client.py,sha256=DjW64iOeGKPluKLqyWTTHVste0Y3pF0VL_FvHNLtvyM,786
 healthdatalayer/models/client/client_type.py,sha256=ElTYCXLkVItIhEIj2ZhXqHV872kY4A7gUuhwpm-BKjQ,261
 healthdatalayer/models/client/education.py,sha256=MQN-7Oh1PdneytDmm1DZuZ7wrXzXSTeu08SeKhZ0fi8,256
@@ -23,7 +24,8 @@ healthdatalayer/models/client/nationality.py,sha256=k1CKQTQIJAJP_qmeYB-AkRQ1Q5x9
 healthdatalayer/models/client/pathological_history.py,sha256=8jsOAaSGqk1M-60sLhoJuuz9MeUKbk693dARXgBriTY,1029
 healthdatalayer/models/client/pet.py,sha256=y7jiNF_9Jri0_55geo2hweEj4zdsHKu9ZCelBwfVWeA,516
 healthdatalayer/models/client/profession.py,sha256=eKX6Gf93qwQg2NyJsXKKbmEwQTxHvJCnOwQ5pxCpM0I,259
-healthdatalayer/models/client/px.py,sha256=R1RsEwLx3fQ8fPX5Mq7FrWtoexgL-RddDMs_D2PYs5Y,959
+healthdatalayer/models/client/px.py,sha256=4HgPzbm_OdaQvOHC5-QLQA35VTK83QkaqX-rUF2kVYk,1095
+healthdatalayer/models/client/state.py,sha256=G_AJOKKfkufZw_axfwSrcL3ZVtKY1FOm0AmCcHfn9Ao,244
 healthdatalayer/models/collaborator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 healthdatalayer/models/collaborator/collaborator.py,sha256=Hju_VTUEgA22KJ5-lr-8dl8UsgeSEj2c5OxuGjU71oM,1064
 healthdatalayer/models/collaborator/collaborator_speciality.py,sha256=TQK8dbbM7LE14MpEpWjTmcYRJCOLlBGxQwrs7zkR5ao,346
@@ -52,7 +54,7 @@ healthdatalayer/models/user/role_user.py,sha256=HBLzwY5712DISqBTxrVOrNjnUOAHSYUf
 healthdatalayer/models/user/user.py,sha256=Fc1m5xluZMZPHe_TIsRu43dOXdjk3TNU4drrMLcfb9g,975
 healthdatalayer/repositories/__init__.py,sha256=mu3VrCXi7GBJqwjsJHWDuyFFTX0wqBZzmJ7CyAypP6U,2766
 healthdatalayer/repositories/client_repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-healthdatalayer/repositories/client_repositories/address_repository.py,sha256=CPU4jayxAZVPCQaezINxQM3f87ls-Y8xfxlAfZaj8Hc,2240
+healthdatalayer/repositories/client_repositories/address_repository.py,sha256=Ae2rHG0zXyqoovcfyGh1hMPBQKLoBVKR5SlytnPO5iA,3436
 healthdatalayer/repositories/client_repositories/client_type_repository.py,sha256=RddxYRoBpktXqbLZy2JC2MDWaXCq9_Auhk1peqe9hSw,2637
 healthdatalayer/repositories/client_repositories/education_repository.py,sha256=T-coaux5h35nkvOr9VPi7Ri_ETtlPdziJAhF2pCFNDo,2583
 healthdatalayer/repositories/client_repositories/emergency_contact_repository.py,sha256=kCPrVY1thMJ1tcybaRupw9L8RB4GhnYbYPincH8bRFI,3259
@@ -64,7 +66,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=JB0UdtUEJEY8y33EIT51wHNytroXw_4aVg1U4KmGmGw,7572
+healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py,sha256=aYew_0UMYRvng3DgP5vnKbSVmYe8ozYWUnLly6LxTcI,6467
 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
@@ -91,7 +93,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.4.2.dist-info/METADATA,sha256=gP7YXWYYDnmmDfIUJ3I1iwFwdZCitP_pK2z9rrSM6sA,827
-healthdatalayer-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-healthdatalayer-1.4.2.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
-healthdatalayer-1.4.2.dist-info/RECORD,,
+healthdatalayer-1.4.4.dist-info/METADATA,sha256=Bve8ZfDL4fPSh3MDTlCtYY0HSC-t2mCTT2y2x1Iskx4,827
+healthdatalayer-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+healthdatalayer-1.4.4.dist-info/top_level.txt,sha256=6f1-gvpg533UEVuYsRJCDhdSDQUBwijyAHylyS4nG_4,16
+healthdatalayer-1.4.4.dist-info/RECORD,,