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

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hestia-earth/data-api",
-  "version": "0.0.2-1",
+  "version": "0.0.2-2",
   "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": {
+    "@commitlint/cli": "^17.6.5",
+    "@commitlint/config-conventional": "^17.6.5",
+    "@hestia-earth/eslint-config": "^0.0.5",
     "@hestia-earth/pipeline-utils": "^0.10.4",
     "@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,37 @@
     "@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",
+    "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/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/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/tsconfig.json

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

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!');
-    });
-  });
-});