@hestia-earth/data-api 0.0.2-1 → 0.0.2-3

package/.gitlab-ci.yml

@@ -9,7 +9,7 @@ default:
     paths:
       - node_modules/
   before_script:
-    - npm install
+    - npm ci --include=dev
 
 variables:
   CONTAINER_IMAGE: hestia-data-api
@@ -103,6 +103,9 @@ deploy-lambdas:
   script:
     - source envs/.${CI_COMMIT_REF_NAME}.env
     - npm run build:lambdas
+    # copy serverless package to include correct dependencies
+    - rm -rf package.json node_modules
+    - mv package.serverless.json package.json && npm ci --include=dev
     - npx serverless deploy --verbose
   only:
     - master

package/.mocharc.js

@@ -4,5 +4,5 @@ module.exports = {
   require: ['ts-node/register', 'source-map-support/register', 'test/prepare.ts'],
   'full-trace': true,
   'watch-files': 'src',
-  timeout: 5000
+  timeout: 10000
 };

package/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY package.json .
 COPY package-lock.json .
-RUN npm ci
+RUN npm ci --include=dev
 
 # copy source from context
 ADD . .

package/database/seed/index.ts

@@ -5,7 +5,12 @@ import * as commonSeeds from './common';
 
 const debug = Debug('@hestia/data-api:db:seed');
 
-export const seed = async ({ aggregatedCycles, aggregatedImpactAssessments, aggregatedSites, settings }) => {
+export const seed = async ({
+  aggregatedCycles = [],
+  aggregatedImpactAssessments = [],
+  aggregatedSites = [],
+  settings = []
+}) => {
   for (const site of aggregatedSites) {
     const { rows } = await query(
       `INSERT INTO aggregated_sites (jsonld_pivoted) VALUES ($1)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/data-api",
-  "version": "0.0.2-1",
+  "version": "0.0.2-3",
   "description": "Hestia Data API definitions",
   "main": "dist/models.js",
   "typings": "dist/models.d.ts",
@@ -10,7 +10,7 @@
     "build:lambdas": "rm -rf build-lambdas && tsc -p tsconfig.lambdas.json",
     "start": "node index.js",
     "dev": "ts-node-dev --respawn --rs dev.ts --files --ignore-watch node_modules",
-    "lint": "eslint .",
+    "lint": "tsc --noEmit && eslint .",
     "lint:fix": "npm run lint -- --fix",
     "test": "nyc mocha \"./**/*.spec.ts\"",
     "migrate": "ts-node scripts/run-migrations.ts",
@@ -39,31 +39,14 @@
     "@hestia-earth/schema": "^22.1.0"
   },
   "devDependencies": {
-    "@hestia-earth/pipeline-utils": "^0.10.4",
+    "@commitlint/cli": "^17.6.5",
+    "@commitlint/config-conventional": "^17.6.5",
+    "@hestia-earth/eslint-config": "^0.0.5",
+    "@hestia-earth/pipeline-utils": "^0.12.1",
     "@sentry/node": "^7.51.2",
     "@sentry/serverless": "^7.55.2",
     "@sentry/tracing": "^7.51.2",
     "@slack/web-api": "^6.8.1",
-    "compression": "^1.7.4",
-    "cors": "^2.8.5",
-    "csvtojson": "^2.0.10",
-    "dotenv": "^16.0.3",
-    "exit-hook": "^3.2.0",
-    "express": "^4.17.3",
-    "express-async-errors": "^3.1.1",
-    "http2-express-bridge": "^1.0.7",
-    "lodash.chunk": "^4.2.0",
-    "lodash.uniqby": "^4.7.0",
-    "map-obj": "^5.0.2",
-    "morgan": "^1.10.0",
-    "pg": "^8.11.0",
-    "rxjs": "^7.8.1",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^4.6.3",
-    "winston": "^3.8.2",
-    "@commitlint/cli": "^17.6.5",
-    "@commitlint/config-conventional": "^17.6.5",
-    "@hestia-earth/eslint-config": "^0.0.5",
     "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
     "@types/compression": "^1.7.2",
@@ -82,20 +65,38 @@
     "@types/swagger-ui-express": "^4.1.3",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
+    "compression": "^1.7.4",
+    "cors": "^2.8.5",
+    "csvtojson": "^2.0.10",
+    "debug": "^4.3.4",
+    "dotenv": "^16.0.3",
     "eslint": "^7.32.0",
+    "exit-hook": "^3.2.0",
+    "express": "^4.17.3",
+    "express-async-errors": "^3.1.1",
+    "http2-express-bridge": "^1.0.7",
     "husky": "^4.3.8",
-    "mocha-prepare": "^0.1.0",
+    "lodash.chunk": "^4.2.0",
+    "lodash.uniqby": "^4.7.0",
+    "map-obj": "^5.0.2",
+    "mocha": "^10.2.0",
+    "morgan": "^1.10.0",
     "nyc": "^15.1.0",
+    "pg": "^8.11.0",
     "postgrator": "^7.1.1",
+    "rxjs": "^7.8.1",
     "serverless": "^3.32.2",
     "serverless-deployment-bucket": "^1.6.0",
     "serverless-offline": "^12.0.4",
     "sinon": "^15.1.0",
     "standard-version": "^9.5.0",
     "supertest": "^6.3.3",
+    "swagger-jsdoc": "^6.2.8",
+    "swagger-ui-express": "^4.6.3",
     "ts-node": "^10.9.1",
     "ts-node-dev": "^2.0.0",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "winston": "^3.8.2"
   },
   "husky": {
     "hooks": {

package/package.serverless.json

@@ -0,0 +1,21 @@
+{
+  "name": "@hestia-earth/data-api-serverless",
+  "dependencies": {
+    "@hestia-earth/schema": "*",
+    "@hestia-earth/pipeline-utils": "*",
+    "@sentry/serverless": "*",
+    "csvtojson": "*",
+    "debug": "*",
+    "exit-hook": "*",
+    "lodash.chunk": "*",
+    "lodash.uniqby": "*",
+    "map-obj": "*",
+    "pg": "*",
+    "winston": "*"
+  },
+  "devDependencies": {
+    "serverless": "^3.32.2",
+    "serverless-deployment-bucket": "^1.6.0",
+    "serverless-offline": "^12.0.4"
+  }
+}

package/serverless.yml

@@ -1,10 +1,38 @@
 frameworkVersion: '3'
+
 service: hestia-data-api
 
 plugins:
   - serverless-deployment-bucket
   - serverless-offline
 
+package:
+  exclude:
+    - node_modules/@types/**
+    # cannot be removed as used in migrations
+    # - node_modules/typescript/**
+    - node_modules/**/*.map
+    - node_modules/**/*.d.ts
+    - node_modules/**/coverage/**
+    - node_modules/**/tests/**
+    - node_modules/**/test/**
+    - .nyc_output/**
+    - coverage/**
+    - data/**
+    - docs/**
+    - envs/**
+    - samples/**
+    - scripts/**
+    - test/**
+    - tmp/**
+    - tsconfig*
+    - "*.yml"
+    - "*.md"
+    - "*.sh"
+    - ".dockerignore"
+    - "Dockerfile"
+    - "gulpfile.js"
+
 custom:
   serverless-offline:
     httpPort: 3002
@@ -26,10 +54,7 @@ custom:
   logLevel:
     staging: DEBUG
     prod: INFO
-  bucketData: hestia-data-${self:custom.stage}
-  domain:
-    staging: https://www-staging.hestia.earth
-    prod: https://www.hestia.earth
+  bucket: hestia-data-${self:custom.stage}
 
 provider:
   name: aws
@@ -45,8 +70,8 @@ provider:
     STAGE: ${self:custom.stage}
     DEBUG: ${self:custom.debugging.${self:custom.stage}}
     LOG_LEVEL: ${self:custom.logLevel.${self:custom.stage}}
-    SENTRY_DSN: https://00ed710e2b664894a3ff3124bfff24cf@o441427.ingest.0.1.0.io/4505186792767488
-    BUCKET_DATA: ${self:custom.bucketData}
+    SENTRY_DSN: https://00ed710e2b664894a3ff3124bfff24cf@o441427.ingest.sentry.io/4505186792767488
+    BUCKET: ${self:custom.bucket}
     PGHOST: ${env:PGHOST}
     PGDATABASE: ${env:PGDATABASE}
     PGPORT: ${env:PGPORT}
@@ -60,8 +85,8 @@ provider:
         - s3:ListObjects
         - s3:ListBucket
       Resource:
-        - "arn:aws:s3:::${self:custom.bucketData}"
-        - "arn:aws:s3:::${self:custom.bucketData}/*"
+        - "arn:aws:s3:::${self:custom.bucket}"
+        - "arn:aws:s3:::${self:custom.bucket}/*"
   vpc:
     securityGroupIds:
       - ${self:custom.securityGroup.${self:custom.stage}}

package/src/aggregated-nodes/routes/pg-get-filters.ts

@@ -14,7 +14,17 @@ import { applyFilters } from '../services/pg-get-filters';
  *          name: filter
  *          schema:
  *            type: string
- *            example: "regions=Africa|Albania;products=abyssinianKaleStraw|abyssinianKaleSeedWhole;periods=1970-1973"
+ *          examples:
+ *            example1:
+ *              summary: Barley in Australia and India between 2010 and 2019.
+ *              value: "regions=GADM-AUS|GADM-IND;\
+ *                      products=barleyGrainWhole|barleyStraw;\
+ *                      periods=2010-2019"
+ *            example2:
+ *              summary: Wheat and Maize in France, United Kingdom and Worldwide between 2000 and 2019.
+ *              value: "regions=region-world|GADM-GBR|GADM-FRA;\
+ *                      products=wheatGrain|maizeGrain;\
+ *                      periods=2000-2009|2010-2019"
  *          description: Set of filters
  *        - in: query
  *          name: query

package/src/aggregated-nodes/routes/pg-get.ts

@@ -1,3 +1,4 @@
+/* eslint-disable max-len */
 import { Request } from 'express';
 
 import { applyFilter } from '../services/pg-get';
@@ -14,7 +15,17 @@ import { applyFilter } from '../services/pg-get';
  *          name: filter
  *          schema:
  *            type: string
- *            example: "regions=Africa|Albania;products=abyssinianKaleStraw|abyssinianKaleSeedWhole;periods=1970-1973"
+ *          examples:
+ *            example1:
+ *              summary: Barley in Australia and India between 2010 and 2019.
+ *              value: "regions=GADM-AUS|GADM-IND;\
+ *                      products=barleyGrainWhole|barleyStraw;\
+ *                      periods=2010-2019"
+ *            example2:
+ *              summary: Wheat and Maize in France, United Kingdom and Worldwide between 2000 and 2019.
+ *              value: "regions=region-world|GADM-GBR|GADM-FRA;\
+ *                      products=wheatGrain|maizeGrain;\
+ *                      periods=2000-2009|2010-2019"
  *          description: Set of filters
  *        - in: query
  *          name: page

package/src/aggregated-nodes/routes.spec.ts

@@ -77,7 +77,7 @@ describe('routes', () => {
 
         const filter = 'regions=GADM-POL|GADM-DEU';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can filter by practices', async () => {
@@ -95,7 +95,7 @@ describe('routes', () => {
         ];
         const filter = 'practices=earthingUpByHand|deepRipping';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can filter by minimum aggregatedQualityScore', async () => {
@@ -108,7 +108,7 @@ describe('routes', () => {
         ];
         const filter = 'minAggregatedQualityScore=3';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can filter by defaultMethodClassifications', async () => {
@@ -126,7 +126,7 @@ describe('routes', () => {
         ];
         const filter = 'defaultMethodClassifications=physical measurement|expert opinion';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can filter by periods', async () => {
@@ -144,7 +144,7 @@ describe('routes', () => {
         ];
         const filter = 'periods=2010-2019|2000-2009';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can filter by products', async () => {
@@ -163,7 +163,7 @@ describe('routes', () => {
         ];
         const filter = 'products=wheatGrain|fishFingerlings';
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
 
       it('can combine multiple filters', async () => {
@@ -184,7 +184,7 @@ describe('routes', () => {
           'practices=earthingUpByHand|deepRipping|baggingFruit'
         ].join(';');
         const result = await supertest(app).get('/pg').query({ filter }).set('Accept', 'application/json');
-        expect(result.body.rows).to.deep.equal(expected);
+        expect(result.body.results).to.deep.equal(expected);
       });
     });
 
@@ -224,10 +224,10 @@ describe('routes', () => {
 
         it('returns all filters when there is nothing currently selected', async () => {
           const expected = {
-            cycleCount: 8,
+            cycleCount: 9,
             impactAssessmentCount: 4,
             products: ['apples', 'barley', 'cheese', 'fishFingerlings', 'wheatGrain'],
-            periods: ['1990-1999', '2000-2009', '2010-2019', '2020-2029'],
+            periods: ['1980-1989', '1990-1999', '2000-2009', '2010-2019', '2020-2029'],
             practices: ['baggingFruit', 'deepRipping', 'earthingUpByHand'],
             minAggregatedQualityScore: [1, 2, 3],
             regions: ['GADM-BRA', 'GADM-DEU', 'GADM-POL'],
@@ -236,6 +236,38 @@ describe('routes', () => {
           const result = await supertest(app).get('/pg/filters').query({}).set('Accept', 'application/json');
           expect(result.body).to.deep.equal(expected);
         });
+
+        it('does not exclude nodes with missing practices key', async () => {
+          const expected = {
+            cycleCount: 1,
+            impactAssessmentCount: 0,
+            products: ['apples', 'cheese'],
+            periods: ['1980-1989'],
+            practices: [],
+            minAggregatedQualityScore: [2],
+            regions: ['GADM-BRA'],
+            defaultMethodClassifications: ['modelled']
+          };
+          const filter = ['regions=GADM-BRA', 'periods=1980-1989'].join(';');
+          const result = await supertest(app).get('/pg/filters').query({ filter }).set('Accept', 'application/json');
+          expect(result.body).to.deep.equal(expected);
+        });
+
+        it('returns empty arrays when no filters available', async () => {
+          const expected = {
+            cycleCount: 0,
+            impactAssessmentCount: 0,
+            products: [],
+            periods: [],
+            practices: [],
+            minAggregatedQualityScore: [],
+            regions: [],
+            defaultMethodClassifications: []
+          };
+          const filter = ['products=grapes'].join(';');
+          const result = await supertest(app).get('/pg/filters').query({ filter }).set('Accept', 'application/json');
+          expect(result.body).to.deep.equal(expected);
+        });
       });
     });
   });

package/src/aggregated-nodes/services/pg-get-filters.ts

@@ -9,31 +9,41 @@ const getFiltersQuery = (filter: IFilter): [string, any[]] => {
 SELECT
   COUNT(DISTINCT c) as "cycleCount",
   COUNT(DISTINCT ia) AS "impactAssessmentCount",
-  ARRAY_AGG(DISTINCT product ORDER BY product) as products,
-  ARRAY_AGG(DISTINCT c.generated_period ORDER BY c.generated_period) as periods,
-  ARRAY_AGG(DISTINCT practice ORDER BY practice) as practices,
-  ARRAY_AGG(
-    DISTINCT (c.jsonld_pivoted->>'aggregatedQualityScore')::integer
-    ORDER BY (c.jsonld_pivoted->>'aggregatedQualityScore')::integer
+  COALESCE(ARRAY_AGG(DISTINCT products ORDER BY products) FILTER (WHERE products IS NOT NULL), '{}') as products,
+  COALESCE(
+    ARRAY_AGG(DISTINCT c.generated_period ORDER BY c.generated_period) FILTER (WHERE c.generated_period IS NOT NULL),
+    '{}'
+  ) as periods,
+  COALESCE(ARRAY_AGG(DISTINCT practices ORDER BY practices) FILTER (WHERE practices IS NOT NULL), '{}') as practices,
+  COALESCE(
+    ARRAY_AGG(
+      DISTINCT (c.jsonld_pivoted->>'aggregatedQualityScore')::integer
+      ORDER BY (c.jsonld_pivoted->>'aggregatedQualityScore')::integer
+    ) FILTER (WHERE c.jsonld_pivoted->>'aggregatedQualityScore' is NOT NULL),
+    '{}'
   ) AS "minAggregatedQualityScore",
-  ARRAY_AGG(
+  COALESCE(ARRAY_AGG(
     DISTINCT s.jsonld_pivoted['country']->>'@id'
     ORDER BY s.jsonld_pivoted['country']->>'@id'
-  ) AS regions,
-  ARRAY_AGG(
-    DISTINCT c.jsonld_pivoted->>'defaultMethodClassification'
-    ORDER BY c.jsonld_pivoted->>'defaultMethodClassification'
+  ) FILTER (WHERE s.jsonld_pivoted['country']->>'@id' IS NOT NULL), '{}') AS regions,
+  COALESCE(
+    ARRAY_AGG(
+      DISTINCT c.jsonld_pivoted->>'defaultMethodClassification'
+      ORDER BY c.jsonld_pivoted->>'defaultMethodClassification'
+    ) FILTER (WHERE c.jsonld_pivoted->>'defaultMethodClassification' IS NOT NULL),
+    '{}'
   ) AS "defaultMethodClassifications"
 FROM aggregated_cycles AS c
+LEFT JOIN
+  jsonb_object_keys(c.jsonld_pivoted['products']) as products on TRUE
+LEFT JOIN
+  jsonb_object_keys(c.jsonld_pivoted['practices']) as practices on TRUE
 LEFT JOIN aggregated_impact_assessments AS ia
   ON c.hestia_id = ia.cycle_hestia_id
   AND ${filterClauses.products.iaFilter}
 JOIN aggregated_sites AS s
   ON c.site_hestia_id = s.hestia_id
   AND ${filterClauses.regions}
-CROSS JOIN LATERAL
-  jsonb_object_keys(c.jsonld_pivoted['products']) as products(product),
-  jsonb_object_keys(c.jsonld_pivoted['practices']) as practices(practice)
 WHERE ${filterClauses.practices}
   AND ${filterClauses.defaultMethodClassifications}
   AND ${filterClauses.products.cycleFilter}

package/src/aggregated-nodes/services/pg-get.ts

@@ -72,6 +72,6 @@ LIMIT 500
 export const applyFilter = async ({ filter }: { page?: number; filter: IFilter; query?: string }) => {
   // TODO: handle page and query later
   const [pgQuery, params] = getNodesQuery(filter);
-  const rows = await doQuery<AggregatedNodeRow>(pgQuery, params);
-  return rows;
+  const result = await doQuery<AggregatedNodeRow>(pgQuery, params);
+  return { count: result.rowCount, results: result.rows };
 };

package/src/lambdas/update-aggregated-nodes/handler.spec.ts

@@ -8,7 +8,6 @@ import { sortBy as _sortBy } from 'lodash';
 import { loadFixture, initDb } from '../../../test/utils';
 import { run } from './handler';
 import { query } from '../../../database';
-import * as testSeeds from '../../../database/seed/test';
 
 const stubs: sinon.SinonStub[] = [];
 
@@ -32,15 +31,7 @@ const fixture = (fileName: string) => loadFixture(`update-aggregated-nodes/${fil
 
 const getJsonResults = (rows) =>
   rows
-    .map((r) => r.jsonld_pivoted)
-    .filter(
-      (json) =>
-        ![
-          testSeeds.aggregatedCycles[0].jsonld_pivoted['@id'],
-          testSeeds.aggregatedSites[0].jsonld_pivoted['@id'],
-          testSeeds.aggregatedImpactAssessments[0].jsonld_pivoted['@id']
-        ].includes(json['@id'])
-    );
+    .map((r) => r.jsonld_pivoted);
 
 describe('update-aggregated-nodes > run', () => {
   beforeEach(async () => {

package/src/lambdas/update-aggregated-nodes/handler.ts

@@ -1,5 +1,4 @@
-import { info, debug, error, timeSpent, listFolder, getObject } from '@hestia-earth/pipeline-utils';
-import { aggregationFolder } from '@hestia-earth/api';
+import { info, debug, timeSpent, listFolder, getObject, bucket } from '@hestia-earth/pipeline-utils';
 import csvtojson from 'csvtojson';
 import uniqBy from 'lodash.uniqby';
 import chunk from 'lodash.chunk';
@@ -7,8 +6,6 @@ import chunk from 'lodash.chunk';
 import { wrapHandler } from '../sentry';
 import { query } from '../../../database';
 
-const bucket = process.env.BUCKET_DATA;
-
 // If a cycle or IA is missing its referenced site/cycle, it is out of date: omit
 // JOIN ensures only records with a valid fkey will be selected for insert
 const upsertCyclesQuery = `
@@ -99,8 +96,8 @@ const getFormattedNodes = async (keys: string[]): Promise<{ [key in AggregationT
 };
 
 export const run = async () => {
-  const folder = `backups/${aggregationFolder}`;
-  const allKeys = (await listFolder(folder, bucket)).map(({ Key }) => Key);
+  const folder = 'backups/aggregation';
+  const allKeys = (await listFolder(folder)).map(({ Key }) => Key);
   debug('Found', allKeys.length, 'files in', folder, 'folder on bucket', bucket);
 
   // cycles must be processed/inserted before impact assessments because of fkey constraints
@@ -125,17 +122,8 @@ export const updateAggregatedNodes = async () => {
   const functionName = 'updateAggregatedNodes';
   info(functionName);
   const now = new Date();
-
-  try {
-    await run();
-  }
-  catch (err) {
-    error(err);
-    throw err;
-  }
-  finally {
-    info(`Finished ${functionName} in ${timeSpent(now)}ms`);
-  }
+  await run();
+  info(`Finished ${functionName} in ${timeSpent(now)}ms`);
 };
 
 export const updateAggregatedNodesHandler = wrapHandler(updateAggregatedNodes);

package/src/routes.ts

@@ -1,9 +1,8 @@
 import { Express } from 'express';
+import aggregatedNodes from './aggregated-nodes/routes';
 
 const routes = (app: Express) => {
-  app.use('/', (req, res) => {
-    res.send('Hello World!');
-  });
+  app.use('/aggregated-nodes', aggregatedNodes());
 };
 
 export default routes;

package/test/fixtures/aggregated-nodes/get.ts

@@ -102,6 +102,18 @@ export const aggregatedCycles = [
       practices: { baggingFruit: {} },
       products: { apples: {}, cheese: {} }
     }
+  },
+  {
+    jsonld_pivoted: {
+      '@id': '9',
+      '@type': 'Cycle',
+      site: { '@id': '3' },
+      defaultMethodClassification: 'modelled',
+      startDate: '1980',
+      endDate: '1989',
+      aggregatedQualityScore: 2,
+      products: { apples: {}, cheese: {} }
+    }
   }
 ];
 

package/test/prepare.ts

@@ -1,15 +1,13 @@
-import prepare from 'mocha-prepare';
 import * as dotenv from 'dotenv';
 dotenv.config({ path: '.env.test' });
 
 let endPool: () => Promise<void>;
 
-prepare(
-  (done) => {
+export const mochaHooks = {
+  beforeAll() {
     ({ endPool } = require('../database/'));
-    done();
   },
-  (done) => {
+  afterAll(done) {
     endPool().finally(() => done());
   }
-);
+};

package/test/utils.ts

@@ -2,11 +2,10 @@ import { resolve, join } from 'path';
 import { readFileSync } from 'fs';
 import { query } from '../database';
 import { seed } from '../database/seed';
-import * as testSeeds from '../database/seed/test';
 import * as commonSeeds from '../database/seed/common';
 import { runMigrations } from '../database/migrations';
 
-export const fixtures = Object.freeze({ ...commonSeeds, ...testSeeds });
+export const fixtures = Object.freeze({ ...commonSeeds });
 
 export const FIXTURES_DIR = resolve(join(__dirname, 'fixtures'));
 
@@ -29,5 +28,5 @@ export const resetDb = async () => {
 export const initDb = async () => {
   await resetDb();
   await runMigrations();
-  await seed({ ...commonSeeds, ...testSeeds });
+  await seed({ ...commonSeeds });
 };

package/tsconfig.json

@@ -1,4 +1,9 @@
 {
+  "ts-node": {
+    "files": true,
+    "typeCheck": false,
+    "transpileOnly": true
+  },
   "compilerOptions": {
     "target": "es2017",
     "module": "node16",

package/database/seed/test/index.ts

@@ -1,28 +0,0 @@
-export const aggregatedCycles = [
-  {
-    jsonld_pivoted: {
-      '@id': 'test_cycle_id',
-      '@type': 'Cycle',
-      site: { '@id': 'test_site_id' }
-    }
-  }
-];
-
-export const aggregatedImpactAssessments = [
-  {
-    jsonld_pivoted: {
-      '@id': 'test_impact_assessment_id',
-      '@type': 'ImpactAssessment',
-      cycle: { '@id': 'test_cycle_id' }
-    }
-  }
-];
-
-export const aggregatedSites = [
-  {
-    jsonld_pivoted: {
-      '@id': 'test_site_id',
-      '@type': 'Site'
-    }
-  }
-];

package/src/routes.spec.ts

@@ -1,33 +0,0 @@
-import { expect } from 'chai';
-import * as sinon from 'sinon';
-import 'mocha';
-import express from 'express';
-import supertest from 'supertest';
-import bodyParser from 'body-parser';
-
-import routes from './routes';
-import { errorHandler } from './errors';
-
-let stubs: sinon.SinonStub[] = [];
-
-const app = express();
-app.use(bodyParser.json());
-routes(app);
-app.use(errorHandler);
-
-describe('routes', () => {
-  beforeEach(() => {
-    stubs = [];
-  });
-
-  afterEach(() => {
-    stubs.forEach((stub) => stub.restore());
-  });
-
-  describe('GET /', () => {
-    it('returns hello world', async () => {
-      const result = await supertest(app).get('/');
-      expect(result.text).to.equal('Hello World!');
-    });
-  });
-});