diff --git a/README.md b/README.md index 5054d45..d7e8d52 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ ranking/ - Node.js 18+ - Docker e Docker Compose (opcional) - Acesso ao Elasticsearch (ATUACAPES) -- Acesso ao Oracle (SUCUPIRA_PAINEL) +- Acesso ao Oracle ## Setup Local diff --git a/backend/scripts/popular_componente_b.py b/backend/scripts/popular_componente_b.py index 4c3b2d1..ae6f0d9 100644 --- a/backend/scripts/popular_componente_b.py +++ b/backend/scripts/popular_componente_b.py @@ -37,10 +37,10 @@ QUERY_BASE = """ aa.NM_AREA_AVALIACAO, c.DT_INICIO_VIGENCIA, c.DT_FIM_VIGENCIA - FROM SUCUPIRA_PAINEL.VM_COORDENADOR c - INNER JOIN SUCUPIRA_PAINEL.VM_PROGRAMA_SUCUPIRA p ON c.ID_PROGRAMA_SNPG = p.ID_PROGRAMA - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_CONHECIMENTO ac ON p.ID_AREA_CONHECIMENTO_ATUAL = ac.ID_AREA_CONHECIMENTO - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_AVALIACAO aa ON ac.ID_AREA_AVALIACAO = aa.ID_AREA_AVALIACAO + FROM VM_COORDENADOR c + INNER JOIN VM_PROGRAMA p ON c.ID_PROGRAMA_SNPG = p.ID_PROGRAMA + LEFT JOIN VM_AREA_CONHECIMENTO ac ON p.ID_AREA_CONHECIMENTO_ATUAL = ac.ID_AREA_CONHECIMENTO + LEFT JOIN VM_AREA_AVALIACAO aa ON ac.ID_AREA_AVALIACAO = aa.ID_AREA_AVALIACAO WHERE c.ID_PESSOA IN ({placeholders}) """ diff --git a/backend/src/application/jobs/popular_componente_b_job.py b/backend/src/application/jobs/popular_componente_b_job.py index 0ab5a9a..7086d93 100644 --- a/backend/src/application/jobs/popular_componente_b_job.py +++ b/backend/src/application/jobs/popular_componente_b_job.py @@ -75,10 +75,10 @@ class PopularComponenteBJob: aa.NM_AREA_AVALIACAO, c.DT_INICIO_VIGENCIA, c.DT_FIM_VIGENCIA - FROM SUCUPIRA_PAINEL.VM_COORDENADOR c - INNER JOIN SUCUPIRA_PAINEL.VM_PROGRAMA_SUCUPIRA p ON c.ID_PROGRAMA_SNPG = p.ID_PROGRAMA - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_CONHECIMENTO ac ON p.ID_AREA_CONHECIMENTO_ATUAL = ac.ID_AREA_CONHECIMENTO - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_AVALIACAO aa ON ac.ID_AREA_AVALIACAO = aa.ID_AREA_AVALIACAO + FROM VM_COORDENADOR c + INNER JOIN VM_PROGRAMA p ON c.ID_PROGRAMA_SNPG = p.ID_PROGRAMA + LEFT JOIN VM_AREA_CONHECIMENTO ac ON p.ID_AREA_CONHECIMENTO_ATUAL = ac.ID_AREA_CONHECIMENTO + LEFT JOIN VM_AREA_AVALIACAO aa ON ac.ID_AREA_AVALIACAO = aa.ID_AREA_AVALIACAO WHERE c.ID_PESSOA IN ({placeholders}) """ return self.oracle_remote.executar_query(query, params) diff --git a/backend/src/infrastructure/oracle/client.py b/backend/src/infrastructure/oracle/client.py index 9ef0649..3ac1076 100644 --- a/backend/src/infrastructure/oracle/client.py +++ b/backend/src/infrastructure/oracle/client.py @@ -87,12 +87,12 @@ class OracleClient: aa.NM_AREA_AVALIACAO, c.DT_INICIO_VIGENCIA, c.DT_FIM_VIGENCIA - FROM SUCUPIRA_PAINEL.VM_COORDENADOR c - INNER JOIN SUCUPIRA_PAINEL.VM_PROGRAMA_SUCUPIRA p + FROM VM_COORDENADOR c + INNER JOIN VM_PROGRAMA p ON c.ID_PROGRAMA_SNPG = p.ID_PROGRAMA - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_CONHECIMENTO ac + LEFT JOIN VM_AREA_CONHECIMENTO ac ON p.ID_AREA_CONHECIMENTO_ATUAL = ac.ID_AREA_CONHECIMENTO - LEFT JOIN SUCUPIRA_PAINEL.VM_AREA_AVALIACAO aa + LEFT JOIN VM_AREA_AVALIACAO aa ON ac.ID_AREA_AVALIACAO = aa.ID_AREA_AVALIACAO WHERE c.ID_PESSOA = :id_pessoa ORDER BY c.DT_INICIO_VIGENCIA DESC diff --git a/backend/src/interface/api/app.py b/backend/src/interface/api/app.py index ffb6d46..c02e99f 100644 --- a/backend/src/interface/api/app.py +++ b/backend/src/interface/api/app.py @@ -28,7 +28,7 @@ async def lifespan(app: FastAPI): # Conectar Oracle REMOTO (CAPES) try: oracle_remote_client.connect() - print("Oracle REMOTO conectado (CAPES/SUCUPIRA_PAINEL)") + print("Oracle REMOTO conectado (CAPES)") except Exception as e: print(f"AVISO: Oracle REMOTO não conectou: {e}. Sistema rodando sem Componente B (PPG).") diff --git a/backend/src/interface/api/config.py b/backend/src/interface/api/config.py index 6e952b1..36374e0 100644 --- a/backend/src/interface/api/config.py +++ b/backend/src/interface/api/config.py @@ -16,7 +16,7 @@ class Settings(BaseSettings): ORACLE_LOCAL_PASSWORD: str ORACLE_LOCAL_DSN: str - # Oracle REMOTO (CAPES) - Para ler SUCUPIRA_PAINEL + # Oracle REMOTO (CAPES) - Para ler dados de programas ORACLE_REMOTE_USER: str ORACLE_REMOTE_PASSWORD: str ORACLE_REMOTE_DSN: str diff --git a/backend/src/interface/api/dependencies.py b/backend/src/interface/api/dependencies.py index a43158f..407b5e2 100644 --- a/backend/src/interface/api/dependencies.py +++ b/backend/src/interface/api/dependencies.py @@ -21,7 +21,7 @@ oracle_local_client = OracleClient( dsn=settings.ORACLE_LOCAL_DSN ) -# Oracle REMOTO (CAPES) - Para ler SUCUPIRA_PAINEL +# Oracle REMOTO (CAPES) - Para ler dados de programas oracle_remote_client = OracleClient( user=settings.ORACLE_REMOTE_USER, password=settings.ORACLE_REMOTE_PASSWORD, diff --git a/docs/ranking-queries-implementadas.md b/docs/ranking-queries-implementadas.md index 8cef215..b0425b1 100644 --- a/docs/ranking-queries-implementadas.md +++ b/docs/ranking-queries-implementadas.md @@ -13,7 +13,7 @@ │ └─> Query com boost por tipo de atuação │ │ └─> Retorna top 1000 candidatos pré-ordenados │ │ │ -│ 2. Oracle (SUCUPIRA_PAINEL) - Opcional │ +│ 2. Oracle - Opcional │ │ └─> Busca coordenações de PPG por ID_PESSOA │ │ │ │ 3. Python (Backend) │