diff --git a/feed/scripts/create/create_itens_historico_federais.sql b/feed/scripts/create/create_itens_historico_federais.sql index 994eaf24..9b44e31e 100644 --- a/feed/scripts/create/create_itens_historico_federais.sql +++ b/feed/scripts/create/create_itens_historico_federais.sql @@ -6,6 +6,5 @@ CREATE TABLE IF NOT EXISTS "itens_historico_raw_federais" ( data_emissao TEXT, quantidade NUMERIC, valor_unitario NUMERIC, - valor_total NUMERIC, - FOREIGN KEY (id_empenho) REFERENCES empenhos_raw_federais(id) + valor_total NUMERIC ); \ No newline at end of file diff --git a/transformer/adapter/estados/Federal/contratos/adaptador_compras_federal.R b/transformer/adapter/estados/Federal/contratos/adaptador_compras_federal.R index b26626b9..318b29bf 100644 --- a/transformer/adapter/estados/Federal/contratos/adaptador_compras_federal.R +++ b/transformer/adapter/estados/Federal/contratos/adaptador_compras_federal.R @@ -97,7 +97,8 @@ adapta_info_compras_federal <- function(empenho_df, empenhos_licitacao_df, filtr TRUE ~ 'O' )) %>% left_join(empenhos_licitacao_df, by = c("codigo" = "codigo_contrato")) %>% - filter(especie %in% c("ORIGINAL", "REFORÇO")) %>% + mutate(especie1 = if_else(ano_contrato %in% c(2021, 2022), "ORIGINAL", especie)) %>% + filter(especie1 %in% c("ORIGINAL", "REFORÇO")) %>% select( codigo_contrato = codigo, nr_contrato = codigo_resumido, diff --git a/transformer/utils/read/read_empenhos_federais.R b/transformer/utils/read/read_empenhos_federais.R index 4eab0b04..be531b59 100644 --- a/transformer/utils/read/read_empenhos_federais.R +++ b/transformer/utils/read/read_empenhos_federais.R @@ -31,7 +31,7 @@ read_empenhos_federais_covid <- function(host, user, database, port, password) { str_glue( "SELECT * FROM empenhos_raw_federais ", "WHERE codigo_acao IN ", - "('00S4', '00S5', '00S7', '00S8', '00S9', '00SF', '00SH', '21C0', '21C1', '21C2', '00SI', '21C0')", + "('00S4', '00S5', '00S7', '00S8', '00S9', '00SF', '00SH', '21C0', '21C1', '21C2', '00SI', '21C0', '8585', '00EE')", "AND codigo_modalidade_aplicacao IN ('90')" ) )