facdb rework casting from ingest

NYCPlanning · Jan 14, 2025 · 3c7dcc1 · 3c7dcc1
1 parent b2e3373
commit 3c7dcc1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 62 deletions.
diff --git a/products/facilities/facdb/sql/_qaqc.sql b/products/facilities/facdb/sql/_qaqc.sql
@@ -1,7 +1,7 @@
 --Add mapped column to dcp_facilities_with_unmapped
 ALTER TABLE dcp_facilities_with_unmapped ADD COLUMN IF NOT EXISTS mapped boolean;
 UPDATE dcp_facilities_with_unmapped
-SET mapped = (latitude::numeric != 0 AND longitude::numeric != 0);
+SET mapped = (latitude != 0 AND longitude != 0);
 
 -- QC consistency in operator information
 DROP TABLE IF EXISTS qc_operator;
@@ -125,14 +125,14 @@ WITH
 new AS (
     SELECT
         captype,
-        sum(capacity::numeric)::integer AS sum_new
+        sum(capacity) AS sum_new
     FROM facdb
     GROUP BY captype
 ),
 old AS (
     SELECT
         captype,
-        sum(capacity::numeric)::integer AS sum_old
+        sum(capacity) AS sum_old
     FROM dcp_facilities_with_unmapped
     GROUP BY captype
 )

diff --git a/products/facilities/facdb/sql/pipelines/nysed_activeinstitutions.sql b/products/facilities/facdb/sql/pipelines/nysed_activeinstitutions.sql
@@ -6,53 +6,27 @@ WITH merged AS (
         nysed_activeinstitutions.*,
         nysed_nonpublicenrollment.*,
         (
-            CASE
-                WHEN (
-                    prek::numeric
-                    + halfk::numeric
-                    + fullk::numeric
-                    + g01::numeric
-                    + g02::numeric
-                    + g03::numeric
-                    + g04::numeric
-                    + g05::numeric
-                    + g06::numeric
-                    + uge::numeric
-                    + g07::numeric
-                    + g08::numeric
-                    + g09::numeric
-                    + g10::numeric
-                    + g11::numeric
-                    + g12::numeric
-                    + ugs::numeric
-                ) IS NOT NULL
-                    THEN (
-                        prek::numeric
-                        + halfk::numeric
-                        + fullk::numeric
-                        + g01::numeric
-                        + g02::numeric
-                        + g03::numeric
-                        + g04::numeric
-                        + g05::numeric
-                        + g06::numeric
-                        + uge::numeric
-                        + g07::numeric
-                        + g08::numeric
-                        + g09::numeric
-                        + g10::numeric
-                        + g11::numeric
-                        + g12::numeric
-                        + ugs::numeric
-                    )
-            END
+            prek
+            + halfk
+            + fullk
+            + g01
+            + g02
+            + g03
+            + g04
+            + g05
+            + g06
+            + uge
+            + g07
+            + g08
+            + g09
+            + g10
+            + g11
+            + g12
+            + ugs
         ) AS enrollment
     FROM nysed_activeinstitutions
     LEFT JOIN nysed_nonpublicenrollment
-        ON trim(
-            replace(nysed_nonpublicenrollment.beds_code, ',', ''),
-            ' '
-        )::text = nysed_activeinstitutions.sed_code::text
+        ON nysed_activeinstitutions.sed_code = nysed_nonpublicenrollment.beds_code
     WHERE (
         inst_type_description = 'PUBLIC SCHOOLS'
         AND inst_sub_type_description LIKE '%GED%'
@@ -105,25 +79,14 @@ SELECT
                 )
             WHEN
                 inst_type_description = 'NON-PUBLIC SCHOOLS'
-                AND (
-                    prek::numeric
-                    + halfk::numeric
-                    + fullk::numeric
-                    + g01::numeric
-                    + g02::numeric
-                    + g03::numeric
-                    + g04::numeric
-                    + g05::numeric
-                    + uge::numeric
-                ) > 0 THEN 'Elementary School - Non-public'
+                AND prek + halfk + fullk + g01 + g02 + g03 + g04 + g05 + uge > 0
+                THEN 'Elementary School - Non-public'
             WHEN
                 inst_type_description = 'NON-PUBLIC SCHOOLS'
-                AND (g06::numeric + g07::numeric + g08::numeric) > 0 THEN 'Middle School - Non-public'
+                AND g06 + g07 + g08 > 0 THEN 'Middle School - Non-public'
             WHEN
                 inst_type_description = 'NON-PUBLIC SCHOOLS'
-                AND (
-                    g09::numeric + g10::numeric + g11::numeric + g12::numeric + ugs::numeric
-                ) > 0 THEN 'High School - Non-public'
+                AND g09 + g10 + g11 + g12 + ugs > 0 THEN 'High School - Non-public'
             WHEN
                 inst_type_description = 'NON-PUBLIC SCHOOLS'
                 AND inst_sub_type_description NOT LIKE 'ESL'