fixed mobile/points endpoint

Author: amyfromandi

api-tests/app.ts

@@ -10,7 +10,7 @@ import * as fs from "fs";
 import * as path from "path";
 /*
 const endpointsToFix = [
-  //can't find the gmna.lookup_units table. 'geologic_units_gmna.ts',
+  //can't find the gmna.lookup_units table. 'geologic_units_gmna.ts' Reached out to Shanan to see if we're going to migrate the geomacro db or if i need to rewrite this endpoint.
   //'geologic_units_gmus.ts'
   //'mancos_test_cases.ts',
   //uses gmus.lookup_units table. queries need to be customized and changed to match all of the lookup tables within postgresql

api-tests/v2Tests/geologic_units_gmna.ts api-tests/toReview/geologic_units_gmna.tsapi-tests/v2Tests/geologic_units_gmna.ts renamed to api-tests/toReview/geologic_units_gmna.ts

@@ -3,7 +3,8 @@ var request = require("supertest"),
   settings = require("../settings");
 
 it("should return metadata", function (done) {
-  request(settings.host)
+    this.timeout(10000);
+    request(settings.host)
     .get("/defs/econs")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)

api-tests/v2Tests/geologic_units_gmus.ts api-tests/toReview/geologic_units_gmus.tsapi-tests/v2Tests/geologic_units_gmus.ts renamed to api-tests/toReview/geologic_units_gmus.ts

@@ -204,7 +204,7 @@ it("should accept a environ_type parameter", function (done) {
 });
 
 it("should accept a environ_class parameter", function (done) {
-    this.timeout(10000);
+    this.timeout(15000);
     request(settings.host)
     .get("/units?environ_class=marine")
     .expect(validators.aSuccessfulRequest)
@@ -224,7 +224,8 @@ it("should accept a environ_class parameter", function (done) {
 });
 
 it("should accept a project_id", function (done) {
-  request(settings.host)
+    this.timeout(15000);
+    request(settings.host)
     .get("/units?project_id=4")
     .expect(validators.aSuccessfulRequest)
     .expect(validators.json)

api-tests/v2Tests/defs_econs.ts

@@ -9,6 +9,9 @@ module.exports = function (req, res, next) {
   if (Object.keys(req.query).length < 1) {
     larkin.info(req, res, next);
   } else {
+
+    const hasSample = Object.prototype.hasOwnProperty.call(req.query, "sample");
+
     var geo =
       req.query.format && api.acceptedFormats.geo[req.query.format]
         ? true
@@ -19,11 +22,8 @@ module.exports = function (req, res, next) {
       geomField = geo ? ", ST_AsGeoJSON(geom) AS geometry" : "",
       limit,
       from = "";
-    if (req.query.sample === "") {
-      limit = " LIMIT 5";
-    } else {
-      limit = "";
-    }
+
+    limit = hasSample ? " LIMIT 5" : "";
 
     if (req.query.gid && req.query.gid != "undefined") {
       where.push(" gid = $" + (where.length + 1));
@@ -76,23 +76,24 @@ module.exports = function (req, res, next) {
         ? ", ST_AsGeoJSON(ST_Intersection(ST_Buffer(geom, 0)::geography, buffer)) AS geometry"
         : "";
     }
-
-    if (where.length < 1 && !req.query.sample) {
+    if (where.length < 1 && !hasSample) {
       return larkin.error(req, res, next, "Invalid params");
     }
 
     if (where.length > 0) {
       where = " WHERE " + where.join(", ");
     }
-    //todo modify query to use macrostrat schema.
-    larkin.queryPg(
-      "geomacro",
-      "SELECT gid, unit_abbre, COALESCE(rocktype, '') AS rocktype, COALESCE(lithology, '') AS lith, lith_type, lith_class, min_interval AS t_interval, min_age::float AS t_age, max_interval AS b_interval, max_age::float AS b_age, containing_interval, interval_color AS color" +
+
+    let sql = "SELECT gid, unit_abbre, COALESCE(rocktype, '') AS rocktype, COALESCE(lithology, '') AS lith, lith_type, lith_class, min_interval AS t_interval, min_age::float AS t_age, max_interval AS b_interval, max_age::float AS b_age, containing_interval, interval_color AS color" +
         geomField +
         " FROM gmna.lookup_units" +
         from +
         where +
-        limit,
+        limit
+    //todo modify query to use macrostrat schema.
+    larkin.queryPg(
+      "geomacro",
+      sql,
       params,
       function (error, result) {
         if (error) {

api-tests/v2Tests/units.ts

@@ -234,7 +234,6 @@ module.exports = function (req, res, next) {
           where +
           orderBy +
           limit;
-
         larkin.queryPg("geomacro", sql, params, function (error, result) {
           if (error) {
             larkin.error(req, res, next, error);

v2/geologic_units_gmna.ts

@@ -42,7 +42,7 @@ function buildSQL(scale, where) {
       LEFT JOIN maps.map_liths ON map_liths.map_id = m.map_id
       LEFT JOIN macrostrat.liths ON map_liths.lith_id = liths.id
       ${where}
-      GROUP BY m.map_id
+      GROUP BY m.map_id, m.source_id, m.name, m.age, m.strat_name, m.lith, m.descrip, m.comments
     )
   `;
 }
@@ -71,7 +71,6 @@ module.exports = function (req, res, next) {
           .join(" UNION ");
 
         var toRun = `SELECT * FROM ( ${scaleSQL} ) doit`;
-
         larkin.queryPg("burwell", toRun, params, function (error, result) {
           if (error || !result.rows || !result.rows.length) {
             return callback(null, {});