BE-823 Convert to TS : app/persistence/... (#180)

* BE-823 Convert to TS : app/persistence/... Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com> * BE-823 Convert to TS : app/persistence/... Fixed errors Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com>
hyperledger-labs · Sep 23, 2020 · 74f5f4a · 74f5f4a
1 parent aa870ea
commit 74f5f4a
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 109 deletions.
diff --git a/app/persistence/PersistenceFactory.js → app/persistence/PersistenceFactory.ts b/app/persistence/PersistenceFactory.js → app/persistence/PersistenceFactory.ts
diff --git a/app/persistence/fabric/CRUDService.js → app/persistence/fabric/CRUDService.ts b/app/persistence/fabric/CRUDService.js → app/persistence/fabric/CRUDService.ts
@@ -1,7 +1,7 @@
 /**
  *    SPDX-License-Identifier: Apache-2.0
  */
-
+import {PgService} from '../postgreSQL/PgService';
 import { helper } from '../../common/helper';
 
 const logger = helper.getLogger('CRUDService');
@@ -11,8 +11,10 @@ const logger = helper.getLogger('CRUDService');
  *
  * @class CRUDService
  */
-class CRUDService {
-	constructor(sql) {
+export class CRUDService {
+	sql : PgService;
+
+	constructor(sql : PgService) {
 		this.sql = sql;
 	}
 
@@ -260,7 +262,7 @@ class CRUDService {
 	async getCurBlockNum(network_name, channel_genesis_hash) {
 		let curBlockNum;
 		try {
-			const row = await this.sql.getRowsBySQlCase(
+			const row : any = await this.sql.getRowsBySQlCase(
 				`select max(blocknum) as blocknum from blocks  where channel_genesis_hash='${channel_genesis_hash}' and network_name = '${network_name}' `
 			);
 
@@ -421,7 +423,6 @@ class CRUDService {
 	}
 	// Orderer BE-303
 }
-module.exports = CRUDService;
 
 /**
  *

diff --git a/app/persistence/fabric/MetricService.js → app/persistence/fabric/MetricService.ts b/app/persistence/fabric/MetricService.js → app/persistence/fabric/MetricService.ts
@@ -1,7 +1,7 @@
 /**
  *    SPDX-License-Identifier: Apache-2.0
  */
-
+import {PgService} from '../postgreSQL/PgService';
 import { helper } from '../../common/helper';
 
 const logger = helper.getLogger('MetricService');
@@ -11,8 +11,10 @@ const logger = helper.getLogger('MetricService');
  *
  * @class MetricService
  */
-class MetricService {
-	constructor(sql) {
+export class MetricService {
+	sql : PgService;
+
+	constructor(sql : PgService) {
 		this.sql = sql;
 	}
 
@@ -154,7 +156,7 @@ class MetricService {
 	 */
 	async getOrgsData(network_name, channel_genesis_hash) {
 		const orgs = [];
-		const rows = await this.sql.getRowsBySQlNoCondition(
+		const rows : any = await this.sql.getRowsBySQlNoCondition(
 			`select distinct on (mspid) mspid from peer  where channel_genesis_hash='${channel_genesis_hash}' and network_name='${network_name}'`
 		);
 		for (let i = 0, len = rows.length; i < len; i++) {
@@ -192,24 +194,24 @@ class MetricService {
 	 * @memberof MetricService
 	 */
 	async getStatusGenerate(network_name, channel_genesis_hash) {
-		let chaincodeCount = await this.getChaincodeCount(
+		let chaincodeCount : any = await this.getChaincodeCount(
 			network_name,
 			channel_genesis_hash
 		);
 		if (!chaincodeCount) {
 			chaincodeCount = 0;
 		}
-		let txCount = await this.getTxCount(network_name, channel_genesis_hash);
+		let txCount : any = await this.getTxCount(network_name, channel_genesis_hash);
 		if (!txCount) {
 			txCount = 0;
 		}
 		txCount.c = txCount.c ? txCount.c : 0;
-		let blockCount = await this.getBlockCount(network_name, channel_genesis_hash);
+		let blockCount : any = await this.getBlockCount(network_name, channel_genesis_hash);
 		if (!blockCount) {
 			blockCount = 0;
 		}
 		blockCount.c = blockCount.c ? blockCount.c : 0;
-		let peerCount = await this.getPeerlistCount(
+		let peerCount : any = await this.getPeerlistCount(
 			network_name,
 			channel_genesis_hash
 		);
@@ -641,5 +643,3 @@ class MetricService {
 		return this.sql.getRowsBySQlQuery(sqlQuery);
 	}
 }
-
-module.exports = MetricService;
diff --git a/app/persistence/fabric/UserDataService.js → app/persistence/fabric/UserDataService.ts b/app/persistence/fabric/UserDataService.js → app/persistence/fabric/UserDataService.ts
@@ -1,19 +1,22 @@
 /**
  *    SPDX-License-Identifier: Apache-2.0
  */
+import {PgService} from '../postgreSQL/PgService';
 
 /**
  *
  *
  * @class UserDataService
  */
-class UserDataService {
+export class UserDataService {
+	sql : PgService;
+	userModel : any;
 	/**
 	 * Creates an instance of UserDataService.
 	 * @param {*} sql
 	 * @memberof UserDataService
 	 */
-	constructor(sql) {
+	constructor(sql : PgService) {
 		this.sql = sql;
 	}
 
@@ -101,5 +104,3 @@ class UserDataService {
 			});
 	}
 }
-
-module.exports = UserDataService;
diff --git a/...stence/fabric/postgreSQL/db/processenv.js → ...stence/fabric/postgreSQL/db/processenv.ts b/...stence/fabric/postgreSQL/db/processenv.js → ...stence/fabric/postgreSQL/db/processenv.ts
diff --git a/app/persistence/postgreSQL/Persist.js → app/persistence/postgreSQL/Persist.ts b/app/persistence/postgreSQL/Persist.js → app/persistence/postgreSQL/Persist.ts
@@ -1,14 +1,21 @@
 /**
  * SPDX-License-Identifier: Apache-2.0
  */
-const PgService = require('./PgService');
-
+import {PgService} from './PgService';
+import {MetricService} from '../fabric/MetricService';
+import {CRUDService} from '../fabric/CRUDService';
+import {UserDataService} from '../fabric/UserDataService';
 /**
  *
  *
  * @class Persist
  */
 class Persist {
+	pgservice : PgService;
+	metricservice : MetricService;
+	crudService : CRUDService;
+	userdataservice : UserDataService;
+
 	constructor(pgconfig) {
 		this.pgservice = new PgService(pgconfig);
 		this.metricservice = null;
@@ -22,7 +29,7 @@ class Persist {
 	 * @param {*} metricservice
 	 * @memberof Persist
 	 */
-	setMetricService(metricservice) {
+	setMetricService(metricservice : MetricService) {
 		this.metricservice = metricservice;
 	}
 

diff --git a/app/persistence/postgreSQL/PgService.js → app/persistence/postgreSQL/PgService.ts b/app/persistence/postgreSQL/PgService.js → app/persistence/postgreSQL/PgService.ts
@@ -18,9 +18,9 @@
  * limitations under the License.
  */
 import { helper } from '../../common/helper';
+import { Client } from 'pg';
+import { Sequelize, Optional } from 'sequelize';
 
-const { Client } = require('pg');
-const Sequelize = require('sequelize');
 const fs = require('fs');
 
 const logger = helper.getLogger('PgService');
@@ -30,7 +30,11 @@ const logger = helper.getLogger('PgService');
  *
  * @class PgService
  */
-class PgService {
+export class PgService {
+	pgconfig : any;
+	userModel : any;
+	client : Client;
+
 	/**
 	 * Creates an instance of PgService.
 	 * @param {*} pgconfig
@@ -103,7 +107,7 @@ class PgService {
 	 */
 	async handleDisconnect() {
 		try {
-			this.client.on('error', err => {
+			this.client.on('error', (err : NodeJS.ErrnoException) => {
 				logger.error('db error', err);
 				if (err.code === 'PROTOCOL_CONNECTION_LOST') {
 					this.handleDisconnect();
@@ -517,7 +521,7 @@ class PgService {
 	 * @param datatype limit         the page limit.
 	 *
 	 */
-	getRowsBySQlNoCondition(sqlcharacter, limit) {
+	getRowsBySQlNoCondition(sqlcharacter, limit? ) : Promise<any>{
 		/* eslint-disable */
 		const _self = this;
 		return new Promise((resolve, reject) => {
@@ -574,75 +578,4 @@ class PgService {
 		});
 	}
 
-	/**
-	 *
-	 * @param sql
-	 * @param key
-	 * @returns {Promise}
-	 *
-	 */
-	getSQL2Map(sql, key) {
-		const _self = this;
-		return new Promise((resolve, reject) => {
-			_self.client.query(sql, (err, res) => {
-				if (err) {
-					reject(err);
-					return;
-				}
-
-				logger.debug(`The solution is: ${res.rows.length}  `);
-
-				const keymap = new Map();
-
-				for (let ind = 0; ind < res.rows.length; ind++) {
-					logger.debug(`The ind value is: ${res.rows[ind].id}  `);
-					keymap.set(res.rows[ind][key], res.rows[ind]);
-				}
-
-				resolve(keymap);
-			});
-		});
-	}
-
-	/**
-	 *
-	 *
-	 * @param unknown_type sql
-	 * @param unknown_type key
-	 * @return unknown
-	 */
-	getSQL2Map4Arr(sql, key) {
-		const _self = this;
-		return new Promise((resolve, reject) => {
-			_self.client.query(sql, (err, rows) => {
-				if (err) {
-					reject(err);
-					return;
-				}
-
-				// Logger.debug(  `The solution is: ${rows.length }  `  );
-				logger.debug(' the getSqlMap ');
-
-				const keymap = new Map();
-
-				for (let ind = 0; ind < rows.length; ind++) {
-					const keyvalue = rows[ind][key];
-					let arrvalue = [];
-
-					if (keymap.has(keyvalue)) {
-						arrvalue = keymap.get(keyvalue);
-						arrvalue.push(rows);
-					} else {
-						arrvalue.push(rows);
-					}
-
-					keymap.set(keyvalue, arrvalue);
-				}
-
-				resolve(keymap);
-			});
-		});
-	}
 }
-
-module.exports = PgService;
diff --git a/app/platform/fabric/Platform.ts b/app/platform/fabric/Platform.ts
@@ -5,6 +5,9 @@
 import * as path from 'path';
 import {helper} from '../../common/helper';
 import {User} from './models/User';
+import {MetricService} from '../../persistence/fabric/MetricService';
+import {CRUDService} from '../../persistence/fabric/CRUDService';
+import {UserDataService} from '../../persistence/fabric/UserDataService';
 
 const fs = require('fs-extra');
 
@@ -14,11 +17,6 @@ const ExplorerError = require('../../common/ExplorerError');
 const logger = helper.getLogger('Platform');
 const FabricUtils = require('./utils/FabricUtils.js');
 const ExplorerListener = require('../../sync/listener/ExplorerListener');
-
-const CRUDService = require('../../persistence/fabric/CRUDService');
-const MetricService = require('../../persistence/fabric/MetricService');
-const UserDataService = require('../../persistence/fabric/UserDataService');
-
 const fabric_const = require('./utils/FabricConst').fabric.const;
 const explorer_error = require('../../common/ExplorerMessage').explorer.error;
 

diff --git a/app/platform/fabric/models/User.ts b/app/platform/fabric/models/User.ts
@@ -59,5 +59,3 @@ export class User {
 		return this.userJson;
 	}
 }
-
-// module.exports = User;
diff --git a/app/platform/fabric/sync/SyncPlatform.ts b/app/platform/fabric/sync/SyncPlatform.ts
@@ -3,20 +3,20 @@
  */
 
 import * as path from 'path';
+import {helper} from '../../../common/helper';
+import {MetricService} from '../../../persistence/fabric/MetricService';
+import {CRUDService} from '../../../persistence/fabric/CRUDService';
+
 const fs = require('fs-extra');
 
 const SyncService = require('../sync/SyncService');
 const FabricUtils = require('../utils/FabricUtils');
 const FabricEvent = require('./FabricEvent');
 const FabricConfig = require('../FabricConfig');
 
-import {helper} from '../../../common/helper';
-
 const logger = helper.getLogger('SyncPlatform');
 const ExplorerError = require('../../../common/ExplorerError');
 
-const CRUDService = require('../../../persistence/fabric/CRUDService');
-const MetricService = require('../../../persistence/fabric/MetricService');
 
 const fabric_const = require('../utils/FabricConst').fabric.const;
 const explorer_mess = require('../../../common/ExplorerMessage').explorer;