healthdatalayer 1.4.3__tar.gz → 1.4.4__tar.gz

{healthdatalayer-1.4.3 → healthdatalayer-1.4.4}/PKG-INFO

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

{healthdatalayer-1.4.3 → healthdatalayer-1.4.4}/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-1.4.4/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-1.4.3 → healthdatalayer-1.4.4}/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-1.4.4/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-1.4.3 → healthdatalayer-1.4.4}/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-1.4.3 → healthdatalayer-1.4.4}/healthdatalayer.egg-info/PKG-INFO

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

{healthdatalayer-1.4.3 → healthdatalayer-1.4.4}/healthdatalayer.egg-info/SOURCES.txt

@@ -20,6 +20,7 @@ healthdatalayer/models/bridge_area_floor_branch/room.py
 healthdatalayer/models/bridge_area_floor_branch/system.py
 healthdatalayer/models/client/__init__.py
 healthdatalayer/models/client/address.py
+healthdatalayer/models/client/city.py
 healthdatalayer/models/client/client.py
 healthdatalayer/models/client/client_type.py
 healthdatalayer/models/client/education.py
@@ -31,6 +32,7 @@ healthdatalayer/models/client/pathological_history.py
 healthdatalayer/models/client/pet.py
 healthdatalayer/models/client/profession.py
 healthdatalayer/models/client/px.py
+healthdatalayer/models/client/state.py
 healthdatalayer/models/collaborator/__init__.py
 healthdatalayer/models/collaborator/collaborator.py
 healthdatalayer/models/collaborator/collaborator_speciality.py

{healthdatalayer-1.4.3 → healthdatalayer-1.4.4}/setup.py

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