sequelize-game-bank 1.1.0 → 1.2.0

package/database/models/Account.js

@@ -35,6 +35,11 @@ const Account = sequelize.define('account', {
     allowNull: false,
     defaultValue: false,
     field: '2FA-status'
+  },
+  cardNumber:{
+    type:DataTypes.STRING,
+    allowNull:true,
+    unique:true
   }
 });
 User.hasMany(Account, { foreignKey: 'user', sourceKey: 'name' });

package/database/services/account/cardTransfer.js

@@ -0,0 +1,91 @@
+const path = require("path");
+const bcrypt = require('bcrypt');
+const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
+const User = require(path.join(__dirname, '..', '..', 'models', 'User'));
+const Transaction = require(path.join(__dirname, '..', '..', 'models', 'Transaction'));
+const sequelize = require(path.join(__dirname, '..', '..', 'config', 'init-db'));
+const { sendBotNotification } = require(path.join(__dirname, '..', 'bot', 'bot'));
+const logger = require("custom-color-logs").print;
+async function getIdByCard(card) {
+    const result = await Account.findOne({
+        where:{cardNumber:card.toString()},
+        attributes: ['id']
+    });
+    if (!result) return false
+    return result
+}
+module.exports = async function cardTransfer(card, toId, amount, pinCode) {
+  const t = await sequelize.transaction();
+  try {
+    const fromId = await getIdByCard(card);
+    const numericAmount = parseFloat(amount);
+    if (isNaN(numericAmount) || numericAmount <= 0) {
+      await t.rollback();
+      return { status: false, statusCode: -2, message: 'Некорректная сумма перевода' };
+    }
+    const fromAcc = await Account.findByPk(fromId, { 
+      transaction: t, 
+      lock: t.LOCK.UPDATE 
+    });
+    const toAcc = await Account.findByPk(toId, { 
+      transaction: t, 
+      lock: t.LOCK.UPDATE 
+    });
+    if (!fromAcc || !toAcc) {
+      await t.rollback();
+      return { status: false, statusCode: -2, message: 'Один из счетов не найден' };
+    }
+    if (!fromAcc.active || !toAcc.active) {
+      await t.rollback();
+      return { status: false, statusCode: -11, message: 'Один из счетов заблокирован' };
+    }
+    const isPinValid = await bcrypt.compare(pinCode, fromAcc.pin_code);
+    if (!isPinValid) {
+      await t.rollback();
+      return { status: false, statusCode: -23, message: 'Неверный пароль счета отправителя' };
+    }
+    if (fromAcc.user !== 'root' && parseFloat(fromAcc.manny) < numericAmount) {
+      await t.rollback();
+      return { status: false, statusCode: -11, message: 'Недостаточно средств на счете' };
+    }
+    if (fromAcc.two_fa_status) {
+      const owner = await User.findByPk(fromAcc.user, { transaction: t });
+      if (owner && owner.two_fa_status) {
+        const isTotpValid = await bcrypt.compare(totpCode, owner.two_fa_token);
+        if (!isTotpValid) {
+          await t.rollback();
+          return { status: false, statusCode: -2, message: 'Неверный токен подтверждения 2FA' };
+        }
+      }
+    }
+    await fromAcc.decrement('manny', { by: numericAmount, transaction: t });
+    await toAcc.increment('manny', { by: numericAmount, transaction: t });
+    await Transaction.create({ 
+      account_id: fromId, 
+      type: 'TRANSFER_OUT', 
+      sender_or_receiver: `На счет #${toId} (${toAcc.user})`, 
+      amount: numericAmount 
+    }, { transaction: t });
+    await Transaction.create({ 
+      account_id: toId, 
+      type: 'TRANSFER_IN', 
+      sender_or_receiver: `Со счета #${fromId} (${fromAcc.user})`, 
+      amount: numericAmount 
+    }, { transaction: t });
+    await t.commit();
+    await fromAcc.reload();
+    await toAcc.reload();
+    try {
+      await sendBotNotification('transfer-from-bot', { fromId, toId, amount: numericAmount, balance: fromAcc.manny });
+      await sendBotNotification('transfer-to-bot', { toId, fromId, amount: numericAmount, balance: toAcc.manny });
+    } catch (botErr) {
+      console.log(logger.DatabaseError('Ошибка отправки уведомления боту:', botErr.message))
+    }
+    return { status: true, statusCode: 1 };
+  } catch (err) {
+    if (!t.finished) {
+      await t.rollback();
+    }
+    return { status: false, statusCode: -10, message: err.message };
+  }
+};

package/database/services/account/create.js

@@ -12,10 +12,19 @@ module.exports = async function createAccount(username, pinCode, enable2FA) {
       pin_code: hashedPin,
       manny: 0.00,
       active: true,
-      two_fa_status: enable2FA
+      two_fa_status: enable2FA,
+      cardNumber:null
     });
     return { status: true, statusCode: 1, accountId: newAccount.id };
   } catch (err) {
+    console.log(err)
+
+
+
+
+
+
+    
     return { status: false, statusCode: -10, message: err.message };
   }
 };

package/database/services/account/linkACard.js

@@ -0,0 +1,18 @@
+const path = require("path");
+const Account = require(path.join(__dirname, '..', '..', 'models', 'Account'));
+const logger = require("custom-color-logs").print;
+module.exports = async function linkACard(card, id, pin_code) {
+    try {
+        const account = await Account.findByPk(id);
+        if (!account) return { status: false, statusCode: -2, message: "?¿?" };
+        if(!account.active) return { status: false, statusCode: -11, message: 'Один из счетов заблокирован' };
+        if (account.pin_code !== pin_code) return { status: false, statusCode: -23, message: "Неправильны пароль!" };
+        if (account.cardNumber !== null) return { status: false, statusCode: -19, message: "Карты уже привязана" };
+        account.cardNumber = card;
+        await account.save();
+        return {status: true, statusCode: 1, message: 'Привязка карты удалась'};
+    } catch (err) {
+        console.log(logger.BankError(err));
+        return { status: false, statusCode: -10, message: err.message };
+    }
+}

package/database/services/accounts.js

@@ -9,5 +9,7 @@ module.exports = {
   findManny: require(path.join(__dirname, 'account', 'find-manny')),
   creatCredit: require(path.join(__dirname, 'account', 'create-credit')),
   getLogs: require(path.join(__dirname, 'account', 'logs')),
-  changeAccountStatus: require(path.join(__dirname, 'account', 'change-status')) 
+  changeAccountStatus: require(path.join(__dirname, 'account', 'change-status')),
+  linkACard: require(path.join(__dirname, 'account', 'linkACard')),
+  cardTransfer: require(path.join(__dirname, 'account', 'cardTransfer'))
 };

package/index.js

@@ -11,11 +11,9 @@ const { writeTemplatesIfNotExist } = require(path.join(__dirname, 'database', 's
 const registerRoutes = require(path.join(__dirname, 'server', 'server'));
 const Transaction = require(path.join(__dirname, 'database', 'models', 'Transaction')); 
 const app = express();
-
 const { verifySession } = require(path.join(__dirname, 'server', 'server'));
 app.use(express.json());
 app.use(cookieParser());
-require(path.join(__dirname, 'database', 'services', 'bot', 'cron-schedule'));
 async function Bank() {
   try {
     await sequelize.sync();
@@ -53,6 +51,8 @@ async function Bank() {
     app.get('/home.html', (req, res) => res.sendFile(path.join(__dirname, 'public', 'home.html')));
     app.get('/favicon.ico', (req, res) => res.sendFile(path.join(__dirname, 'public', 'icon', 'icon.png')));
     app.get('/', (req, res) => res.redirect('/home.html'));
+
+    require(path.join(__dirname, 'database', 'services', 'bot', 'cron-schedule'));
     return configuredApp;
   } catch (err) {
     console.log(logger.ServerBankError("Критическая ошибка инициализации модулей", err));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sequelize-game-bank",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A Sequelize-based gaming economy and banking system featuring user profiles, credits, admin management, and detailed transaction history.",
   "main": "index.js",
   "type": "commonjs",

package/server/server.js

@@ -210,9 +210,22 @@ module.exports = function registerRoutes(app) {
     const result = await accountsHub.getLogs(req.user.name);
     return res.json(result);
   });
-
-
-
+  app.post('/api/terminal/login', async(req, res)=>{
+    if(!req.body) return res.sendStatus(400)
+    const id = req.body.id;
+    const pincode = req.body.pincode;
+    const card = req.body.card;
+    const result = await accountsHub.linkACard(card, id, pincode)
+    if(!result.status) return res.sendStatus(422)
+    return res.sendStatus(200);
+  });
+  app.post('/api/terminal/transfer', async(req, res)=>{
+    const card = req.body.card;
+    const to = req.body.to;
+    const pincode = req.body.pincode;
+    const manny = req.body.pinCode;
+    const result = await accountsHub.cardTransfer(card, to, manny, pincode)
+  });
   return app;
 };
 module.exports.verifySession = verifySession;