From f09043c9375f325fc70503c6dad5c1eab79c88af Mon Sep 17 00:00:00 2001 From: Tyler Matteo Date: Thu, 21 Mar 2024 14:09:02 -0400 Subject: [PATCH] Merge data version update to staging (#287) * point to archive digital ocean space * Fix for AB#14700, invalid selection type will no cause server api * use node v18.17.1 for ci * point to versioned digital ocean space * only specify major version of database * expose port 5433 * use 5432 within docker network * point to archive digital ocean space * update postgres to 15 * build from spaces version folders * point to 2023-08-21 decennial data * update table variables that changed * Decennial data version with: - No space at end of male var - 2020 var metadata - ccd prefix in geoid * Updated geography version. * populate support_geoids table with ccds update selection table to support ccds * Add CCDs to summary level * update ci to postgres:15 and node 18 * update ci to run ubuntu 22 * add special variable configurations * Revert "use 5432 within docker network" and "expose port 5433" This reverts commits b8a66f123d82861c9f3f1e38cba7a46f5bbcb9c9 and 479fc95a8ea25bfa917523a7c2e513b5d17182d7 * remove CCDs from support geoids table migration * fix agdpdrt and popacre calculations * support decennial variable names for mdage bins * remove CCDs from support geoids table migration (reapplication of change) * use data version with two decimal landacre precision * use regex match in median error calculation * Add index on geoid column for ACS db tables (#261) * Add index on geoid column for ACS db tables * Add INDEX_NAME var to etl script and update acs.sql to use it to create geoid index * Update decennial.sql to use INDEX_NAME variable to create geoid index --------- Co-authored-by: Tyler Matteo * Issue/16067 PFF Updates (#272) * Population FactFinder 2018-2022 ACS & 2020 DDHC-A Updates * Issue 268 update constants * Issue 256 Update top and bottom thresholds * issue 274 update constants for data migration * Update to working version folders for acs and decennial csvs * Closes #1147 - updated decennial metadata script to reflect domain change from decennial to census - added semicolons in constants js * updated constants with new dates --------- Co-authored-by: pratishta * 279 updated constants * issue 284 updated constants to pull new data (#286) --------- Co-authored-by: tangoyankee Co-authored-by: dhochbaum-dcp Co-authored-by: Bryan Co-authored-by: Horatio Co-authored-by: pratishta Co-authored-by: horatio --- app.js | 6 +++--- special-calculations/data/constants.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app.js b/app.js index 8c2bce8..317296d 100644 --- a/app.js +++ b/app.js @@ -19,10 +19,10 @@ app.db = pgp(process.env.DATABASE_URL); // allows CORS app.use(cors({ - origin: ['https://staging--labs-factfinder.netlify.app','https://develop--labs-factfinder.netlify.app','https://popfactfinder.planning.nyc.gov', 'http://localhost:4200','https://factfinder-staging.planninglabs.nyc','https://factfinder-develop.planninglabs.nyc'], - methods: "GET,HEAD,PUT,PATCH,POST,DELETE", + origin: ['https://staging--labs-factfinder.netlify.app', 'https://develop--labs-factfinder.netlify.app', 'https://popfactfinder.planning.nyc.gov', 'http://localhost:4200', 'https://factfinder-staging.planninglabs.nyc', 'https://factfinder-develop.planninglabs.nyc'], + methods: 'GET,HEAD,PUT,PATCH,POST,DELETE', allowedHeaders: 'X-Requested-With,Content-Type,Authorization', -})) +})); // middleware app.use(logger('dev')); diff --git a/special-calculations/data/constants.js b/special-calculations/data/constants.js index 581796e..a019416 100644 --- a/special-calculations/data/constants.js +++ b/special-calculations/data/constants.js @@ -8,14 +8,14 @@ const PREV_YEAR = 'Y2006-2010'; // TODO: update with actual previous year const GEOGRAPHY_VERSION = '2023-08-29'; const DECENNIAL_SCHEMA_NAME = 'decennial'; const DECENNIAL_LATEST_TABLE_NAME = '2020'; -const DECENNIAL_LATEST_VERSION = '2024-03-15'; +const DECENNIAL_LATEST_VERSION = '2024-03-19'; const DECENNIAL_EARLIEST_TABLE_NAME = '2010'; -const DECENNIAL_EARLIEST_VERSION = '2024-03-15'; +const DECENNIAL_EARLIEST_VERSION = '2024-03-19'; const ACS_SCHEMA_NAME = 'acs'; const ACS_LATEST_TABLE_NAME = '2022'; -const ACS_LATEST_VERSION = '2024-03-15'; +const ACS_LATEST_VERSION = '2024-03-19'; const ACS_EARLIEST_TABLE_NAME = '2010'; -const ACS_EARLIEST_VERSION = '2024-03-15'; +const ACS_EARLIEST_VERSION = '2024-03-19'; const ACS_METADATA_FULL_PATH = `"${ACS_SCHEMA_NAME}"."metadata"`; const ACS_LATEST_TABLE_FULL_PATH = `"${ACS_SCHEMA_NAME}"."${ACS_LATEST_TABLE_NAME}"`; const ACS_EARLIEST_TABLE_FULL_PATH = `"${ACS_SCHEMA_NAME}"."${ACS_EARLIEST_TABLE_NAME}"`;