Adding all the stuff back up.

Author: SimonGoring

openapi.yaml

@@ -1065,11 +1065,9 @@ components:
         preparedby:
           properties:
             contactid:
-              example: 44
-              type: integer
+              $ref: '#/components/schemas/contactid'
             contactname:
-              example: 'Grimm, Eric Christopher'
-              type: string
+              $ref: '#/components/schemas/contactname'
             familyname:
               example: Grimm
               type: string
@@ -1367,7 +1365,7 @@ components:
                   altitude:
                     type: integer
                   collectionunit:
-                    type: string
+                    $ref: '#/components/schemas/collectionunit'
                   collectionunitid:
                     $ref: '#/components/schemas/collectionunitid'
                   geography:

openapi/components/schemas/schemas.yml

@@ -295,11 +295,9 @@ chronology:
     preparedby:
       properties:
         contactid:
-          example: 44
-          type: integer
+          $ref: '#/components/schemas/contactid'
         contactname:
-          example: Grimm, Eric Christopher
-          type: string
+          $ref: '#/components/schemas/contactname'
         familyname:
           example: Grimm
           type: string
@@ -597,7 +595,7 @@ dataset:
               altitude:
                 type: integer
               collectionunit:
-                type: string
+                $ref: '#/components/schemas/collectionunit'
               collectionunitid:
                 $ref: '#/components/schemas/collectionunitid'
               geography:

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': 2, 'lower': false},
+        'qs': {'gpid': 5392, 'gpname': 'Canada', 'rank': 1, 'lower': false},
         'time': true,
       });
 

public/tests.json

@@ -7,7 +7,7 @@ const expect = chakram.expect;
 describe('tests for /v1.5/data/geopoliticalunits/{gpid}', 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/162', {
+      const response = request('get', 'http://localhost:3001/v1.5/data/geopoliticalunits/500', {
         'time': true,
       });
 

test/v1.5-data-geopoliticalunits-test.js

@@ -7,7 +7,7 @@ const expect = chakram.expect;
 describe('tests for /v1.5/data/sites/{siteid}', function() {
   describe('tests for get', function() {
     it('should respond 200 for "An array of site elements."', function() {
-      const response = request('get', 'http://localhost:3001/v1.5/data/sites/7980', {
+      const response = request('get', 'http://localhost:3001/v1.5/data/sites/500', {
         'time': true,
       });
 

test/v1.5-data-geopoliticalunits-{gpid}-test.js

@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetages', function() {
   describe('tests for get', function() {
     it('should respond 200 for "Returns an ordered array (from earliest to latest) of upload counts by month (YYYY/MM/DD; all days as 01). Months with no uploads are excluded. "', function() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetages', {
-        'qs': {'dbid': 17},
+        'qs': {'dbid': 34},
         'time': true,
       });
 

test/v1.5-data-sites-{siteid}-test.js

@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasets', function() {
   describe('tests for get', function() {
     it('should respond 200 for "Returns the set of datasets contained within a constituent database, identified by the constituent database identifier. Used for quick landing page generation. "', function() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasets', {
-        'qs': {'dbid': 18},
+        'qs': {'dbid': 2},
         'time': true,
       });
 

test/v2.0-apps-constdb-datasetages-test.js

@@ -8,7 +8,7 @@ describe('tests for /v2.0/apps/constdb/datasetuploads', function() {
   describe('tests for get', function() {
     it('should respond 200 for "Returns an ordered array (from earliest to latest) of upload counts by month (YYYY/MM/DD; all days as 01). Months with no uploads are excluded. "', function() {
       const response = request('get', 'http://localhost:3001/v2.0/apps/constdb/datasetuploads', {
-        'qs': {'dbid': 34},
+        'qs': {'dbid': 4},
         'time': true,
       });