Merge branch 'main' into view-subsidio-historico

prefeitura-rio · Jan 16, 2025 · e83adcf · e83adcf
2 parents 0ebe90a + f5cd9d4
commit e83adcf
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/pipelines/constants.py b/pipelines/constants.py
@@ -203,8 +203,8 @@ class constants(Enum):  # pylint: disable=c0103
                 WHERE
                     id > {last_id} AND id <= {max_id}
             """,
-            "page_size": 1000,
-            "max_pages": 70,
+            "page_size": 35000,
+            "max_pages": 2,
         },
         "primary_key": ["id"],
         "interval_minutes": 5,

diff --git a/pipelines/migration/br_rj_riodejaneiro_bilhetagem/flows.py b/pipelines/migration/br_rj_riodejaneiro_bilhetagem/flows.py
@@ -2,7 +2,7 @@
 """
 Flows for br_rj_riodejaneiro_bilhetagem
 
-DBT: 2025-01-06
+DBT: 2025-01-13
 """
 
 from copy import deepcopy

diff --git a/pipelines/migration/br_rj_riodejaneiro_gtfs/CHANGELOG.md b/pipelines/migration/br_rj_riodejaneiro_gtfs/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog - gtfs
 
+## [1.2.1] - 2025-01-13
+
+### Corrigido
+- Removido teste de Ordem de Serviço regular (https://github.com/prefeitura-rio/pipelines_rj_smtr/pull/386)
+
 ## [1.2.0] - 2025-01-03
 
 ### Adicionado

diff --git a/pipelines/migration/br_rj_riodejaneiro_gtfs/flows.py b/pipelines/migration/br_rj_riodejaneiro_gtfs/flows.py
@@ -2,7 +2,7 @@
 """
 Flows for gtfs
 
-DBT 2024-12-20
+DBT 2025-01-13
 """
 
 from prefect import Parameter, case, task

diff --git a/pipelines/migration/br_rj_riodejaneiro_gtfs/utils.py b/pipelines/migration/br_rj_riodejaneiro_gtfs/utils.py
@@ -204,18 +204,15 @@ def processa_ordem_servico(
         None
     """
 
-    if (
-        len([sheet for sheet in sheetnames if "ANEXO I:" in sheet]) != 1
-        and regular_sheet_index is None
-    ):
-        raise Exception(
-            "More than 1 regular sheet in the file. Please specify the regular sheet index."
-        )
+    # if (
+    #     len([sheet for sheet in sheetnames if "ANEXO I " in sheet]) != 1
+    #     and regular_sheet_index is None
+    # ):
+    #     raise Exception(
+    #         "More than 1 regular sheet in the file. Please specify the regular sheet index."
+    #     )
 
-    if regular_sheet_index is None:
-        regular_sheet_index = next(
-            (i for i, name in enumerate(sheetnames) if "ANEXO I" in name), None
-        )
+    regular_sheet_index = next((i for i, name in enumerate(sheetnames) if "ANEXO I" in name), None)
 
     quadro_geral = pd.DataFrame()
 

diff --git a/queries/models/br_rj_riodejaneiro_bilhetagem/integracao.sql b/queries/models/br_rj_riodejaneiro_bilhetagem/integracao.sql
@@ -191,7 +191,7 @@ from complete_partitions
 where id_integracao not in (select id_integracao from integracoes_teste_invalidas)
 qualify
     row_number() over (
-        partition by id_integracao, id_transacao, priority
-        order by datetime_processamento_integracao desc
+        partition by id_integracao, id_transacao
+        order by datetime_processamento_integracao desc, priority
     )
     = 1