Fully implements db-centric rfc_max_forecast

NOAA-OWP · Jan 23, 2024 · 11afec8 · 11afec8
1 parent eb7ef8d
commit 11afec8
Show file tree

Hide file tree

Showing 6 changed files with 515 additions and 255 deletions.
diff --git a/Core/EC2/RDSBastion/scripts/viz/postgresql_setup.sh.tftpl b/Core/EC2/RDSBastion/scripts/viz/postgresql_setup.sh.tftpl
@@ -39,4 +39,8 @@ psql -h "${viz_db_host}" -U "${viz_db_username}" -p ${viz_db_port} -d "${viz_db_
 
 # Add permissions for aws_s3 extension to viz user.
 echo "Adding permissions to aws_s3 extension for viz user..."
-psql -h "${viz_db_host}" -U "${viz_db_username}" -p ${viz_db_port} -d "${viz_db_name}" -qtAc "GRANT USAGE ON schema aws_s3 TO ${viz_proc_admin_rw_username}; GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA aws_s3 TO ${viz_proc_admin_rw_username};"
+psql -h "${viz_db_host}" -U "${viz_db_username}" -p ${viz_db_port} -d "${viz_db_name}" -qtAc "GRANT USAGE ON schema aws_s3 TO ${viz_proc_admin_rw_username}; GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA aws_s3 TO ${viz_proc_admin_rw_username};"
+
+echo "Creating enum types for use in rfc-based services"
+psql -h "${viz_db_host}" -U "${viz_db_username}" -p ${viz_db_port} -d "${viz_db_name}" -qtAc "CREATE TYPE flood_status AS ENUM ('no_flooding', 'action', 'minor', 'moderate', 'major');"
+psql -h "${viz_db_host}" -U "${viz_db_username}" -p ${viz_db_port} -d "${viz_db_name}" -qtAc "CREATE TYPE forecast_ts AS ENUM ('FE', 'FF', 'FM', 'FN', 'FP', 'FQ', 'FU', 'FV', 'FW', 'FA', 'FB', 'FC', 'FD', 'FX', 'FG', 'FL', 'FZ');"
diff --git a/Core/LAMBDA/rnr_functions/rnr_domain_generator/sql/dba_stuff.sql b/Core/LAMBDA/rnr_functions/rnr_domain_generator/sql/dba_stuff.sql
@@ -43,4 +43,102 @@ ORDER BY
 	nwm_feature_id, 
 	nws_station_id,
 	nws_usgs_crosswalk_dataset_id DESC NULLS LAST,
-	location_nwm_crosswalk_dataset_id DESC NULLS LAST;
+	location_nwm_crosswalk_dataset_id DESC NULLS LAST;
+
+-- CREATE FLOW_THRESHOLDS VIEW
+DROP VIEW IF EXISTS rnr.flow_thresholds;
+CREATE VIEW rnr.flow_thresholds AS
+
+WITH
+
+main AS (
+	SELECT 
+		station.location_id as nws_station_id,
+		COALESCE(native.action_flow, usgs.action_flow_calc, nrldb.action_flow_calc) as action,
+			CASE 
+				WHEN native.action_flow IS NOT NULL
+				THEN 'Native'
+				WHEN usgs.action_flow_calc IS NOT NULL
+				THEN 'USGS'
+				WHEN nrldb.action_flow_calc IS NOT NULL
+				THEN 'NRLDB'
+			END as action_source,
+			COALESCE(native.minor_flow, usgs.minor_flow_calc, nrldb.minor_flow_calc) as minor,
+			CASE 
+				WHEN native.minor_flow IS NOT NULL
+				THEN 'Native'
+				WHEN usgs.minor_flow_calc IS NOT NULL
+				THEN 'USGS'
+				WHEN nrldb.minor_flow_calc IS NOT NULL
+				THEN 'NRLDB'
+			END as minor_source,
+			COALESCE(native.moderate_flow, usgs.moderate_flow_calc, nrldb.moderate_flow_calc) as moderate,
+			CASE 
+				WHEN native.moderate_flow IS NOT NULL
+				THEN 'Native'
+				WHEN usgs.moderate_flow_calc IS NOT NULL
+				THEN 'USGS'
+				WHEN nrldb.moderate_flow_calc IS NOT NULL
+				THEN 'NRLDB'
+			END as moderate_source,
+			COALESCE(native.major_flow, usgs.major_flow_calc, nrldb.major_flow_calc) as major,
+			CASE 
+				WHEN native.major_flow IS NOT NULL
+				THEN 'Native'
+				WHEN usgs.major_flow_calc IS NOT NULL
+				THEN 'USGS'
+				WHEN nrldb.major_flow_calc IS NOT NULL
+				THEN 'NRLDB'
+			END as major_source,
+			COALESCE(native.record_flow, usgs.record_flow_calc, nrldb.record_flow_calc) as record,
+			CASE 
+				WHEN native.record_flow IS NOT NULL
+				THEN 'Native'
+				WHEN usgs.record_flow_calc IS NOT NULL
+				THEN 'USGS'
+				WHEN nrldb.record_flow_calc IS NOT NULL
+				THEN 'NRLDB'
+			END as record_source
+	FROM (SELECT DISTINCT location_id FROM external.threshold) AS station
+	LEFT JOIN external.threshold native
+		ON native.location_id = station.location_id 
+		AND native.rating_source = 'NONE'
+	LEFT JOIN external.threshold usgs
+		ON usgs.location_id = station.location_id 
+		AND usgs.rating_source = 'USGS Rating Depot'
+	LEFT JOIN external.threshold nrldb
+		ON nrldb.location_id = station.location_id 
+		AND nrldb.rating_source = 'NRLDB'
+)
+
+SELECT * FROM main
+WHERE COALESCE(action, minor, moderate, major, record) IS NOT NULL;
+
+-- CREATE STAGE THRESHOLDS VIEW
+DROP VIEW IF EXISTS rnr.stage_thresholds;
+CREATE VIEW rnr.stage_thresholds AS
+
+WITH
+
+native_stage_thresholds AS (
+	SELECT 
+		location_id,
+		action_stage,
+		minor_stage,
+		moderate_stage,
+		major_stage,
+		record_stage
+	FROM external.threshold
+	WHERE rating_source = 'NONE'
+)
+
+SELECT 
+	location_id AS nws_station_id,
+	action_stage as action,
+	minor_stage as minor,
+	moderate_stage as moderate,
+	major_stage as major,
+	record_stage as record
+FROM external.threshold station
+WHERE rating_source = 'NONE' 
+	AND COALESCE(action_stage, minor_stage, moderate_stage, major_stage, record_stage) IS NOT NULL;
diff --git a/Core/LAMBDA/viz_functions/main.tf b/Core/LAMBDA/viz_functions/main.tf
@@ -278,8 +278,9 @@ resource "aws_lambda_function" "viz_wrds_api_handler" {
 
 resource "aws_cloudwatch_event_target" "check_lambda_every_five_minutes" {
   rule      = var.five_minute_trigger.name
-  target_id = aws_lambda_function.viz_wrds_api_handler.function_name
-  arn       = aws_lambda_function.viz_wrds_api_handler.arn
+  target_id = aws_lambda_function.viz_initialize_pipeline.function_name
+  arn       = aws_lambda_function.viz_initialize_pipeline.arn
+  input     = "{\"configuration\":\"rfc\"}"
 }
 
 resource "aws_lambda_permission" "allow_cloudwatch_to_call_check_lambda" {