sequelize-game-bank 1.0.0 → 1.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +15 -0
- package/README.md +44 -0
- package/database/models/Account.js +3 -5
- package/database/models/Credit.js +4 -6
- package/database/models/Transaction.js +4 -5
- package/database/models/User.js +8 -10
- package/database/services/account/add-manny.js +4 -7
- package/database/services/account/change-pincode.js +3 -7
- package/database/services/account/change-status.js +3 -2
- package/database/services/account/create-credit.js +50 -100
- package/database/services/account/create.js +4 -7
- package/database/services/account/delete.js +2 -1
- package/database/services/account/find-manny.js +1 -3
- package/database/services/account/logs.js +6 -12
- package/database/services/account/remove-manny.js +4 -6
- package/database/services/account/transfer.js +44 -41
- package/database/services/bot/bot.js +5 -20
- package/database/services/bot/cron-schedule.js +123 -0
- package/database/services/bot/generators/register-bot.html +1 -1
- package/database/services/bot/generators/register-bot.txt +2 -2
- package/database/services/bot/write.js +3 -12
- package/database/services/user/change-avatar.js +1 -5
- package/database/services/user/change-gmail.js +1 -3
- package/database/services/user/change-password.js +3 -4
- package/database/services/user/create.js +3 -10
- package/database/services/user/delete.js +3 -4
- package/database/services/user/disable-2FA.js +5 -7
- package/database/services/user/enable-2FA.js +4 -6
- package/database/services/user/login.js +6 -17
- package/database/services/user/math-manny.js +3 -3
- package/index.js +27 -48
- package/package.json +21 -5
- package/public/credit.html +26 -0
- package/public/js/js.js +160 -26
- package/public/transfer.html +41 -39
- package/public/uploads/avatars/default.png +0 -0
- package/server/middleware/auth.js +1 -6
- package/server/server.js +8 -25
- package/src/logo/icon.png +0 -0
- package/.env +0 -114
- package/database/citybank.db +0 -0
- package/database/config/init-db.js +0 -33
- package/logs/errors.log +0 -14
- package/public/uploads/avatars/Pavel_1790269874496.png +0 -0
- package/public/uploads/avatars/Pavel_1790275457821.png +0 -0
- package/public/uploads/avatars/Pavel_1790867570006.png +0 -0
- package/public/uploads/avatars/Romanenko_1790270954677.png +0 -0
- package/public/uploads/avatars/root_1790275537324.png +0 -0
- package/public/uploads/avatars/root_1790275537381.png +0 -0
- package/public/uploads/avatars/root_1790349234549.png +0 -0
- package/public/uploads/avatars/root_1790519734671.png +0 -0
- package/public/uploads/avatars/root_1790879784620.png +0 -0
- package/public/uploads/avatars/root_1790879790948.png +0 -0
- package/public/uploads/avatars/root_1790879796755.png +0 -0
- package/public/uploads/avatars/root_1790962800544.png +0 -0
- package/public/uploads/avatars/root_1791009911239.png +0 -0
- package/test.js +0 -20
package/LICENSE
ADDED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
ISC License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026, RPM-programmer (GitHub) / prm-programer (npm)
|
|
4
|
+
|
|
5
|
+
Permission to use, copy, modify, and/or distribute this software for any
|
|
6
|
+
purpose with or without fee is hereby granted, provided that the above
|
|
7
|
+
copyright notice and this permission notice appear in all copies.
|
|
8
|
+
|
|
9
|
+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
10
|
+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
11
|
+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
12
|
+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
13
|
+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
14
|
+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
15
|
+
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
package/README.md
ADDED
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
> # sequelize-game-bank
|
|
2
|
+
|
|
3
|
+
<img src="./src/logo/icon.png" alt="sequelize-game-bank logo" width="160" height="160" style="border-radius: 12%; margin-bottom: 20px;" />
|
|
4
|
+
|
|
5
|
+
## npm модуль для создания полноценного банка на express, sequelize (sqlite).
|
|
6
|
+
|
|
7
|
+
## О проекте
|
|
8
|
+
|
|
9
|
+
**sequelize-game-bank** — это готовый бэкенд-модуль, который за пару строк кода разворачивает изолированную банковскую систему для вашей игры или тестовой среды. Он автоматически создает базу данных SQLite через Sequelize и монтирует защищенные REST API роуты для Express.
|
|
10
|
+
|
|
11
|
+
* **Изолированная песочница:** Идеально для безопасной симуляции балансов, переводов и транзакций без риска реальных денег.
|
|
12
|
+
* **Всё включено:** База данных (SQLite), модели (Sequelize) и готовые эндпоинты (Express) поставляются в одном пакете.
|
|
13
|
+
* **Быстрый старт:** Не требует настройки внешних баз данных — всё работает "из коробки" в локальном файле или памяти.
|
|
14
|
+
* **Поддержка Nodemailer** Возможность отправлять сообщения на gmail
|
|
15
|
+
|
|
16
|
+
## 🚀 Установка
|
|
17
|
+
|
|
18
|
+
Установите пакет через ваш любимый менеджер пакетов:
|
|
19
|
+
|
|
20
|
+
```bash
|
|
21
|
+
npm install sequelize-game-bank
|
|
22
|
+
```
|
|
23
|
+
|
|
24
|
+
## 💻 Быстрый старт
|
|
25
|
+
|
|
26
|
+
Просто подключите модуль в ваше существующее Express-приложение:
|
|
27
|
+
|
|
28
|
+
```javascript
|
|
29
|
+
const BANK = require('./index.js');
|
|
30
|
+
|
|
31
|
+
const app = (async function initBank(){
|
|
32
|
+
try {
|
|
33
|
+
return await BANK();
|
|
34
|
+
} catch {
|
|
35
|
+
console.log("Ошибка при инициализации банка!");
|
|
36
|
+
}
|
|
37
|
+
})();
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* вызов функции BANK() возращает готовый express
|
|
41
|
+
*/
|
|
42
|
+
|
|
43
|
+
// Далее ваш код
|
|
44
|
+
```
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { DataTypes } = require('sequelize');
|
|
2
2
|
const sequelize = require('../config/init-db');
|
|
3
|
-
const
|
|
4
|
-
|
|
3
|
+
const path = require("path");
|
|
4
|
+
const User = require(path.join(__dirname, 'User'));
|
|
5
5
|
const Account = sequelize.define('account', {
|
|
6
6
|
id: {
|
|
7
7
|
type: DataTypes.INTEGER,
|
|
@@ -37,8 +37,6 @@ const Account = sequelize.define('account', {
|
|
|
37
37
|
field: '2FA-status'
|
|
38
38
|
}
|
|
39
39
|
});
|
|
40
|
-
|
|
41
40
|
User.hasMany(Account, { foreignKey: 'user', sourceKey: 'name' });
|
|
42
41
|
Account.belongsTo(User, { foreignKey: 'user', targetKey: 'name', as: 'owner' });
|
|
43
|
-
|
|
44
|
-
module.exports = Account;
|
|
42
|
+
module.exports = Account;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { DataTypes } = require('sequelize');
|
|
2
|
-
const
|
|
3
|
-
const
|
|
4
|
-
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const sequelize = require(path.join(__dirname, '..', 'config', 'init-db'));
|
|
4
|
+
const Account = require(path.join(__dirname, 'Account'));
|
|
5
5
|
const Credit = sequelize.define('credit', {
|
|
6
6
|
id: {
|
|
7
7
|
type: DataTypes.INTEGER,
|
|
@@ -32,8 +32,6 @@ const Credit = sequelize.define('credit', {
|
|
|
32
32
|
defaultValue: false
|
|
33
33
|
}
|
|
34
34
|
});
|
|
35
|
-
|
|
36
35
|
Account.hasMany(Credit, { foreignKey: 'account_id' });
|
|
37
36
|
Credit.belongsTo(Account, { foreignKey: 'account_id', as: 'linkedAccount' });
|
|
38
|
-
|
|
39
|
-
module.exports = Credit;
|
|
37
|
+
module.exports = Credit;
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
// database/models/Transaction.js
|
|
2
1
|
const { DataTypes } = require('sequelize');
|
|
3
|
-
const
|
|
4
|
-
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const sequelize = require(path.join(__dirname, '..', 'config', 'init-db'));
|
|
5
4
|
module.exports = sequelize.define('transaction_log', {
|
|
6
5
|
id: {
|
|
7
6
|
type: DataTypes.INTEGER,
|
|
@@ -17,11 +16,11 @@ module.exports = sequelize.define('transaction_log', {
|
|
|
17
16
|
allowNull: false
|
|
18
17
|
},
|
|
19
18
|
sender_or_receiver: {
|
|
20
|
-
type: DataTypes.STRING,
|
|
19
|
+
type: DataTypes.STRING,
|
|
21
20
|
allowNull: true
|
|
22
21
|
},
|
|
23
22
|
amount: {
|
|
24
23
|
type: DataTypes.DECIMAL(15, 2),
|
|
25
24
|
allowNull: false
|
|
26
25
|
}
|
|
27
|
-
});
|
|
26
|
+
});
|
package/database/models/User.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const { DataTypes } = require('sequelize');
|
|
2
|
-
const
|
|
3
|
-
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const sequelize = require(path.join(__dirname, '..', 'config', 'init-db'));
|
|
4
4
|
const User = sequelize.define('user', {
|
|
5
5
|
name: {
|
|
6
6
|
type: DataTypes.STRING,
|
|
@@ -8,11 +8,11 @@ const User = sequelize.define('user', {
|
|
|
8
8
|
allowNull: false
|
|
9
9
|
},
|
|
10
10
|
user_name: {
|
|
11
|
-
type: DataTypes.STRING,
|
|
11
|
+
type: DataTypes.STRING,
|
|
12
12
|
allowNull: false
|
|
13
13
|
},
|
|
14
14
|
user_surname: {
|
|
15
|
-
type: DataTypes.STRING,
|
|
15
|
+
type: DataTypes.STRING,
|
|
16
16
|
allowNull: false
|
|
17
17
|
},
|
|
18
18
|
user_gmail: {
|
|
@@ -27,12 +27,12 @@ const User = sequelize.define('user', {
|
|
|
27
27
|
field: '2FA-status'
|
|
28
28
|
},
|
|
29
29
|
two_fa_token: {
|
|
30
|
-
type: DataTypes.STRING,
|
|
30
|
+
type: DataTypes.STRING,
|
|
31
31
|
allowNull: true,
|
|
32
32
|
field: '2FA-token'
|
|
33
33
|
},
|
|
34
34
|
token: {
|
|
35
|
-
type: DataTypes.STRING,
|
|
35
|
+
type: DataTypes.STRING,
|
|
36
36
|
allowNull: false
|
|
37
37
|
},
|
|
38
38
|
password: {
|
|
@@ -42,9 +42,7 @@ const User = sequelize.define('user', {
|
|
|
42
42
|
avatar: {
|
|
43
43
|
type: DataTypes.STRING,
|
|
44
44
|
allowNull: true,
|
|
45
|
-
defaultValue: '
|
|
45
|
+
defaultValue: path.join(__dirname, '..', '..', 'uploads', 'avatars', 'default.png')
|
|
46
46
|
}
|
|
47
|
-
|
|
48
47
|
});
|
|
49
|
-
|
|
50
|
-
module.exports = User;
|
|
48
|
+
module.exports = User;
|
|
@@ -1,19 +1,16 @@
|
|
|
1
|
-
const
|
|
2
|
-
|
|
1
|
+
const path = require("path");
|
|
2
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
3
|
+
const Transaction = require(path.join(__dirname, '..', '..', 'models', 'Transaction'));
|
|
3
4
|
module.exports = async function addManny(accountId, amount) {
|
|
4
5
|
try {
|
|
5
6
|
const acc = await Account.findByPk(accountId);
|
|
6
7
|
if (!acc) return { status: false, statusCode: -2, message: 'Счет не найден' };
|
|
7
|
-
|
|
8
8
|
const numericAmount = parseFloat(amount);
|
|
9
9
|
if (isNaN(numericAmount) || numericAmount <= 0) return { status: false, statusCode: -2 };
|
|
10
|
-
|
|
11
10
|
await acc.increment('manny', { by: numericAmount });
|
|
12
|
-
const Transaction = require('../../models/Transaction');
|
|
13
11
|
await Transaction.create({ account_id: accountId, type: 'DEPOSIT', sender_or_receiver: 'Администрация (ROOT)', amount: numericAmount });
|
|
14
|
-
|
|
15
12
|
return { status: true, statusCode: 1 };
|
|
16
13
|
} catch (err) {
|
|
17
14
|
return { status: false, statusCode: -10 };
|
|
18
15
|
}
|
|
19
|
-
};
|
|
16
|
+
};
|
|
@@ -1,23 +1,19 @@
|
|
|
1
1
|
const bcrypt = require('bcrypt');
|
|
2
|
-
const
|
|
3
|
-
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
4
4
|
module.exports = async function changePincode(accountId, oldPin, newPin) {
|
|
5
5
|
try {
|
|
6
6
|
const acc = await Account.findByPk(accountId);
|
|
7
7
|
if (!acc) return { status: false, statusCode: -2, message: 'Счет не найден' };
|
|
8
|
-
|
|
9
8
|
const isPinValid = await bcrypt.compare(oldPin, acc.pin_code);
|
|
10
9
|
if (!isPinValid) return { status: false, statusCode: -2, message: 'Неверный текущий пин-код' };
|
|
11
|
-
|
|
12
10
|
if (!newPin || newPin.length > 8) {
|
|
13
11
|
return { status: false, statusCode: -2, message: 'Новый пин-код должен быть до 8 символов' };
|
|
14
12
|
}
|
|
15
|
-
|
|
16
13
|
acc.pin_code = await bcrypt.hash(newPin, 10);
|
|
17
14
|
await acc.save();
|
|
18
|
-
|
|
19
15
|
return { status: true, statusCode: 1 };
|
|
20
16
|
} catch (err) {
|
|
21
17
|
return { status: false, statusCode: -10 };
|
|
22
18
|
}
|
|
23
|
-
};
|
|
19
|
+
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
const
|
|
2
|
-
const
|
|
1
|
+
const path = require("path");
|
|
2
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
3
|
+
const { sendBotNotification } = require(path.join(__dirname, '..', 'bot', 'bot'));
|
|
3
4
|
module.exports = async function changeAccountStatus(accountId, isActive) {
|
|
4
5
|
try {
|
|
5
6
|
const [updatedCount] = await Account.update(
|
|
@@ -1,106 +1,56 @@
|
|
|
1
|
-
const
|
|
2
|
-
const Account = require('
|
|
3
|
-
const Credit = require('
|
|
4
|
-
const
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
const path = require("path");
|
|
2
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
3
|
+
const Credit = require(path.join(__dirname, '..', '..', 'models', 'Credit'));
|
|
4
|
+
const sequelize = require(path.join(__dirname, '..', '..', 'config', 'init-db'));
|
|
5
|
+
async function createCredit({ accountId, amount, autoRepay = false, rate = 0.1, termMonths = 12 }) {
|
|
6
|
+
const numericAmount = parseFloat(amount);
|
|
7
|
+
const numericRate = parseFloat(rate);
|
|
8
|
+
const numericTerm = parseInt(termMonths, 10);
|
|
9
|
+
if (!accountId || isNaN(numericAmount) || numericAmount <= 0) {
|
|
10
|
+
return { success: false, error: 'Некорректные параметры для создания кредита' };
|
|
11
|
+
}
|
|
12
|
+
if (isNaN(numericRate) || numericRate < 0 || isNaN(numericTerm) || numericTerm <= 0) {
|
|
13
|
+
return { success: false, error: 'Некорректная процентная ставка или срок кредитования' };
|
|
14
|
+
}
|
|
15
|
+
const transaction = await sequelize.transaction();
|
|
8
16
|
try {
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
// Проверка пин-кода (-23)
|
|
15
|
-
const isPinValid = await bcrypt.compare(pinCode, targetAcc.pin_code);
|
|
16
|
-
if (!isPinValid) return { status: false, statusCode: -23, message: 'Неверный пин-код счета' };
|
|
17
|
-
|
|
18
|
-
const creditAmount = parseFloat(amount);
|
|
19
|
-
if (isNaN(creditAmount) || creditAmount <= 0) return { status: false, statusCode: -2 };
|
|
20
|
-
|
|
21
|
-
const paymentAmount = parseFloat((creditAmount / paymentsCount).toFixed(2));
|
|
22
|
-
|
|
23
|
-
// 1. Создаем технический счет кредита, куда начисляются заемные деньги
|
|
24
|
-
const creditAccount = await Account.create({
|
|
25
|
-
user: username,
|
|
26
|
-
pin_code: targetAcc.pin_code,
|
|
27
|
-
manny: creditAmount,
|
|
28
|
-
active: true,
|
|
29
|
-
two_fa_status: false
|
|
17
|
+
const account = await Account.findOne({
|
|
18
|
+
where: { id: accountId },
|
|
19
|
+
lock: transaction.LOCK.UPDATE,
|
|
20
|
+
transaction
|
|
30
21
|
});
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
payment_amount: paymentAmount,
|
|
38
|
-
auto_withdrawal: autoWithdrawal
|
|
22
|
+
if (!account) throw new Error('Аккаунт не найден');
|
|
23
|
+
if (account.status === 'blocked') throw new Error('Аккаунт заблокирован');
|
|
24
|
+
const existingCredit = await Credit.findOne({
|
|
25
|
+
where: { accountId: account.id, status: 'active' },
|
|
26
|
+
transaction,
|
|
27
|
+
lock: transaction.LOCK.UPDATE
|
|
39
28
|
});
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
* Автономный метод обработки биллинга (вызывать раз в период через крон / интервал)
|
|
43
|
-
*/
|
|
44
|
-
async function processCreditBilling(creditId) {
|
|
45
|
-
try {
|
|
46
|
-
const credit = await Credit.findByPk(creditId, { include: [{ model: Account, as: 'linkedAccount' }] });
|
|
47
|
-
if (!credit) return;
|
|
48
|
-
|
|
49
|
-
const linkedAcc = credit.linkedAccount;
|
|
50
|
-
const owner = await User.findByPk(username);
|
|
51
|
-
|
|
52
|
-
let paymentSuccess = false;
|
|
53
|
-
|
|
54
|
-
// Если автономное списание разрешено ТЗ
|
|
55
|
-
if (credit.auto_withdrawal && linkedAcc) {
|
|
56
|
-
if (parseFloat(linkedAcc.manny) >= parseFloat(credit.payment_amount)) {
|
|
57
|
-
await linkedAcc.decrement('manny', { by: credit.payment_amount });
|
|
58
|
-
credit.remaining_payments -= 1;
|
|
59
|
-
await credit.save();
|
|
60
|
-
paymentSuccess = true;
|
|
61
|
-
} else {
|
|
62
|
-
// Если денег не хватило, переводим в ручной режим для отправки предупреждений
|
|
63
|
-
credit.auto_withdrawal = false;
|
|
64
|
-
await credit.save();
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
// Если автосписание выключено или не удалось — отправляем предупреждение на почту по ТЗ
|
|
69
|
-
if (!paymentSuccess && owner) {
|
|
70
|
-
const transporter = nodemailer.createTransport({
|
|
71
|
-
service: 'gmail',
|
|
72
|
-
auth: { user: process.env.GMAIL, pass: process.env.GOOGLE_APP_PASSWORD }
|
|
73
|
-
});
|
|
74
|
-
|
|
75
|
-
await transporter.sendMail({
|
|
76
|
-
from: `"City-bank Биллинг" <${process.env.GMAIL}>`,
|
|
77
|
-
to: owner.user_gmail,
|
|
78
|
-
subject: '⚠️ Требуется оплата по кредиту | City-bank',
|
|
79
|
-
text: `Уважаемый клиент! По вашему кредитному счету #${credit.account_id} зафиксирован обязательный платеж. Вам необходимо внести ${credit.payment_amount} руб.`
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
// Если все платежи закрыты — полностью удаляем и закрываем кредит и технический счет по ТЗ
|
|
84
|
-
if (credit.remaining_payments <= 0) {
|
|
85
|
-
if (linkedAcc) await linkedAcc.destroy();
|
|
86
|
-
await credit.destroy();
|
|
87
|
-
console.log(`🎉 Кредит #${creditId} полностью погашен и закрыт.`);
|
|
88
|
-
}
|
|
89
|
-
} catch (billingErr) {
|
|
90
|
-
console.error("Ошибка процессинга кредита:", billingErr.message);
|
|
91
|
-
}
|
|
29
|
+
if (existingCredit) {
|
|
30
|
+
throw new Error('У этого аккаунта уже есть активный кредит');
|
|
92
31
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
32
|
+
const totalRepay = numericAmount * (1 + numericRate);
|
|
33
|
+
const credit = await Credit.create({
|
|
34
|
+
accountId: account.id,
|
|
35
|
+
amount: numericAmount,
|
|
36
|
+
totalRepay: totalRepay,
|
|
37
|
+
remainingRepay: totalRepay,
|
|
38
|
+
status: 'active',
|
|
39
|
+
autoRepay: !!autoRepay,
|
|
40
|
+
termMonths: numericTerm
|
|
41
|
+
}, { transaction });
|
|
42
|
+
await account.increment('balance', { by: numericAmount, transaction });
|
|
43
|
+
await transaction.commit();
|
|
44
|
+
return {
|
|
45
|
+
success: true,
|
|
46
|
+
message: 'Кредит успешно оформлен',
|
|
47
|
+
creditId: credit.id
|
|
102
48
|
};
|
|
103
|
-
} catch (
|
|
104
|
-
|
|
49
|
+
} catch (error) {
|
|
50
|
+
if (transaction && !transaction.finished) {
|
|
51
|
+
await transaction.rollback();
|
|
52
|
+
}
|
|
53
|
+
return { success: false, error: error.message };
|
|
105
54
|
}
|
|
106
|
-
}
|
|
55
|
+
}
|
|
56
|
+
module.exports = createCredit;
|
|
@@ -1,24 +1,21 @@
|
|
|
1
1
|
const bcrypt = require('bcrypt');
|
|
2
|
-
const
|
|
3
|
-
|
|
2
|
+
const path = require("path");
|
|
3
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
4
4
|
module.exports = async function createAccount(username, pinCode, enable2FA) {
|
|
5
5
|
try {
|
|
6
|
-
// Валидация длины пин-кода (до 8 символов по ТЗ)
|
|
7
6
|
if (!pinCode || pinCode.length > 8) {
|
|
8
7
|
return { status: false, statusCode: -2, message: 'Пин-код должен быть до 8 символов' };
|
|
9
8
|
}
|
|
10
|
-
|
|
11
9
|
const hashedPin = await bcrypt.hash(pinCode, 10);
|
|
12
10
|
const newAccount = await Account.create({
|
|
13
11
|
user: username,
|
|
14
12
|
pin_code: hashedPin,
|
|
15
|
-
manny: 0.00,
|
|
13
|
+
manny: 0.00,
|
|
16
14
|
active: true,
|
|
17
15
|
two_fa_status: enable2FA
|
|
18
16
|
});
|
|
19
|
-
|
|
20
17
|
return { status: true, statusCode: 1, accountId: newAccount.id };
|
|
21
18
|
} catch (err) {
|
|
22
19
|
return { status: false, statusCode: -10, message: err.message };
|
|
23
20
|
}
|
|
24
|
-
};
|
|
21
|
+
};
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
const Account = require('../../models/Account');
|
|
2
|
-
|
|
3
2
|
module.exports = async function findManny(accountId) {
|
|
4
3
|
try {
|
|
5
4
|
const acc = await Account.findByPk(accountId);
|
|
6
5
|
if (!acc) return { status: false, statusCode: -2, message: 'Счет не найден' };
|
|
7
|
-
|
|
8
6
|
return { status: true, statusCode: 1, manny: parseFloat(acc.manny) };
|
|
9
7
|
} catch (err) {
|
|
10
8
|
return { status: false, statusCode: -10 };
|
|
11
9
|
}
|
|
12
|
-
};
|
|
10
|
+
};
|
|
@@ -1,26 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
const Account = require('
|
|
3
|
-
const Transaction = require('
|
|
4
|
-
|
|
1
|
+
const path = require("path")
|
|
2
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
3
|
+
const Transaction = require(path.join(__dirname, '..', '..', 'models', 'Transaction'));
|
|
5
4
|
module.exports = async function getAccountLogs(username) {
|
|
6
5
|
try {
|
|
7
|
-
// Находим все ID счетов, принадлежащих этому пользователю
|
|
8
6
|
const myAccounts = await Account.findAll({
|
|
9
7
|
where: { user: username },
|
|
10
8
|
attributes: ['id']
|
|
11
9
|
});
|
|
12
|
-
|
|
13
10
|
const accountIds = myAccounts.map(acc => acc.id);
|
|
14
|
-
|
|
15
|
-
// Запрашиваем логи по этим счетам
|
|
16
11
|
const logs = await Transaction.findAll({
|
|
17
12
|
where: { account_id: accountIds },
|
|
18
|
-
order: [['createdAt', 'DESC']],
|
|
19
|
-
limit: 50
|
|
13
|
+
order: [['createdAt', 'DESC']],
|
|
14
|
+
limit: 50
|
|
20
15
|
});
|
|
21
|
-
|
|
22
16
|
return { status: true, statusCode: 1, logs };
|
|
23
17
|
} catch (err) {
|
|
24
18
|
return { status: false, statusCode: -10, message: err.message };
|
|
25
19
|
}
|
|
26
|
-
};
|
|
20
|
+
};
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
const
|
|
2
|
-
|
|
1
|
+
const path = require("path");
|
|
2
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
3
|
+
const Transaction = require(path.join(__dirname, '..', '../models', 'Transaction'));
|
|
3
4
|
module.exports = async function removeManny(accountId, amount) {
|
|
4
5
|
try {
|
|
5
6
|
const acc = await Account.findByPk(accountId);
|
|
6
7
|
if (!acc) return { status: false, statusCode: -2, message: 'Счет не найден' };
|
|
7
|
-
|
|
8
8
|
const numericAmount = parseFloat(amount);
|
|
9
9
|
if (isNaN(numericAmount) || numericAmount <= 0) return { status: false, statusCode: -2 };
|
|
10
|
-
|
|
11
10
|
await acc.decrement('manny', { by: numericAmount });
|
|
12
|
-
const Transaction = require('../../models/Transaction');
|
|
13
11
|
await Transaction.create({ account_id: accountId, type: 'WITHDRAW', sender_or_receiver: 'Администрация (ROOT)', amount: numericAmount });
|
|
14
12
|
return { status: true, statusCode: 1 };
|
|
15
13
|
} catch (err) {
|
|
16
14
|
return { status: false, statusCode: -10 };
|
|
17
15
|
}
|
|
18
|
-
};
|
|
16
|
+
};
|
|
@@ -1,49 +1,47 @@
|
|
|
1
|
+
const path = require("path");
|
|
1
2
|
const bcrypt = require('bcrypt');
|
|
2
|
-
const Account = require('
|
|
3
|
-
const User = require('
|
|
4
|
-
const
|
|
5
|
-
const
|
|
6
|
-
|
|
3
|
+
const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
|
|
4
|
+
const User = require(path.join(__dirname, '..', '..', 'models', 'User'));
|
|
5
|
+
const Transaction = require(path.join(__dirname, '..', '..', 'models', 'Transaction'));
|
|
6
|
+
const sequelize = require(path.join(__dirname, '..', '..', 'config', 'init-db'));
|
|
7
|
+
const { sendBotNotification } = require(path.join(__dirname, '..', 'bot', 'bot'));
|
|
8
|
+
const logger = require("custom-color-logs").print;
|
|
7
9
|
module.exports = async function transferManny(fromId, toId, amount, pinCode, totpCode = null) {
|
|
8
10
|
const t = await sequelize.transaction();
|
|
9
11
|
try {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
const numericAmount = parseFloat(amount);
|
|
13
|
+
if (isNaN(numericAmount) || numericAmount <= 0) {
|
|
14
|
+
await t.rollback();
|
|
15
|
+
return { status: false, statusCode: -2, message: 'Некорректная сумма перевода' };
|
|
16
|
+
}
|
|
17
|
+
const fromAcc = await Account.findByPk(fromId, {
|
|
18
|
+
transaction: t,
|
|
19
|
+
lock: t.LOCK.UPDATE
|
|
20
|
+
});
|
|
21
|
+
const toAcc = await Account.findByPk(toId, {
|
|
22
|
+
transaction: t,
|
|
23
|
+
lock: t.LOCK.UPDATE
|
|
24
|
+
});
|
|
14
25
|
if (!fromAcc || !toAcc) {
|
|
15
26
|
await t.rollback();
|
|
16
27
|
return { status: false, statusCode: -2, message: 'Один из счетов не найден' };
|
|
17
28
|
}
|
|
18
|
-
|
|
19
29
|
if (!fromAcc.active || !toAcc.active) {
|
|
20
30
|
await t.rollback();
|
|
21
31
|
return { status: false, statusCode: -11, message: 'Один из счетов заблокирован' };
|
|
22
32
|
}
|
|
23
|
-
|
|
24
|
-
// Проверка пин-кода отправителя по вашему ТЗ (-23)
|
|
25
33
|
const isPinValid = await bcrypt.compare(pinCode, fromAcc.pin_code);
|
|
26
34
|
if (!isPinValid) {
|
|
27
35
|
await t.rollback();
|
|
28
|
-
return { status: false, statusCode: -23, message: 'Неверный пароль
|
|
36
|
+
return { status: false, statusCode: -23, message: 'Неверный пароль счета отправителя' };
|
|
29
37
|
}
|
|
30
|
-
|
|
31
|
-
const numericAmount = parseFloat(amount);
|
|
32
|
-
if (isNaN(numericAmount) || numericAmount <= 0) {
|
|
33
|
-
await t.rollback();
|
|
34
|
-
return { status: false, statusCode: -2, message: 'Некорректная сумма перевода' };
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
// Проверка баланса (root-пользователь игнорирует лимиты средств)
|
|
38
38
|
if (fromAcc.user !== 'root' && parseFloat(fromAcc.manny) < numericAmount) {
|
|
39
39
|
await t.rollback();
|
|
40
40
|
return { status: false, statusCode: -11, message: 'Недостаточно средств на счете' };
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
// Если на счете включена индивидуальная проверка 2FA
|
|
44
42
|
if (fromAcc.two_fa_status) {
|
|
45
43
|
const owner = await User.findByPk(fromAcc.user, { transaction: t });
|
|
46
|
-
if (owner.two_fa_status) {
|
|
44
|
+
if (owner && owner.two_fa_status) {
|
|
47
45
|
if (!totpCode) {
|
|
48
46
|
await t.rollback();
|
|
49
47
|
return { status: false, statusCode: -2, message: 'Требуется токен подтверждения 2FA' };
|
|
@@ -55,29 +53,34 @@ module.exports = async function transferManny(fromId, toId, amount, pinCode, tot
|
|
|
55
53
|
}
|
|
56
54
|
}
|
|
57
55
|
}
|
|
58
|
-
|
|
59
|
-
// Проведение атомарного перевода
|
|
60
56
|
await fromAcc.decrement('manny', { by: numericAmount, transaction: t });
|
|
61
57
|
await toAcc.increment('manny', { by: numericAmount, transaction: t });
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
58
|
+
await Transaction.create({
|
|
59
|
+
account_id: fromId,
|
|
60
|
+
type: 'TRANSFER_OUT',
|
|
61
|
+
sender_or_receiver: `На счет #${toId} (${toAcc.user})`,
|
|
62
|
+
amount: numericAmount
|
|
63
|
+
}, { transaction: t });
|
|
64
|
+
await Transaction.create({
|
|
65
|
+
account_id: toId,
|
|
66
|
+
type: 'TRANSFER_IN',
|
|
67
|
+
sender_or_receiver: `Со счета #${fromId} (${fromAcc.user})`,
|
|
68
|
+
amount: numericAmount
|
|
69
|
+
}, { transaction: t });
|
|
68
70
|
await t.commit();
|
|
69
|
-
|
|
70
|
-
// Обновляем модели для считывания актуального баланса ботом
|
|
71
71
|
await fromAcc.reload();
|
|
72
72
|
await toAcc.reload();
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
73
|
+
try {
|
|
74
|
+
await sendBotNotification('transfer-from-bot', { fromId, toId, amount: numericAmount, balance: fromAcc.manny });
|
|
75
|
+
await sendBotNotification('transfer-to-bot', { toId, fromId, amount: numericAmount, balance: toAcc.manny });
|
|
76
|
+
} catch (botErr) {
|
|
77
|
+
console.log(logger.DatabaseError('Ошибка отправки уведомления боту:', botErr.message))
|
|
78
|
+
}
|
|
78
79
|
return { status: true, statusCode: 1 };
|
|
79
80
|
} catch (err) {
|
|
80
|
-
|
|
81
|
+
if (!t.finished) {
|
|
82
|
+
await t.rollback();
|
|
83
|
+
}
|
|
81
84
|
return { status: false, statusCode: -10, message: err.message };
|
|
82
85
|
}
|
|
83
|
-
};
|
|
86
|
+
};
|