cdbg output sorting, missing columns (#1385)

* order cdbg product tables * add individual low and mod pop columns
NYCPlanning · Jan 9, 2025 · f39ad40 · f39ad40
1 parent 7de3df5
commit f39ad40
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/products/cdbg/models/intermediate/_intermediate_models.yml b/products/cdbg/models/intermediate/_intermediate_models.yml
@@ -13,8 +13,10 @@ models:
   - name: residential_floor_area
   - name: residential_floor_area_percentage
   - name: potential_lowmod_population
-  - name: lowmod_population
+  - name: low_mod_income_population
   - name: low_mod_income_population_percentage
+  - name: low_income_population
+  - name: mod_income_population
   - name: geom
     tests: [ not_null ]
 

diff --git a/products/cdbg/models/intermediate/int__block_groups.sql b/products/cdbg/models/intermediate/int__block_groups.sql
@@ -17,6 +17,8 @@ block_groups_demographics AS (
         block_groups_income.block_group,
         block_groups_income.potential_lowmod_population,
         block_groups_income.low_mod_income_population,
+        block_groups_income.low_income_population,
+        block_groups_income.mod_income_population,
         block_groups_income.low_mod_income_population_percentage
     FROM block_groups
     LEFT JOIN block_groups_income

diff --git a/products/cdbg/models/product/_product_models.yml b/products/cdbg/models/product/_product_models.yml
@@ -56,6 +56,14 @@ models:
     data_type: decimal
     tests: [ not_null ]
 
+  - name: low_income_population
+    data_type: integer
+    tests: [ not_null ]
+
+  - name: mod_income_population
+    data_type: integer
+    tests: [ not_null ]
+
   - name: eligibility_flag
     data_type: boolean
     tests: [ not_null ]
@@ -205,6 +213,8 @@ models:
   - name: '"Total Population"'
   - name: '"Number of Low-/ Moderate-Income Persons"'
   - name: '"% of Low-/ Moderate-Income Persons"'
+  - name: '"Low-Income"'
+  - name: '"Moderate-Income"'
   - name: '"Eligibility"'
 
 - name: cdbg_zap_eligibility

diff --git a/products/cdbg/models/product/cdbg_block_groups.sql b/products/cdbg/models/product/cdbg_block_groups.sql
@@ -16,6 +16,8 @@ renamed AS (
         potential_lowmod_population::integer,
         low_mod_income_population::integer,
         round(low_mod_income_population_percentage::numeric, 2) AS low_mod_income_population_percentage,
+        low_income_population::integer,
+        mod_income_population::integer,
         low_mod_income_population_percentage >= 51 AND residential_floor_area_percentage >= 50 AS eligibility_flag
     FROM block_groups
 )
@@ -27,3 +29,4 @@ SELECT
         ELSE 'Ineligible'
     END AS eligibility
 FROM renamed
+ORDER BY bctbg2020
diff --git a/products/cdbg/models/product/cdbg_tracts.sql b/products/cdbg/models/product/cdbg_tracts.sql
@@ -13,3 +13,4 @@ SELECT
     eligibility_flag,
     eligibility
 FROM {{ ref("int__tracts") }}
+ORDER BY bct2020
diff --git a/products/cdbg/models/product/excel/cdbg_block_groups_excel.sql b/products/cdbg/models/product/excel/cdbg_block_groups_excel.sql
@@ -15,5 +15,7 @@ SELECT
     potential_lowmod_population AS "Total Population",
     low_mod_income_population AS "Number of Low-/ Moderate-Income Persons",
     low_mod_income_population_percentage AS "% of Low-/ Moderate-Income Persons",
+    low_income_population AS "Low-Income",
+    mod_income_population AS "Moderate-Income",
     eligibility AS "Eligibility"
 FROM block_groups
diff --git a/products/cdbg/models/staging/stg__low_mod_by_block_group.sql b/products/cdbg/models/staging/stg__low_mod_by_block_group.sql
@@ -9,6 +9,8 @@ SELECT
     "TRACT"::text AS tract,
     "BLKGRP"::text AS block_group,
     REPLACE("LOWMODUNIV", ',', '')::decimal AS potential_lowmod_population,
+    REPLACE("LOW", ',', '')::decimal AS low_income_population,
+    REPLACE("LOWMOD", ',', '')::decimal - REPLACE("LOW", ',', '')::decimal AS mod_income_population,
     REPLACE("LOWMOD", ',', '')::decimal AS low_mod_income_population,
     RTRIM("LOWMOD_PCT", '%')::numeric AS low_mod_income_population_percentage
 FROM {{ source("recipe_sources", "hud_lowmodincomebyblockgroup") }}