Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adiciona compatibilidade com postgresql no sei4 e sei oficial #434

Merged
merged 4 commits into from
Mar 15, 2024
Merged

feat: adiciona compatibilidade com postgresql no sei4 e sei oficial #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14ada39
feat: adiciona compatibilidade com postgresql no sei4 e sei oficial
marvdias Feb 28, 2024
bdea3e6
chore: removendo warning de array com key ID_SERIE
marvdias Mar 1, 2024
6a30577
fix: adicionar modificacoes no ProcessoExpedidoRN e remover warning i…
marvdias Mar 5, 2024
fb552b8
chore: rodar phpcs + phpcbf para corrigir arquivos
marvdias Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/bd/PenMetaBD.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ public function adicionarValorPadraoParaColuna($strNomeTabela, $strNomeColuna, $
case 'InfraOracle':
$strQuery = sprintf("ALTER TABLE %s MODIFY %s DEFAULT '%s'", $strNomeTabela, $strNomeColuna, $strValorPadrao);
break;

case 'InfraPostgreSql':
$strQuery = sprintf("ALTER TABLE %s ALTER COLUMN %s SET DEFAULT '%s'", $strNomeTabela, $strNomeColuna, $strValorPadrao);
break;
}

if($bolRetornarQuery === false) {
Expand Down Expand Up @@ -87,6 +91,7 @@ public function isDriverSuportado(){
break;
case 'InfraSqlServer':
case 'InfraOracle':
case 'InfraPostgreSql':
break;

default:
Expand Down Expand Up @@ -141,6 +146,10 @@ public function renomearTabela($strNomeTabelaAtual, $strNomeTabelaNovo){
case 'InfraOracle':
$strQuery = sprintf("RENAME TABLE %s TO %s", $strNomeTabelaAtual, $strNomeTabelaNovo);
break;

case 'InfraPostgreSql':
$strQuery = sprintf("ALTER TABLE %s RENAME TO %s", $strNomeTabelaAtual, $strNomeTabelaNovo);
break;
}

$objInfraBanco->executarSql($strQuery);
Expand All @@ -166,6 +175,7 @@ public function renomearColuna($strNomeTabela, $strNomeColunaAtual, $strNomeColu
break;

case 'InfraOracle':
case 'InfraPostgreSql':
$strQuery = sprintf("ALTER TABLE %s RENAME COLUMN %s TO %s", $strNomeTabela, $strNomeColunaAtual, $strNomeColunaNova);
break;
}
Expand Down
4 changes: 2 additions & 2 deletions src/rn/ProcessoExpedidoRN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function listarProcessoExpedido(ProtocoloDTO &$objProtocoloDTO)
INNER JOIN md_pen_tramite ptra ON ptra.numero_registro = pe.numero_registro
INNER JOIN usuario us ON ptra.id_usuario = us.id_usuario
WHERE
p.sta_estado = " . $objProtocoloDTO->getStrStaEstado() . "
p.sta_estado = '" . $objProtocoloDTO->getStrStaEstado() . "'
AND
a.id_tarefa = ". ProcessoEletronicoRN::obterIdTarefaModulo(ProcessoEletronicoRN::$TI_PROCESSO_ELETRONICO_PROCESSO_TRAMITE_EXTERNO) ."
AND
Expand All @@ -61,7 +61,7 @@ public function listarProcessoExpedido(ProtocoloDTO &$objProtocoloDTO)
INNER JOIN md_pen_tramite ptra ON ptra.numero_registro = pe.numero_registro
INNER JOIN usuario us ON ptra.id_usuario = us.id_usuario
WHERE
p.sta_estado = " . $objProtocoloDTO->getStrStaEstado() . "
p.sta_estado = '" . $objProtocoloDTO->getStrStaEstado() . "'
AND
a.id_tarefa = ". ProcessoEletronicoRN::obterIdTarefaModulo(ProcessoEletronicoRN::$TI_PROCESSO_ELETRONICO_PROCESSO_TRAMITE_EXTERNO) ."
AND
Expand Down
2 changes: 1 addition & 1 deletion src/rn/ReceberProcedimentoRN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2525,7 +2525,7 @@ private function documentosPendenteRegistro($parNumIdProcedimento, $parNumIdDocu
left join md_pen_componente_digital comp on (comp.id_documento = doc.id_documento)
where comp.id_procedimento = $parNumIdProcedimento
and prot_doc.sta_protocolo = 'R'
and prot_doc.sta_estado <> " . ProtocoloRN::$TE_DOCUMENTO_CANCELADO . "
and prot_doc.sta_estado <> '" . ProtocoloRN::$TE_DOCUMENTO_CANCELADO . "'
and not exists (select 1 from anexo where anexo.id_protocolo = prot_doc.id_protocolo) ";

//Adiciona filtro adicional para verificar pelo identificador do documento, caso par穃etro tenha sido informado
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/sei_atualizar_versao_modulo_pen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ protected function atualizarVersaoConectado()
if (
!(BancoSEI::getInstance() instanceof InfraMySql) &&
!(BancoSEI::getInstance() instanceof InfraSqlServer) &&
!(BancoSEI::getInstance() instanceof InfraOracle)
!(BancoSEI::getInstance() instanceof InfraOracle) &&
!(BancoSEI::getInstance() instanceof InfraPostgreSql)
) {

$this->finalizar('BANCO DE DADOS NAO SUPORTADO: ' . get_parent_class(BancoSEI::getInstance()), true);
Expand Down
3 changes: 2 additions & 1 deletion src/scripts/sip_atualizar_versao_modulo_pen.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ protected function atualizarVersaoConectado()
if (
!(BancoSip::getInstance() instanceof InfraMySql) &&
!(BancoSip::getInstance() instanceof InfraSqlServer) &&
!(BancoSip::getInstance() instanceof InfraOracle)
!(BancoSip::getInstance() instanceof InfraOracle) &&
!(BancoSip::getInstance() instanceof InfraPostgreSql)
) {

$this->finalizar('BANCO DE DADOS NAO SUPORTADO: ' . get_parent_class(BancoSip::getInstance()), true);
Expand Down
54 changes: 54 additions & 0 deletions tests_sei4/funcional/env_postgresql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
##### Diretﾃｳrio em que estﾃ｡ localizada a instalaﾃｧﾃ｣o do SEI #####
SEI_PATH=../../../../../../
ENVIRONMENT_VERSION=10.0

SEI_CONFIG=./assets/config/ConfiguracaoSEI.php
SEI_DATABASE_NAME=sei
SEI_DATABASE_USER=sei_user
SEI_DATABASE_PASSWORD=sei_user

SIP_CONFIG=./assets/config/ConfiguracaoSip.php
SIP_DATABASE_NAME=sip
SIP_DATABASE_USER=sip_user
SIP_DATABASE_PASSWORD=sip_user


############### CONFIGURAﾃ�髭S GERAIS DO ﾃ迭Gﾃグ 01 ###############
ORG1_HOSTNAME=org1-http
ORG1_PORT=8000
ORG1_SIGLA_ORGAO=ABC
ORG1_APP_SEI_CHAVE_ACESSO=7babf862e12bd48f3101075c399040303d94a493c7ce9306470f719bb453e0428c6135dc
ORG1_APP_SIP_CHAVE_ACESSO=d27791b894028d9e7fa34887ad6f0c9a2c559cccda5f64f4e108e3573d5db862b66fb933
ORG1_CERTIFICADO=/opt/sei/config/mod-pen/certificado_org1.pem
ORG1_CERTIFICADO_SENHA=XXXXXXXXXXXXXX


##### BANCO DE DADOS DO ﾃ迭Gﾃグ 1 #####
# Configuraﾃｧﾃｵes do banco de dados POSTGRESQL do ﾃ迭Gﾃグ 1
ORG1_DATABASE_IMAGE=processoeletronico/vagrant_sei4_postgresql
ORG1_DATABASE_HOST=org1-database
ORG1_DATABASE_TYPE=PostgreSql
ORG1_DATABASE_GUEST_PORT=5432
ORG1_DATABASE_HOST_PORT=54321
ORG1_DATABASE_DATA_DIR=/var/lib/postgresql/data
CONTEXTO_ORGAO_A_DB_SEI_DSN=pgsql:host=org1-database;port=5432;dbname=sei


############### CONFIGURAﾃ�髭S GERAIS DO ﾃ迭Gﾃグ 02 ###############

ORG2_HOSTNAME=org2-http
ORG2_PORT=8000
ORG2_SIGLA_ORGAO=ABC
ORG2_APP_SEI_CHAVE_ACESSO=7babf862e12bd48f3101075c399040303d94a493c7ce9306470f719bb453e0428c6135dc
ORG2_APP_SIP_CHAVE_ACESSO=d27791b894028d9e7fa34887ad6f0c9a2c559cccda5f64f4e108e3573d5db862b66fb933
ORG2_CERTIFICADO=/opt/sei/config/mod-pen/certificado_org2.pem
ORG2_CERTIFICADO_SENHA=XXXXXXXXXXXXXX

# Configuraﾃｧﾃｵes do banco de dados POSTGRESQL do ﾃ迭Gﾃグ 2
ORG2_DATABASE_IMAGE=processoeletronico/vagrant_sei4_postgresql
ORG2_DATABASE_HOST=org2-database
ORG2_DATABASE_TYPE=PostgreSql
ORG2_DATABASE_GUEST_PORT=5432
ORG2_DATABASE_HOST_PORT=54322
ORG2_DATABASE_DATA_DIR=/var/lib/postgresql/data
CONTEXTO_ORGAO_B_DB_SEI_DSN=pgsql:host=org2-database;port=5432;dbname=sei
4 changes: 4 additions & 0 deletions tests_sei4/funcional/tests/CenarioBaseTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public static function setUpBeforeClass(): void
// Remo鈬o de mapeamento de esp馗ie n縊 mapeada na origem
$nomeSerieNaoMapeada = utf8_encode(CONTEXTO_ORGAO_A_TIPO_DOCUMENTO_NAO_MAPEADO);
$serieNaoMapeadaOrigem = $bancoOrgaoA->query('select ID_SERIE from serie where nome = ?', array($nomeSerieNaoMapeada));
$serieNaoMapeadaOrigem[0] = array_change_key_case($serieNaoMapeadaOrigem[0], CASE_UPPER);

$bancoOrgaoA->execute("delete from md_pen_rel_doc_map_enviado where id_serie = ?", array($serieNaoMapeadaOrigem[0]["ID_SERIE"]));
$bancoOrgaoA->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?)", array(1, 3, 3, 'E', 'S'));
$bancoOrgaoA->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?)", array(2, 4, 4, 'E', 'S'));
Expand Down Expand Up @@ -123,6 +125,8 @@ public static function setUpBeforeClass(): void
// Remo鈬o de mapeamento de esp馗ie n縊 mapeada na origem
$nomeSerieNaoMapeada = utf8_encode(CONTEXTO_ORGAO_B_TIPO_DOCUMENTO_NAO_MAPEADO);
$serieNaoMapeadaOrigem = $bancoOrgaoB->query('select ID_SERIE from serie where nome = ?', array($nomeSerieNaoMapeada));
$serieNaoMapeadaOrigem[0] = array_change_key_case($serieNaoMapeadaOrigem[0], CASE_UPPER);

$bancoOrgaoB->execute("delete from md_pen_rel_doc_map_recebido where id_serie = ?", array($serieNaoMapeadaOrigem[0]["ID_SERIE"]));
$bancoOrgaoB->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?);", array(4, 3, 3, 'E', 'S'));
$bancoOrgaoB->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?);", array(5, 3, 3, 'R', 'S'));
Expand Down
54 changes: 54 additions & 0 deletions tests_super/funcional/env_postgresql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
##### Diretﾃｳrio em que estﾃ｡ localizada a instalaﾃｧﾃ｣o do SEI #####
SEI_PATH=../../../../../../
ENVIRONMENT_VERSION=10.0

SEI_CONFIG=./assets/config/ConfiguracaoSEI.php
SEI_DATABASE_NAME=sei
SEI_DATABASE_USER=sei_user
SEI_DATABASE_PASSWORD=sei_user

SIP_CONFIG=./assets/config/ConfiguracaoSip.php
SIP_DATABASE_NAME=sip
SIP_DATABASE_USER=sip_user
SIP_DATABASE_PASSWORD=sip_user


############### CONFIGURAﾃ�髭S GERAIS DO ﾃ迭Gﾃグ 01 ###############
ORG1_HOSTNAME=org1-http
ORG1_PORT=8000
ORG1_SIGLA_ORGAO=ABC
ORG1_APP_SEI_CHAVE_ACESSO=7babf862e12bd48f3101075c399040303d94a493c7ce9306470f719bb453e0428c6135dc
ORG1_APP_SIP_CHAVE_ACESSO=d27791b894028d9e7fa34887ad6f0c9a2c559cccda5f64f4e108e3573d5db862b66fb933
ORG1_CERTIFICADO=/opt/sei/config/mod-pen/certificado_org1.pem
ORG1_CERTIFICADO_SENHA=XXXXXXXXXXXXXX


##### BANCO DE DADOS DO ﾃ迭Gﾃグ 1 #####
# Configuraﾃｧﾃｵes do banco de dados POSTGRESQL do ﾃ迭Gﾃグ 1
ORG1_DATABASE_IMAGE=processoeletronico/vagrant_super4_postgresql
ORG1_DATABASE_HOST=org1-database
ORG1_DATABASE_TYPE=PostgreSql
ORG1_DATABASE_GUEST_PORT=5432
ORG1_DATABASE_HOST_PORT=54321
ORG1_DATABASE_DATA_DIR=/var/lib/postgresql/data
CONTEXTO_ORGAO_A_DB_SEI_DSN=pgsql:host=org1-database;port=5432;dbname=sei


############### CONFIGURAﾃ�髭S GERAIS DO ﾃ迭Gﾃグ 02 ###############

ORG2_HOSTNAME=org2-http
ORG2_PORT=8000
ORG2_SIGLA_ORGAO=ABC
ORG2_APP_SEI_CHAVE_ACESSO=7babf862e12bd48f3101075c399040303d94a493c7ce9306470f719bb453e0428c6135dc
ORG2_APP_SIP_CHAVE_ACESSO=d27791b894028d9e7fa34887ad6f0c9a2c559cccda5f64f4e108e3573d5db862b66fb933
ORG2_CERTIFICADO=/opt/sei/config/mod-pen/certificado_org2.pem
ORG2_CERTIFICADO_SENHA=XXXXXXXXXXXXXX

# Configuraﾃｧﾃｵes do banco de dados POSTGRESQL do ﾃ迭Gﾃグ 2
ORG2_DATABASE_IMAGE=processoeletronico/vagrant_super4_postgresql
ORG2_DATABASE_HOST=org2-database
ORG2_DATABASE_TYPE=PostgreSql
ORG2_DATABASE_GUEST_PORT=5432
ORG2_DATABASE_HOST_PORT=54322
ORG2_DATABASE_DATA_DIR=/var/lib/postgresql/data
CONTEXTO_ORGAO_B_DB_SEI_DSN=pgsql:host=org2-database;port=5432;dbname=sei
4 changes: 4 additions & 0 deletions tests_super/funcional/tests/CenarioBaseTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public static function setUpBeforeClass(): void
// Remo鈬o de mapeamento de esp馗ie n縊 mapeada na origem
$nomeSerieNaoMapeada = utf8_encode(CONTEXTO_ORGAO_A_TIPO_DOCUMENTO_NAO_MAPEADO);
$serieNaoMapeadaOrigem = $bancoOrgaoA->query('select ID_SERIE from serie where nome = ?', array($nomeSerieNaoMapeada));
$serieNaoMapeadaOrigem[0] = array_change_key_case($serieNaoMapeadaOrigem[0], CASE_UPPER);

$bancoOrgaoA->execute("delete from md_pen_rel_doc_map_enviado where id_serie = ?", array($serieNaoMapeadaOrigem[0]["ID_SERIE"]));
$bancoOrgaoA->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?)", array(1, 3, 3, 'E', 'S'));
$bancoOrgaoA->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?)", array(2, 4, 4, 'E', 'S'));
Expand Down Expand Up @@ -125,6 +127,8 @@ public static function setUpBeforeClass(): void
// Remo鈬o de mapeamento de esp馗ie n縊 mapeada na origem
$nomeSerieNaoMapeada = utf8_encode(CONTEXTO_ORGAO_B_TIPO_DOCUMENTO_NAO_MAPEADO);
$serieNaoMapeadaOrigem = $bancoOrgaoB->query('select ID_SERIE from serie where nome = ?', array($nomeSerieNaoMapeada));
$serieNaoMapeadaOrigem[0] = array_change_key_case($serieNaoMapeadaOrigem[0], CASE_UPPER);

$bancoOrgaoB->execute("delete from md_pen_rel_doc_map_recebido where id_serie = ?", array($serieNaoMapeadaOrigem[0]["ID_SERIE"]));
$bancoOrgaoB->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?);", array(4, 3, 3, 'E', 'S'));
$bancoOrgaoB->execute("insert into md_pen_rel_hipotese_legal(id_mapeamento, id_hipotese_legal, id_hipotese_legal_pen, tipo, sin_ativo) values (?, ?, ?, ?, ?);", array(5, 3, 3, 'R', 'S'));
Expand Down
Loading