From d4dbd40c8b473cfa6add9f87872863821dfe6b39 Mon Sep 17 00:00:00 2001
From: ChiefSoft works <Anatolii Okhotnikov>
Date: Mon, 9 May 2022 05:12:00 +0000
Subject: [PATCH] Fix connection URL

---
 flutterwave-transfer-micro/app/db.js    | 20 +++++++++++++++-----
 flutterwave-transfer-micro/package.json |  8 +++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/flutterwave-transfer-micro/app/db.js b/flutterwave-transfer-micro/app/db.js
index 100fb30..4243e9d 100644
--- a/flutterwave-transfer-micro/app/db.js
+++ b/flutterwave-transfer-micro/app/db.js
@@ -4,12 +4,22 @@
  */
 
 const { Pool, Client } = require('pg');
+const url = require('url');
 const logger = require('./logger');
 //const connectionString = 'postgresql://wrenchboard:wrenchboard@10.10.10.23:5432/wrenchboard';
-const connectionString = process.env.POSTGRE_URL;
-const postgres = new Pool({
-  connectionString,
-});
+const connectionString = process.env.POSTGRE_URL.replace(/'/g, '');
+const params = url.parse(connectionString);
+const auth = params.auth.split(':');
+const config = {
+          user: auth[0],
+          password: auth[1],
+          host: params.hostname,
+          port: params.port,
+          database: params.pathname.split('/')[1],
+          ssl: false
+};
+
+const postgres = new Pool(config);
 
 postgres.on('connect', client => {
   logger.info('Connected to Database');
@@ -44,4 +54,4 @@ postgres.connect((err, client, release) => {
   });
 });
 
-module.exports = postgres;
\ No newline at end of file
+module.exports = postgres;
diff --git a/flutterwave-transfer-micro/package.json b/flutterwave-transfer-micro/package.json
index e58f626..2b35f9d 100644
--- a/flutterwave-transfer-micro/package.json
+++ b/flutterwave-transfer-micro/package.json
@@ -17,11 +17,13 @@
     "express": "^4.17.1",
     "openapi-types": "^10.0.0",
     "pg": "8.7.1",
+    "pg-pool": "^3.5.1",
     "request": "^2.88.2",
     "swagger-autogen": "^2.17.2",
     "swagger-jsdoc": "^6.1.0",
     "swagger-ui-express": "^4.3.0",
     "underscore": "^1.8.3",
+    "url": "^0.11.0",
     "winston": "^2.3.1",
     "winston-papertrail": "^1.0.4"
   },
@@ -32,7 +34,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "ssh://git@gitlab.chiefsoft.net:10222/WrenchBoard/WrenchBoradWeb.git"
+    "url": "ssh://git@gitlab.chiefsoft.net:10222/WrenchBoard/FlutterWave.git"
   },
   "keywords": [
     "microservice",
@@ -40,7 +42,7 @@
     "transfer"
   ],
   "bugs": {
-    "url": "https://gitlab.chiefsoft.net/WrenchBoard/WrenchBoradWeb/issues"
+    "url": "https://gitlab.chiefsoft.net/WrenchBoard/FlutterWave/issues"
   },
-  "homepage": "https://gitlab.chiefsoft.net/WrenchBoard/WrenchBoradWeb/src/master/microservices/flutterwave-transfer-micro/README.md"
+  "homepage": "https://gitlab.chiefsoft.net/WrenchBoard/FlutterWave/src/master/flutterwave-transfer-micro/README.md"
 }