fixed paleogeography endpoints

UW-Macrostrat · Nov 4, 2024 · 7b16afc · 7b16afc
1 parent 65b58ec
commit 7b16afc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/api-tests/app.ts b/api-tests/app.ts
@@ -10,13 +10,13 @@ import * as path from 'path';
 
 const testFiles = [
     // waiting for confirmation to implement solution for 'defs_sources.ts',
-    'geologic_units_gmna.ts',
+    //'geologic_units_gmna.ts',
     //'geologic_units_gmus.ts'
     //'mancos_test_cases.ts',
     //'mobile_macro_summary.ts',
     //'mobile_map_query.ts',
     //'mobile_point_details.ts',
-    //'paleogeography.ts',
+    'paleogeography.ts',
     //'tiles.ts', need to test on dev url
    // 'units.ts'
 ];

diff --git a/v2/larkin.ts b/v2/larkin.ts
@@ -135,6 +135,8 @@ const { Client, Pool } = require("pg");
         //named uses yesql to modify the params dict and sql named parameters into an array before querying PG.
         //client.query can only accept numerical indices in sql syntax and an array for parameter values.
         const preparedQuery = named(sql)(params);
+        console.log("Yesql parsed query: ", preparedQuery.text);
+        console.log("Yesql parsed parameters: ", preparedQuery.values);
         client.query(preparedQuery.text, preparedQuery.values, function (err, result) {
           done();
           if (err) {

diff --git a/v2/paleogeography.ts b/v2/paleogeography.ts
@@ -14,17 +14,18 @@ module.exports = function (req, res, next) {
           if (req.query.age) {
             callback(null, req.query.age);
           } else if (req.query.interval_name) {
-              let sql = `SELECT (age_bottom + age_top)/2 AS mid FROM macrostrat.intervals WHERE interval_name = :interval_name`
-              params['interval_name'] = req.query.interval_name
+            let sql = `SELECT (age_bottom + age_top)/2 AS mid FROM macrostrat.intervals WHERE interval_name = :interval_name`;
+            params['interval_name'] = req.query.interval_name;
             larkin.queryPg("burwell",
               sql,
-               params,
+              params,
               function (error, result) {
+              console.log("results", result)
                 if (error) {
                   callback(error);
                 } else {
-                  if (result.length === 1) {
-                    callback(null, parseInt(result[0].mid));
+                  if (result.rows.length === 1) {
+                    callback(null, parseInt(result.rows[0].mid));
                   } else {
                     larkin.error(req, res, next, "interval not found");
                   }
@@ -46,7 +47,7 @@ module.exports = function (req, res, next) {
               limit,
             [],
             function (error, result) {
-              callback(null, result);
+              callback(null, result.rows);
             },
           );
         },