Await QA

potential issue with analyst mailing list - waiting on outstanding helpdesk ticket

apps/cli/utilities/aat_wrest/aat_wrest/metadata_wrester.py

@@ -8,10 +8,9 @@ import sys
 
 import pendulum
 import psycopg2 as pg
-from pycapo import CapoConfig
-
 from aat_wrest.observation_wrester import ObservationWrester
-from aat_wrest.utilities import MDDBConnector, TIME_ZONE, PENDULUM_FORMAT
+from aat_wrest.utilities import PENDULUM_FORMAT, TIME_ZONE, MDDBConnector
+from pycapo import CapoConfig
 
 logger = logging.getLogger("aat_wrest")
 logger.setLevel(logging.INFO)
@@ -27,7 +26,7 @@ class WrestWorkflowMetadata:
         self.logger = logging.getLogger("aat_wrest")
         self.conn = connection
         if not spl and fileset_id:
-            self.spl = self.wrest_spl_from_fileset_id(fileset_id)
+            self.spl = self.wrest_obs_metadata_from_fileset_id(fileset_id)["spl"]
         else:
             self.spl = spl
 
@@ -78,19 +77,35 @@ class WrestWorkflowMetadata:
             self.conn.close()
         return make_json
 
-    def wrest_spl_from_fileset_id(self, fileset_id: str) -> str:
+    def wrest_obs_metadata_from_fileset_id(self, fileset_id: str) -> str:
         """
         Given a fileset_id, query the Metadata DB and return the corresponding science_product_locator
 
         :param fileset_id:
         :return science_product_locator:
         """
-        sql = f"SELECT science_product_locator FROM execution_blocks WHERE ngas_fileset_id = %(fileset_id)s"
+        metadata = {
+            "spl": None,
+            "bands": None,
+            "array_config": None,
+            "obs_start_time": None,
+            "obs_end_time": None,
+        }
+        sql = f"""
+        SELECT science_product_locator, band_code, configuration, starttime, endtime
+          FROM execution_blocks
+          WHERE ngas_fileset_id = %(fileset_id)s
+        """
         with self.conn.cursor() as cursor:
             cursor.execute(sql, {"fileset_id": fileset_id})
             data = cursor.fetchall()
-            spl = data[0][0]
-        return spl
+            metadata["spl"] = data[0][0]
+            metadata["bands"] = data[0][1]
+            metadata["array_config"] = data[0][2]
+            metadata["obs_start_time"] = data[0][3]
+            metadata["obs_end_time"] = data[0][4]
+
+        return metadata
 
 
 def parser() -> argparse.ArgumentParser: