Merge branch 'main' into staging/migra-captura-manual-gtfs

prefeitura-rio · Jul 17, 2024 · effa618 · effa618
2 parents 687749c + 112af25
commit effa618
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 5 deletions.
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: 2024-07-17 2
+DBT: 2024-07-17 3
 """
 
 from copy import deepcopy

diff --git a/queries/models/dashboard_bilhetagem_jae/CHANGELOG.md b/queries/models/dashboard_bilhetagem_jae/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog - dashboard_bilhetagem_jae
 
+## [1.0.1] - 2024-07-17
+
+### Corrigido
+- Deduplica ids dos serviços (https://github.com/prefeitura-rio/pipelines_rj_smtr/pull/109)
+
 ## [1.0.0] - 2024-06-11
 
 ### Adicionado

diff --git a/queries/models/dashboard_bilhetagem_jae/view_integracao.sql b/queries/models/dashboard_bilhetagem_jae/view_integracao.sql
@@ -1,4 +1,18 @@
-WITH dados_filtrados AS (
+WITH servicos AS (
+    SELECT
+        * EXCEPT(rn)
+    FROM
+        (
+            SELECT
+                *,
+                ROW_NUMBER() OVER (PARTITION BY id_servico_jae ORDER BY data_inicio_vigencia) AS rn
+            FROM
+                {{ ref("servicos") }}
+        )
+    WHERE
+        rn = 1
+),
+dados_filtrados AS (
     SELECT
         i.data,
         i.hora,
@@ -11,7 +25,7 @@ WITH dados_filtrados AS (
     FROM
         {{ ref("integracao") }} i
     LEFT JOIN
-        {{ ref("servicos") }} s
+        servicos s
     USING(id_servico_jae)
     WHERE
         data >= "2024-02-24"

diff --git a/queries/models/dashboard_bilhetagem_jae/view_passageiros_hora.sql b/queries/models/dashboard_bilhetagem_jae/view_passageiros_hora.sql
@@ -1,4 +1,18 @@
 -- depends_on: {{ ref('view_passageiros_tile_hora') }}
+WITH servicos AS (
+  SELECT
+    * EXCEPT(rn)
+  FROM
+    (
+      SELECT
+        *,
+        ROW_NUMBER() OVER (PARTITION BY id_servico_jae ORDER BY data_inicio_vigencia) AS rn
+      FROM
+        {{ ref("servicos") }}
+    )
+  WHERE
+    rn = 1
+)
 SELECT
   p.data,
   p.hora,
@@ -20,5 +34,5 @@ SELECT
 FROM
   {{ ref("passageiros_hora") }} p
 LEFT JOIN
-  {{ ref("servicos") }} s
+  servicos s
 USING(id_servico_jae)
diff --git a/queries/models/dashboard_bilhetagem_jae/view_passageiros_tile_hora.sql b/queries/models/dashboard_bilhetagem_jae/view_passageiros_tile_hora.sql
@@ -1,3 +1,17 @@
+WITH servicos AS (
+  SELECT
+    * EXCEPT(rn)
+  FROM
+    (
+      SELECT
+        *,
+        ROW_NUMBER() OVER (PARTITION BY id_servico_jae ORDER BY data_inicio_vigencia) AS rn
+      FROM
+        {{ ref("servicos") }}
+    )
+  WHERE
+    rn = 1
+)
 SELECT
   p.data,
   p.hora,
@@ -18,5 +32,5 @@ SELECT
 FROM
   {{ ref("passageiros_tile_hora") }} p
 LEFT JOIN
-  {{ ref("servicos") }} s
+  servicos s
 USING(id_servico_jae)