- Fix ordering of program type to preserve view ordering

Author: elipe17

tdrs-backend/plg/grafana_views/generate_views.py

@@ -16,14 +16,14 @@
 
 query_template = """
 SELECT {fields}
-    data_files.program_type,
     data_files.section,
     data_files.version,
     data_files.year,
     data_files.quarter,
     stt.name AS "STT",                                                     -- Select stt_name from the stts table
     stt.stt_code AS "STT_CODE",                                            -- Select stt_code from the stts table
-    stt.region_id AS "REGION"                                              -- Select region from the stts table
+    stt.region_id AS "REGION",                                             -- Select region from the stts table
+    data_files.program_type
 FROM {table} {record_type}
 INNER JOIN
         data_files_datafile data_files                                     -- Join with data_files_datafile
@@ -34,18 +34,19 @@
             section,                                                       -- Select section
             year,                                                          -- Select fiscal_year
             quarter,                                                       -- Select fiscal_quarter
-            MAX(version) AS version                                        -- Get the maximum version for each group
+            MAX(version) AS version,                                       -- Get the maximum version for each group
+            program_type                                                   -- Select program_type
         FROM
             data_files_datafile                                            -- Subquery table
         GROUP BY
-            stt_id, section, year, quarter                                 -- Group by columns
+            stt_id, program_type, section, year, quarter                   -- Group by columns
     ) most_recent
         ON data_files.stt_id = most_recent.stt_id
-        AND data_files.program_type = most_recent.program_type,
         AND data_files.section = most_recent.section
         AND data_files.version = most_recent.version
         AND data_files.year = most_recent.year
         AND data_files.quarter = most_recent.quarter
+        AND data_files.program_type = most_recent.program_type
     INNER JOIN
         stts_stt stt                                                       -- Join with the stts table (aliased as stt)
         ON data_files.stt_id = stt.id                                      -- Join condition to match stt_id