From a7979bfb201346358437f1f0eae7eb5246f90dfb Mon Sep 17 00:00:00 2001
From: Molly Smith <molly.b.smith@noaa.gov>
Date: Fri, 13 Oct 2023 11:09:03 -0600
Subject: [PATCH] Moved middleware templates to MATScommon

---
 MATScommon                                        |  2 +-
 METexpress                                        |  2 +-
 .../tmpl_distinct_fcstValidEpoch_obs.sql          | 10 ----------
 .../tmpl_get_N_stations_mfve_IN_model.sql         | 15 ---------------
 .../tmpl_get_N_stations_mfve_IN_obs.sql           | 11 -----------
 .../sqlTemplates/tmpl_get_distinct_fcstLen.sql    | 10 ----------
 6 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_distinct_fcstValidEpoch_obs.sql
 delete mode 100644 apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_model.sql
 delete mode 100644 apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_obs.sql
 delete mode 100644 apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_distinct_fcstLen.sql

diff --git a/MATScommon b/MATScommon
index 7fdcaef803..84ff40e20e 160000
--- a/MATScommon
+++ b/MATScommon
@@ -1 +1 @@
-Subproject commit 7fdcaef803d3adf97ab0de2afa81f81d6c09ba03
+Subproject commit 84ff40e20e397196e845843d195a48a2d4d3e2d2
diff --git a/METexpress b/METexpress
index 790368a7ab..484e0d097b 160000
--- a/METexpress
+++ b/METexpress
@@ -1 +1 @@
-Subproject commit 790368a7ab236e78880c9939fe54faf80cc1b6e9
+Subproject commit 484e0d097b3ac8085e6a5b6c8758edde68bf9e5e
diff --git a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_distinct_fcstValidEpoch_obs.sql b/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_distinct_fcstValidEpoch_obs.sql
deleted file mode 100644
index 3da3b59866..0000000000
--- a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_distinct_fcstValidEpoch_obs.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT DISTINCT fcstValidEpoch
-FROM
-    `vxdata`._default.METAR
-WHERE
-    type = "DD"
-    AND docType = "obs"
-    AND version = "V01"
-    AND fcstValidEpoch BETWEEN {{vxFROM_SECS}}
-    AND {{vxTO_SECS}}
-    ORDER BY fcstValidEpoch
\ No newline at end of file
diff --git a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_model.sql b/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_model.sql
deleted file mode 100644
index ad04c3048b..0000000000
--- a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_model.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-SELECT
-    fcstValidEpoch fve,
-    fcstLen fcst_lead,
-    {{vxAVERAGE}} avtime,
-    {{stationNamesList}}
-FROM
-    `vxdata`._default.METAR AS models
-WHERE
-    type = "DD"
-    AND docType = "model"
-    AND model = {{vxMODEL}}
-    AND fcstLen = {{vxFCST_LEN}}
-    AND fcstLen IN {{vxFCST_LEN_ARRAY}}
-    AND version = "V01"
-    AND fcstValidEpoch IN {{fcstValidEpoch}}
\ No newline at end of file
diff --git a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_obs.sql b/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_obs.sql
deleted file mode 100644
index bcb1171b2c..0000000000
--- a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_N_stations_mfve_IN_obs.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-SELECT
-    fcstValidEpoch fve,
-    {{vxAVERAGE}} avtime,
-    {{stationNamesList}}
-FROM
-    `vxdata`._default.METAR AS obs
-WHERE
-    type = "DD"
-    AND docType = "obs"
-    AND version = "V01"
-    AND fcstValidEpoch IN {{fcstValidEpoch}}
\ No newline at end of file
diff --git a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_distinct_fcstLen.sql b/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_distinct_fcstLen.sql
deleted file mode 100644
index 5df1c9b61d..0000000000
--- a/apps/cb-metar/private/matsMiddle/sqlTemplates/tmpl_get_distinct_fcstLen.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT DISTINCT fcstLen
-FROM vxdata._default.METAR m0
-WHERE m0.type='DD'
-    AND m0.docType='CTC'
-    AND m0.subset='METAR'
-    AND m0.version='V01'
-    AND m0.model={{vxMODEL}}
-    AND m0.fcstValidEpoch >= {{vxFROM_SECS}}
-    AND m0.fcstValidEpoch <= {{vxTO_SECS}}
-ORDER BY fcstLen;