Merge pull request #134 from GeneralMagicio/staging

merge staging to main to update production server

README.md

@@ -9,7 +9,6 @@
 - Production - [![CI/CD](https://github.com/Giveth/impact-graph/actions/workflows/master-pipeline.yml/badge.svg)](https://github.com/Giveth/impact-graph/actions/workflows/master-pipeline.yml)
 
 ---
-
 ImpactQL is a GraphQL server, that enables rapid development of serverless impact project applications. It does this by taking care of the persistance of impact project data.
 
 [Installation](#installation)

package.json

@@ -186,6 +186,7 @@
     "test:bootstrap": "NODE_ENV=test mocha ./test/pre-test-scripts.ts  ./src/server/bootstrap.test.ts",
     "test:utils": "NODE_ENV=test mocha ./src/utils/utils.test.ts",
     "test:inverterScript": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/scripts/syncDataWithInverter.test.ts",
+    "test:healthCheck": "NODE_ENV=test mocha ./test/pre-test-scripts.ts ./src/server/bootstrap.test.ts",
     "start": "NODE_ENV=development ts-node-dev --project ./tsconfig.json --respawn ./src/index.ts",
     "start:test": "NODE_ENV=development ts-node-dev --project ./tsconfig.json --respawn ./test.ts",
     "serve": "pm2 startOrRestart ecosystem.config.js --node-args='--max-old-space-size=8192'",

src/config.ts

@@ -121,4 +121,7 @@ class Config {
 
 const config = new Config(process.env);
 
+export const isGraphQlMode = config.get('GRAPHQL_MODE') === 'true';
+export const isJobMode = config.get('JOB_MODE') === 'true';
+
 export default config;

src/orm.ts

@@ -1,6 +1,6 @@
 import { DataSource } from 'typeorm';
 import { PostgresConnectionCredentialsOptions } from 'typeorm/driver/postgres/PostgresConnectionCredentialsOptions';
-import config from './config';
+import config, { isJobMode } from './config';
 import { CronJob } from './entities/CronJob';
 import { getEntities } from './entities/entities';
 import { redisConfig } from './redis';
@@ -57,6 +57,7 @@ export class AppDataSource {
               },
             },
         poolSize,
+        migrationsRun: isJobMode,
         extra: {
           maxWaitingClients: 10,
           evictionRunIntervalMillis: 500,

src/server/bootstrap.test.ts

@@ -6,6 +6,6 @@ describe('health check test case', healthCheckTestCases);
 function healthCheckTestCases() {
   it('should return empty array for now startTimestamp', async () => {
     const result = await axios.get('http://localhost:4000/health');
-    assert.equal(result.data, 'Hi every thing seems ok');
+    assert.equal(result.data, 'OK');
   });
 }

src/server/bootstrap.ts

@@ -7,7 +7,7 @@ import { ApolloServer } from '@apollo/server';
 import { expressMiddleware } from '@apollo/server/express4';
 import { ApolloServerPluginSchemaReporting } from '@apollo/server/plugin/schemaReporting';
 import { ApolloServerPluginLandingPageGraphQLPlayground } from '@apollo/server-plugin-landing-page-graphql-playground';
-import express, { json, Request } from 'express';
+import express, { json, Request, RequestHandler } from 'express';
 import { Container } from 'typedi';
 import { Resource } from '@adminjs/typeorm';
 import { validate } from 'class-validator';
@@ -18,7 +18,7 @@ import bodyParser from 'body-parser';
 import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.js';
 import { ApolloServerPluginLandingPageDisabled } from '@apollo/server/plugin/disabled';
 import { ApolloServerErrorCode } from '@apollo/server/errors';
-import config from '../config';
+import config, { isGraphQlMode, isJobMode } from '../config';
 import { handleStripeWebhook } from '../utils/stripe';
 import createSchema from './createSchema';
 import SentryLogger from '../sentryLogger';
@@ -83,9 +83,6 @@ export async function bootstrap() {
   try {
     logger.debug('bootstrap() has been called', new Date());
 
-    const isGraphQlMode = config.get('GRAPHQL_MODE') === 'true';
-    const isJobMode = config.get('JOB_MODE') === 'true';
-
     logger.info('isGraphQlMode: ', isGraphQlMode);
     logger.info('isJobMode: ', isJobMode);
 
@@ -424,9 +421,7 @@ export async function bootstrap() {
       bodyParser.raw({ type: 'application/json' }),
       handleStripeWebhook,
     );
-    app.get('/health', (_req, res) => {
-      res.send('Hi every thing seems ok');
-    });
+    app.get('/health', healthCheck);
     app.post('/transak_webhook', webhookHandler);
 
     const httpServer = http.createServer(app);
@@ -472,3 +467,13 @@ async function setPgTrgmParameters(ds: DataSource) {
     `SET pg_trgm.word_similarity_threshold TO ${similarityThreshold};`,
   );
 }
+
+const healthCheck: RequestHandler = async (_req, res) => {
+  const ds = AppDataSource.getDataSource();
+  const result = (await ds.query('select version()')) || [];
+  const version = result[0]?.version || '';
+  if (!version.startsWith('PostgreSQL')) {
+    throw new Error('Unexpected db result');
+  }
+  res.sendStatus(200);
+};