Merge branch 'develop' into production

Author: SimonGoring

openapi.yaml

@@ -11,10 +11,15 @@
             schema:
               $ref: '#/components/schemas/depenvbyid' 
         description: 'This returns the information about depositional
-          environment for selected dataset/collention unit/site.'
+          environment for selected dataset/collection unit/site.'
     tags:
       - v2.0
-      - depositional environment 
+      - depositional environment
+    x-database-tables: 
+      - sites
+      - datasets
+      - collectionunits
+      - depenvttypes
 /v2.0/apps/constdb:
   get:
     responses:
@@ -32,6 +37,8 @@
       - Database metadata
       - Summary Informationrmation
       - v2.0
+    x-database-tables:
+      - constituentdatabases
 /v2.0/apps/constdb/datasetages:
   get:
     parameters:
@@ -48,6 +55,9 @@
       - Dataset metadata
       - Summary Information
       - v2.0
+    x-database-tables:
+      - constituentdatabases
+      - datasets
 /v2.0/apps/constdb/datasetuploads:
   get:
     parameters:
@@ -64,6 +74,9 @@
       - Dataset metadata
       - Summary Information
       - v2.0
+    x-database-tables:
+      - datasets
+      - constituentdatabases
 /v2.0/apps/constdb/datasets:
   get:
     parameters:

openapi/components/schemas/schemas.yml

@@ -12,7 +12,7 @@ const path = require('path');
  * is up to date as we develop.
  */
 function buildOpenAPI() {
-  console.log('🔄 Building OpenAPI specification...');
+  console.log('Building OpenAPI specification...');
 
   // Create the `dist` folder (for distribution) if the
   // `dist` folder does not exist.
@@ -56,19 +56,19 @@ function buildOpenAPI() {
   // This will give us `useFiles` which tells us which files are associated
   // with each section.
   Object.keys(toBuild).forEach((key) => {
-    console.log(`📝 Loading paths for the ${key} section...`);
+    console.log(`Loading paths for the ${key} section...`);
     const outputs = findYamlElements(toBuild[key]).flat();
     outputs.forEach((file) => {
-      console.log(`  📝 Loading paths from ${file}...`);
+      console.log(`Loading paths from ${file}...`);
       try {
         const pathSpec = yaml.load(fs.readFileSync(file, 'utf8'));
         if (pathSpec && typeof pathSpec === 'object') {
           if (key === 'paths') {
             Object.assign(mainSpec[key], pathSpec);
-            console.log(`✅ Added ${Object.keys(pathSpec).length} paths from ${file}`);
+            console.log(`Added ${Object.keys(pathSpec).length} paths from ${file}`);
           } else {
             Object.assign(mainSpec.components[key], pathSpec);
-            console.log(`✅ Added ${Object.keys(pathSpec).length} components from ${file}`);
+            console.log(`Added ${Object.keys(pathSpec).length} components from ${file}`);
           }
         }
       } catch (error) {

openapi/paths/v20/apps.yml

@@ -14,12 +14,12 @@
     "start": "NODE_ENV=production nodemon --legacy-watch app.js",
     "test": "node ./node_modules/mocha/bin/mocha --config=test/.mocharc.yml --reporter-options reportDir=public,reportFilename=tests",
     "build:openapi": "(cd ./openapi && node ./scripts/build-openapi.js)",
-    "validate:openapi": "yarn build:openapi && bash genoatt.sh && sleep 2 && bash runmochabatch.sh"
+    "validate:openapi": "yarn build:openapi && bash genoatt.sh && sleep 4 && bash runmochabatch.sh"
   },
   "pre-commit": "validate:openapi",
   "dependencies": {
     "@terraformer/wkt": "^2.2.1",
-    "acorn": "^6.4.2",
+    "acorn": "^8.15.0",
     "apicache": "^1.6.2",
     "axios": "^1.12.0",
     "big-json": "^3.2.0",
@@ -37,7 +37,7 @@
     "express": "^4.21.2",
     "express-rate-limit": "^7.5.1",
     "he": "^1.2.0",
-    "helmet": "^7.2.0",
+    "helmet": "^8.1.0",
     "jade": "^1.11.0",
     "js2xmlparser": "^4.0.1",
     "morgan": "^1.10.1",
@@ -55,7 +55,7 @@
   },
   "devDependencies": {
     "chai": "^4.3.6",
-    "chai-openapi-response-validator": "^0.13.0",
+    "chai-openapi-response-validator": "^0.14.2",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.11.0",
     "eslint-config-standard": "^12.0.0",

openapi/scripts/build-openapi.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const chai = require('chai');
 const assert = require('assert');
 const should = require('chai').should();

package.json

@@ -7,7 +7,7 @@ const expect = chakram.expect;
 describe('tests for /v1.5/data/contacts/{contactid}', function() {
   describe('tests for get', function() {
     it('should respond 200 for "Contact"', function() {
-      const response = request('get', 'http://localhost:3001/v1.5/data/contacts/500', {
+      const response = request('get', 'http://localhost:3001/v1.5/data/contacts/-4982637', {
         'time': true,
       });
 

public/tests.html

@@ -8,7 +8,7 @@ describe('tests for /v1.5/data/geopoliticalunits', function() {
   describe('tests for get', function() {
     it('should respond 200 for "An array of geopolitical units."', function() {
       const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits', {
-        'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 3, 'lower': true},
+        'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 1, 'lower': false},
         'time': true,
       });