Merge branch 'master' of https://github.com/WSL0809/postpartum_care_c…

…enter_management_system

api/get_all_clients.py

@@ -37,6 +37,7 @@ class ClientGet(BaseModel):
     room: Union[str, None]
     due_date: Union[str, None]
     transaction_price: Union[float, None]
+    id_number: Union[str, None]
 
 
 class GetAllClientsResp(BaseModel):
@@ -63,7 +64,7 @@ def get_clients(db: Session, name: Optional[str], page: int, limit: int):
     base_query = """
     SELECT c.id, c.status, c.name, c.tel, c.age, c.scheduled_date, c.check_in_date, c.hospital_for_childbirth, 
            c.contact_name, c.contact_tel, c.meal_plan_id, c.recovery_plan_id, c.mode_of_delivery, 
-           c.assigned_baby_nurse, c.room, c.due_date, c.transaction_price, 
+           c.assigned_baby_nurse, c.room, c.due_date, c.transaction_price, c.id_number,
            COALESCE(json_agg(b.*) FILTER (WHERE b.baby_id IS NOT NULL), '[]') AS babies
     FROM client c
     LEFT JOIN baby b ON c.id = b.client_id

api/get_all_rooms.py

@@ -14,6 +14,7 @@
 
 
 class GetAllRoomsResp(BaseModel):
+    client_id: Union[int, None]
     room_number: str
     name: Union[str, None]
     baby_nurse_name: Union[str, None]
@@ -41,6 +42,7 @@ def get_all_room_info(current_user: User = Depends(get_current_active_user), db:
         sql = text(
             """
          SELECT room_number,
+           client.id AS client_id,
            client.name AS name,
            client.meal_plan_seller AS meal_plan_seller,
            client.recovery_plan_seller AS recovery_plan_seller,

log_config.yaml

@@ -1,13 +1,20 @@
 version: 1
 formatters:
+  default:
+    format: '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
   access:
     "()": uvicorn.logging.AccessFormatter
-    fmt: '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+
 handlers:
   console:
+    class: logging.StreamHandler
+    formatter: default
+    stream: ext://sys.stdout
+  access_console:
     class: logging.StreamHandler
     formatter: access
     stream: ext://sys.stdout
+
 loggers:
   uvicorn:
     handlers: [console]
@@ -19,5 +26,5 @@ loggers:
     propagate: False
   uvicorn.access:
     level: INFO
-    handlers: [console]
+    handlers: [access_console]
     propagate: False