Merge pull request #2250 from hollaex/testnet

Testnet
hollaex · Jul 7, 2023 · c455e1c · c455e1c
2 parents 4162948 + ebba6f4
commit c455e1c
Show file tree

Hide file tree

Showing 18 changed files with 430 additions and 86 deletions.
diff --git a/server/api/controllers/admin.js b/server/api/controllers/admin.js
@@ -2458,6 +2458,43 @@ const updateQuickTradeConfig = (req, res) => {
 		});
 };
 
+const getBalancesAdmin = (req, res) => {
+	loggerAdmin.verbose(req.uuid, 'controllers/admin/getBalancesAdmin/auth', req.auth);
+
+	const { 
+		user_id, 
+		currency,
+		format
+	} = req.swagger.params;
+
+
+	if (format.value && req.auth.scopes.indexOf(ROLES.ADMIN) === -1) {
+		return res.status(403).json({ message: API_KEY_NOT_PERMITTED });
+	}
+
+	toolsLib.user.getAllBalancesAdmin({
+		user_id: user_id.value,
+		currency: currency.value,
+		format: format.value,
+		additionalHeaders: {
+			'x-forwarded-for': req.headers['x-forwarded-for']
+		}
+	})
+		.then((data) => {
+			if (format.value === 'all') {
+				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users.csv`);
+				res.set('Content-Type', 'text/csv');
+				return res.status(202).send(data);
+			} else {
+				return res.json(data);
+			}
+		})
+		.catch((err) => {
+			loggerAdmin.error(req.uuid, 'controllers/admin/getBalancesAdmin', err.message);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
+		});
+}
+
 module.exports = {
 	createInitialAdmin,
 	getAdminKit,
@@ -2519,5 +2556,6 @@ module.exports = {
 	revokeUserSessionByAdmin,
 	sendEmailByAdmin,
 	sendRawEmailByAdmin,
-	updateQuickTradeConfig
+	updateQuickTradeConfig,
+	getBalancesAdmin
 };
diff --git a/server/api/controllers/broker.js b/server/api/controllers/broker.js
@@ -47,7 +47,6 @@ const createBrokerPair = (req, res) => {
 		user_id,
 		min_size,
 		max_size,
-		increment_size,
 		type,
 		quote_expiry_time,
 		rebalancing_symbol,
@@ -67,7 +66,6 @@ const createBrokerPair = (req, res) => {
 		user_id,
 		min_size,
 		max_size,
-		increment_size,
 		type,
 		quote_expiry_time,
 		rebalancing_symbol,
@@ -84,7 +82,6 @@ const createBrokerPair = (req, res) => {
 		user_id,
 		min_size,
 		max_size,
-		increment_size,
 		type,
 		quote_expiry_time,
 		rebalancing_symbol,
@@ -115,13 +112,11 @@ const testBroker = (req, res) => {
 	const {
 		formula,
 		spread,
-		increment_size
 	} = req.swagger.params.data.value;
 
 	toolsLib.broker.testBroker({
 		formula,
 		spread,
-		increment_size
 	})
 		.then((data) => {
 			return res.json(data);
@@ -181,7 +176,6 @@ function updateBrokerPair(req, res) {
 		sell_price,
 		min_size,
 		max_size,
-		increment_size,
 		paused,
 		user_id,
 		type,
@@ -200,7 +194,6 @@ function updateBrokerPair(req, res) {
 		sell_price,
 		min_size,
 		max_size,
-		increment_size,
 		paused,
 		user_id,
 		type,
@@ -264,7 +257,6 @@ function getBrokerPairs(req, res) {
 		'paused',
 		'min_size',
 		'max_size',
-		'increment_size',
 		'type',
 		'quote_expiry_time',
 		'rebalancing_symbol',

diff --git a/server/api/swagger/admin.yaml b/server/api/swagger/admin.yaml
@@ -3187,4 +3187,48 @@ paths:
         - bearer
         - hmac
       x-security-scopes:
-        - admin
+        - admin
+  /admin/balances:
+    x-swagger-router-controller: admin
+    get:
+      description: Get exchange balances of users for admin
+      operationId: getBalancesAdmin
+      tags:
+        - Admin
+      parameters:
+        - name: user_id
+          in: query
+          required: false
+          type: number
+        - name: currency
+          in: query
+          required: false
+          type: string
+        - in: query
+          name: format
+          description: Specify data format
+          required: false
+          enum: ['csv', 'all']
+          type: string
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/ObjectResponse"
+        202:
+          description: CSV
+          schema:
+            type: string
+        default:
+          description: Error
+          schema:
+            $ref: "#/definitions/MessageResponse"
+      security:
+        - Token: []
+      x-security-types:
+        - bearer
+        - hmac
+      x-security-scopes:
+        - admin
+      x-token-permissions:
+        - can_read
diff --git a/server/db/migrations/20230628100835-remove-broker-increment-size.js b/server/db/migrations/20230628100835-remove-broker-increment-size.js
@@ -0,0 +1,14 @@
+'use strict';
+
+const TABLE = 'Brokers';
+const COLUMN = 'increment_size';
+
+module.exports = {
+	up: (queryInterface, Sequelize) =>
+		queryInterface.removeColumn(TABLE, COLUMN),
+	down: (queryInterface, Sequelize) =>
+		queryInterface.addColumn(TABLE, COLUMN, {
+			type: Sequelize.DOUBLE,
+			allowNull: false
+		})
+};
diff --git a/server/db/models/broker.js b/server/db/models/broker.js
@@ -47,10 +47,6 @@ module.exports = function (sequelize, DataTypes) {
 				type: DataTypes.DOUBLE,
 				allowNull: false
 			},
-			increment_size: {
-				type: DataTypes.DOUBLE,
-				allowNull: false
-			},
 			type: {
 				type: DataTypes.ENUM('manual', 'dynamic'),
 				defaultValue: 'manual',

diff --git a/server/init.js b/server/init.js
@@ -125,7 +125,7 @@ const checkStatus = () => {
 						status.constants
 					),
 					Tier.findAll(),
-					Broker.findAll({ attributes: ['id', 'symbol', 'buy_price', 'sell_price', 'paused', 'min_size', 'max_size', 'increment_size']}),
+					Broker.findAll({ attributes: ['id', 'symbol', 'buy_price', 'sell_price', 'paused', 'min_size', 'max_size']}),
 					QuickTrade.findAll(),
 					status.dataValues
 				]);