Skip to content

Commit 81afacb

Browse files
ntd: enrich mart tables with caltrans_district, handle ntd_id as string for joins
1 parent 07498e7 commit 81afacb

File tree

46 files changed

+730
-47
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+730
-47
lines changed

warehouse/models/mart/ntd_annual_reporting/dim_2022_agency_information.sql

+14-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ WITH staging_agency_information AS (
33
FROM {{ ref('stg_ntd__2022_agency_information') }}
44
),
55

6-
dim_2022_agency_information AS (
6+
dim_organizations AS (
7+
78
SELECT *
9+
FROM {{ ref('dim_organizations') }}
10+
WHERE _is_current
11+
12+
),
13+
14+
dim_2022_agency_information AS (
15+
SELECT
16+
staging_agency_information.*,
17+
dim_organizations.caltrans_district
818
FROM staging_agency_information
19+
LEFT JOIN dim_organizations
20+
ON staging_agency_information.ntd_id = dim_organizations.ntd_id_2022
921
)
1022

1123
SELECT
@@ -51,6 +63,7 @@ SELECT
5163
reported_by_ntd_id,
5264
density,
5365
state_parent_ntd_id,
66+
caltrans_district,
5467
dt,
5568
execution_ts
5669
FROM dim_2022_agency_information

warehouse/models/mart/ntd_annual_reporting/dim_2023_agency_information.sql

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ WITH staging_agency_information AS (
33
FROM {{ ref('stg_ntd__2023_agency_information') }}
44
),
55

6-
dim_2023_agency_information AS (
6+
dim_organizations AS (
7+
78
SELECT *
9+
FROM {{ ref('dim_organizations') }}
10+
WHERE _is_current
11+
12+
),
13+
14+
dim_2023_agency_information AS (
15+
SELECT
16+
staging_agency_information.*,
17+
dim_organizations.caltrans_district
818
FROM staging_agency_information
19+
LEFT JOIN dim_organizations
20+
ON staging_agency_information.ntd_id = dim_organizations.ntd_id
921
)
1022

1123
SELECT

warehouse/models/mart/ntd_annual_reporting/fct_2023_contractual_relationships.sql

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,21 @@ WITH staging_contractual_relationships AS (
33
FROM {{ ref('stg_ntd__2023_contractual_relationships') }}
44
),
55

6-
fct_2023_contractual_relationships AS (
6+
dim_organizations AS (
7+
78
SELECT *
9+
FROM {{ ref('dim_organizations') }}
10+
WHERE _is_current
11+
12+
),
13+
14+
fct_2023_contractual_relationships AS (
15+
SELECT
16+
staging_contractual_relationships.*,
17+
dim_organizations.caltrans_district
818
FROM staging_contractual_relationships
19+
LEFT JOIN dim_organizations
20+
ON staging_contractual_relationships.ntd_id = dim_organizations.ntd_id
921
)
1022

1123
SELECT

warehouse/models/mart/ntd_annual_reporting/fct_breakdowns.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_breakdowns AS (
33
FROM {{ ref('stg_ntd__breakdowns') }}
44
),
55

6-
fct_breakdowns AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_breakdowns AS (
13+
SELECT
14+
staging_breakdowns.*,
15+
dim_organizations.caltrans_district
816
FROM staging_breakdowns
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_breakdowns.report_year = 2022 THEN
20+
staging_breakdowns.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_breakdowns.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -38,6 +53,7 @@ SELECT
3853
vehicle_passenger_car_miles_1,
3954
vehicle_passenger_car_miles_2,
4055
vehicle_passenger_car_revenue,
56+
caltrans_district,
4157
dt,
4258
execution_ts
4359
FROM fct_breakdowns

warehouse/models/mart/ntd_annual_reporting/fct_breakdowns_by_agency.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_breakdowns_by_agency AS (
33
FROM {{ ref('stg_ntd__breakdowns_by_agency') }}
44
),
55

6-
fct_breakdowns_by_agency AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_breakdowns_by_agency AS (
13+
SELECT
14+
staging_breakdowns_by_agency.*,
15+
dim_organizations.caltrans_district
816
FROM staging_breakdowns_by_agency
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_breakdowns_by_agency.report_year = 2022 THEN
20+
staging_breakdowns_by_agency.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_breakdowns_by_agency.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -33,6 +48,7 @@ SELECT
3348
sum_train_revenue_miles,
3449
sum_vehicle_passenger_car_miles,
3550
sum_vehicle_passenger_car_revenue,
51+
caltrans_district,
3652
dt,
3753
execution_ts
3854
FROM fct_breakdowns_by_agency

warehouse/models/mart/ntd_annual_reporting/fct_capital_expenses_by_capital_use.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_capital_expenses_by_capital_use AS (
33
FROM {{ ref('stg_ntd__capital_expenses_by_capital_use') }}
44
),
55

6-
fct_capital_expenses_by_capital_use AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_capital_expenses_by_capital_use AS (
13+
SELECT
14+
staging_capital_expenses_by_capital_use.*,
15+
dim_organizations.caltrans_district
816
FROM staging_capital_expenses_by_capital_use
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_capital_expenses_by_capital_use.report_year = 2022 THEN
20+
staging_capital_expenses_by_capital_use.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_capital_expenses_by_capital_use.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -47,6 +62,7 @@ SELECT
4762
typeofservicecd,
4863
uace_code,
4964
uza_name,
65+
caltrans_district,
5066
dt,
5167
execution_ts
5268
FROM fct_capital_expenses_by_capital_use

warehouse/models/mart/ntd_annual_reporting/fct_capital_expenses_by_mode.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_capital_expenses_by_mode AS (
33
FROM {{ ref('stg_ntd__capital_expenses_by_mode') }}
44
),
55

6-
fct_capital_expenses_by_mode AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_capital_expenses_by_mode AS (
13+
SELECT
14+
staging_capital_expenses_by_mode.*,
15+
dim_organizations.caltrans_district
816
FROM staging_capital_expenses_by_mode
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_capital_expenses_by_mode.report_year = 2022 THEN
20+
staging_capital_expenses_by_mode.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_capital_expenses_by_mode.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -43,6 +58,7 @@ SELECT
4358
sum_stations,
4459
sum_total,
4560
typeofservicecd,
61+
caltrans_district,
4662
dt,
4763
execution_ts
4864
FROM fct_capital_expenses_by_mode

warehouse/models/mart/ntd_annual_reporting/fct_capital_expenses_for_existing_service.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_capital_expenses_for_existing_service AS (
33
FROM {{ ref('stg_ntd__capital_expenses_for_existing_service') }}
44
),
55

6-
fct_capital_expenses_for_existing_service AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_capital_expenses_for_existing_service AS (
13+
SELECT
14+
staging_capital_expenses_for_existing_service.*,
15+
dim_organizations.caltrans_district
816
FROM staging_capital_expenses_for_existing_service
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_capital_expenses_for_existing_service.report_year = 2022 THEN
20+
staging_capital_expenses_for_existing_service.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_capital_expenses_for_existing_service.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -32,6 +47,7 @@ SELECT
3247
sum_reduced_reporter,
3348
sum_stations,
3449
sum_total,
50+
caltrans_district,
3551
dt,
3652
execution_ts
3753
FROM fct_capital_expenses_for_existing_service

warehouse/models/mart/ntd_annual_reporting/fct_capital_expenses_for_expansion_of_service.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_capital_expenses_for_expansion_of_service AS (
33
FROM {{ ref('stg_ntd__capital_expenses_for_expansion_of_service') }}
44
),
55

6-
fct_capital_expenses_for_expansion_of_service AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_capital_expenses_for_expansion_of_service AS (
13+
SELECT
14+
staging_capital_expenses_for_expansion_of_service.*,
15+
dim_organizations.caltrans_district
816
FROM staging_capital_expenses_for_expansion_of_service
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_capital_expenses_for_expansion_of_service.report_year = 2022 THEN
20+
staging_capital_expenses_for_expansion_of_service.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_capital_expenses_for_expansion_of_service.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -32,6 +47,7 @@ SELECT
3247
sum_reduced_reporter,
3348
sum_stations,
3449
sum_total,
50+
caltrans_district,
3551
dt,
3652
execution_ts
3753
FROM fct_capital_expenses_for_expansion_of_service

warehouse/models/mart/ntd_annual_reporting/fct_employees_by_agency.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_employees_by_agency AS (
33
FROM {{ ref('stg_ntd__employees_by_agency') }}
44
),
55

6-
fct_employees_by_agency AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_employees_by_agency AS (
13+
SELECT
14+
staging_employees_by_agency.*,
15+
dim_organizations.caltrans_district
816
FROM staging_employees_by_agency
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_employees_by_agency.report_year = 2022 THEN
20+
staging_employees_by_agency.max_ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_employees_by_agency.max_ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -35,6 +50,7 @@ SELECT
3550
total_employees,
3651
total_operating_hours,
3752
total_salaries,
53+
caltrans_district,
3854
dt,
3955
execution_ts
4056
FROM fct_employees_by_agency

warehouse/models/mart/ntd_annual_reporting/fct_employees_by_mode.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_employees_by_mode AS (
33
FROM {{ ref('stg_ntd__employees_by_mode') }}
44
),
55

6-
fct_employees_by_mode AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_employees_by_mode AS (
13+
SELECT
14+
staging_employees_by_mode.*,
15+
dim_organizations.caltrans_district
816
FROM staging_employees_by_mode
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_employees_by_mode.report_year = 2022 THEN
20+
staging_employees_by_mode.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_employees_by_mode.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -28,6 +43,7 @@ SELECT
2843
sum_total_employee_count,
2944
sum_total_hours,
3045
type_of_service,
46+
caltrans_district,
3147
dt,
3248
execution_ts
3349
FROM fct_employees_by_mode

warehouse/models/mart/ntd_annual_reporting/fct_employees_by_mode_and_employee_type.sql

+17-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,24 @@ WITH staging_employees_by_mode_and_employee_type AS (
33
FROM {{ ref('stg_ntd__employees_by_mode_and_employee_type') }}
44
),
55

6-
fct_employees_by_mode_and_employee_type AS (
6+
dim_organizations AS (
77
SELECT *
8+
FROM {{ ref('dim_organizations') }}
9+
WHERE _is_current
10+
),
11+
12+
fct_employees_by_mode_and_employee_type AS (
13+
SELECT
14+
staging_employees_by_mode_and_employee_type.*,
15+
dim_organizations.caltrans_district
816
FROM staging_employees_by_mode_and_employee_type
17+
LEFT JOIN dim_organizations
18+
ON CASE
19+
WHEN staging_employees_by_mode_and_employee_type.report_year = 2022 THEN
20+
staging_employees_by_mode_and_employee_type.ntd_id = dim_organizations.ntd_id_2022
21+
ELSE
22+
staging_employees_by_mode_and_employee_type.ntd_id = dim_organizations.ntd_id
23+
END
924
)
1025

1126
SELECT
@@ -48,6 +63,7 @@ SELECT
4863
vehicle_operations_count_q,
4964
vehicle_operations_hours,
5065
vehicle_operations_hours_q,
66+
caltrans_district,
5167
dt,
5268
execution_ts
5369
FROM fct_employees_by_mode_and_employee_type

0 commit comments

Comments
 (0)