From a3f9111ffe42f63c82b460e2e5f40b128cb4699e Mon Sep 17 00:00:00 2001 From: Pedro Nascimento Date: Mon, 2 Sep 2024 13:34:29 -0300 Subject: [PATCH] using cpf_particao to query --- app/routers/frontend.py | 6 +++--- app/types/frontend.py | 22 +++++++++++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/routers/frontend.py b/app/routers/frontend.py index c780cc8..562dff1 100644 --- a/app/routers/frontend.py +++ b/app/routers/frontend.py @@ -59,7 +59,7 @@ async def get_patient_header( f""" SELECT * FROM `{BIGQUERY_PROJECT}`.{BIGQUERY_PATIENT_HEADER_TABLE_ID} - WHERE cpf = '{cpf}' + WHERE cpf_particao = {cpf} """, from_file="/tmp/credentials.json", ) @@ -88,7 +88,7 @@ async def get_patient_summary( f""" SELECT * FROM `{BIGQUERY_PROJECT}`.{BIGQUERY_PATIENT_SUMMARY_TABLE_ID} - WHERE cpf = '{cpf}' + WHERE cpf_particao = {cpf} """, from_file="/tmp/credentials.json", ) @@ -123,7 +123,7 @@ async def get_patient_encounters( f""" SELECT * FROM `{BIGQUERY_PROJECT}`.{BIGQUERY_PATIENT_ENCOUNTERS_TABLE_ID} - WHERE cpf = '{cpf}' and exibicao.indicador = true + WHERE cpf_particao = {cpf} and exibicao.indicador = true """, from_file="/tmp/credentials.json", ) diff --git a/app/types/frontend.py b/app/types/frontend.py index 60743cc..044ab9a 100644 --- a/app/types/frontend.py +++ b/app/types/frontend.py @@ -2,6 +2,19 @@ from typing import Optional, List from pydantic import BaseModel +from fastapi.security import OAuth2PasswordRequestForm + + +class LoginFormWith2FA(OAuth2PasswordRequestForm): + def __init__( + self, + username: str, + password: str, + totp: str, + ): + super().__init__(username=username, password=password) + self.totp = totp + # Clinic Family model class FamilyClinic(BaseModel): @@ -16,11 +29,13 @@ class FamilyHealthTeam(BaseModel): name: Optional[str] phone: Optional[str] + # Clinical Exam Model class ClinicalExam(BaseModel): type: str description: Optional[str] + # Medical Conditions model class PatientSummary(BaseModel): allergies: List[str] @@ -29,7 +44,7 @@ class PatientSummary(BaseModel): # Responsible model class Responsible(BaseModel): - name: str + name: Optional[str] # Temporary role: str @@ -40,7 +55,7 @@ class Encounter(BaseModel): location: str type: str subtype: Optional[str] - exhibition_type: str = 'default' + exhibition_type: str = "default" active_cids: List[str] responsible: Optional[Responsible] clinical_motivation: Optional[str] @@ -56,8 +71,9 @@ class UserInfo(BaseModel): email: Optional[str] role: Optional[str] + class Professional(BaseModel): - name: str + name: Optional[str] registry: Optional[str]