@ozdao/prometheus-framework 0.2.40 → 0.2.41

package/src/modules/payments/controller/payments.controller.js

@@ -3,239 +3,93 @@ var jwt = require("jsonwebtoken");
 var axios = require('axios');
 var bcrypt = require("bcryptjs");
 var crypto = require('crypto');
-const { v4: uuidv4 } = require('uuid');
 
-var TerminalKey = process.env.TINKOFF_TERMINAL_KEY;
-var TerminalPassword = process.env.TINKOFF_TERMINAL_PASSWORD;
+const QRCode = require('qrcode');
 
 const controllerFactory = (db) => {
   const Payment = db.payment;
+  const Wallet = db.wallet;
   const Order = db.order;
 
-  const getAll = (req, res) => {
-    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
-      // If succes
-      res.status(200).send(paymentes);
-    });
-  };
-
   const create = (req, res) => {
-    console.log(req.body)
-    Payment.create({
-      type: req.body.type,
-      order: req.body.order, 
-      positions: req.body.positions
-    }, (err, payment) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!payment) {return res.status(404).send({ message: "Something wrong when updating product. (with files)" }); }
-      res.status(200).send(payment);
-    })
-  };
+    const { amount, positions, userId } = req.body;
 
-  const get = (req, res) => {
-    Payment.findOne({ _id: req.params._id }).exec((err, payment) => {
-      // If error
-      if (err) {return res.status(500).send({ message: err }); }
-      // If not found
-      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
-      // If succes
-      res.status(200).send(payment);
-    });
-  };
+    const newPayment = new Payment({ amount, positions, user: userId });
+    await newPayment.save();
 
-  const update = (req, res) => {
+    const qrData = `PaymentID:${newPayment._id};Amount:${amount}`;
+    const qrCode = await QRCode.toDataURL(qrData);
+
+    res.send({ qrCode, paymentId: newPayment._id });
+  };
 
-    Payment.findOneAndUpdate({ PaymentId: req.params._id }, req.body, { new: true, upsert: true}).exec((err, payment) => {
+  const read = (req, res) => {
+    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
       // If error
       if (err) {return res.status(500).send({ message: err }); }
       // If not found
-      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
       // If succes
-      res.status(200).send(payment);
+      res.status(200).send(paymentes);
     });
   };
 
-  const deletePayment = (req, res) => {
-    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
-      if (err) {return res.status(500).send({ message: err }); }
-      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
-      res.status(200).send(payment);
-    })
-  };
-
-  function createToken (request) {
-    request = Object.entries(request).map(function(key) {
-      return { [key[0]]: key[1] }
-      })
-      request.push({Password: TerminalPassword})
-      request.sort(function(a, b){
-      if(Object.keys(a)[0] < Object.keys(b)[0]) { return -1; }
-      if(Object.keys(a)[0] > Object.keys(b)[0]) { return 1; }
-      return 0;
-        })
-    const requestContacted = request.map(function(key) {
-      return Object.values(key)[0]
-     }).join("")
-
-    const hash = crypto.createHash('sha256').update(requestContacted).digest('hex');
-
-    return hash
-  } 
-  const newpayment = (req, res) => {
-    // Data for payment init
-    console.log(req.body.phone);
-    // Send request to Tinkoff
-    axios.post('https://securepay.tinkoff.ru/v2/Init', {
-      TerminalKey: TerminalKey,
-      Amount: '350000',
-      OrderId: req.body._id,
-      Recurrent: 'y',
-      PayType: "О",
-      CustomerKey: req.body.phone,
-      Description: 'Оплата в интернет-магазине',
-      Data: {
-        phone: req.body.phone,
-      },
-      // SuccessURL: 'http://tandem.ohmybike.ru/rent/' + OrderId,
-      // FailURL: 'http://tandem.ohmybike.ru/account'
-      // SuccessURL: 'http://localhost:8082/rent/' + OrderId,
-      // FailURL: 'http://localhost:8082/account'
-    }).then(function(response) {
-        const payment = new Payment(response.data);
-        payment.save((err, payment) => {
-          if (err) {
-            res.status(500).send({ message: err });
-            return;
-          }
-
-          payment.save(err => {
-            if (err) {
-              res.status(500).send({ message: err });
-              return;
-            }
-            res.send(response.data);
-          });
-        })
-    }).catch(function(error) {
-      res.send(error);
-    })
-
-  };
-  const setpayment = (req, res) => {
-    // Data for payment
-    const payment = new Payment({
-      OrderId: req.body.OrderId,
-      Success: req.body.Success,
-      Status: req.body.Status,
-      PaymentId: req.body.PaymentId,
-      ErrorCode: req.body.ErrorCode,
-      Message: req.body.Message,
-      Details: req.body.Details
-    });
-    // Wright to db
-    console.log(payment)
+  const update = (req, res) => {
+    const session = await mongoose.startSession();
+    session.startTransaction();
+    try {
+      const { paymentId, walletId } = req.body; // Теперь мы работаем с walletId
 
-    payment.save((err, payment) => {
-      if (err) {
-        res.status(500).send({ message: err });
-        return;
+      const payment = await Payment.findById(paymentId).session(session);
+      
+      if (!payment) {
+        throw new Error('Payment not found');
+      }
+      if (payment.status !== 'pending') {
+        throw new Error('Payment is not in a pending state');
       }
 
-      payment.save(err => {
-        if (err) {
-          res.status(500).send({ message: err });
-          return;
-        }
+      const wallet = await Wallet.findById(walletId).session(session);
 
-        res.send({ message: "Payment was created successfully!" });
-      });
-    })
-  };
-  const getstatus = (req, res) => {
-    console.log(req.body.order)
-    Payment.findOne({    
-      OrderId: req.body.order
-    })
-    .sort({createdAt: -1})
-    .exec((err, payment) => {
-      if (err) {
-        res.status(500).send({ message: err });
-        return;
-      }
-      if (!payment) {
-        return res.status(404).send({ message: "Payment Not found." });
+      if (!wallet) {
+        throw new Error('Wallet not found');
       }
 
-     
-      if (payment.Status === 'CONFIRMED') {
-        console.log(payment.Status)
-        console.log(req.body.order)
-         Order.findOneAndUpdate({ _id: req.body.order, status: 'Подтвержден' }, {$set: {status: "Ожидает отправки"}},{ new: true}).catch(function(error) {
-        res.status(500).send(error);
-      });
+      if (wallet.amount < payment.amount) {
+        throw new Error('Insufficient funds');
       }
 
-      axios.post('https://securepay.tinkoff.ru/v2/GetState', {
-        TerminalKey: TerminalKey,
-        PaymentId: payment.PaymentId,
-        Token: createToken({TerminalKey: TerminalKey, PaymentId: payment.PaymentId})
-      }).then(function(response) {
-        payment.Status = response.data.Status
-        payment.save()
-        res.send(response.data);
-      }).catch(function(error) {
-        res.status(500).send(error);
-      });
-    });
+      // Списание средств с кошелька
+      wallet.amount -= payment.amount;
+      await wallet.save({ session });
+
+      // Обновление статуса платежа
+      payment.status = 'completed';
+      await payment.save({ session });
+
+      await session.commitTransaction();
+      res.send('Payment processed successfully');
+    } catch (error) {
+      await session.abortTransaction();
+      res.status(500).send(error.message);
+    } finally {
+      session.endSession();
+    }
   };
 
-  const addcustomer = (req, res) => {
-    console.log(req.body)
-
-    axios.post('https://securepay.tinkoff.ru/v2/AddCustomer', {
-      TerminalKey: TerminalKey,
-      CustomerKey: req.body,
-      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
-    })
-    .then(function(response) {
-      res.send(response.data);
-    })
-    .catch(function(error) {
-      res.status(500).send(error);
-    });
-  }
-
-  const getcustomercards = (req, res) => {
-    axios.post('https://securepay.tinkoff.ru/v2/GetCardList', {
-      TerminalKey: TerminalKey,
-      CustomerKey: req.body.phone,
-      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
-    })
-    .then(function(response) {
-      console.log(response.data)
-      res.send(response.data);
+  const deletePayment = (req, res) => {
+    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
+      res.status(200).send(payment);
     })
-    .catch(function(error) {
-      res.status(500).send(error);
-    });
-  }
+  };
 
   return {
-    getAll,
     create,
-    get,
+    read,
     update,
     delete: deletePayment,  
-    createToken,
-    newpayment,
-    setpayment,
-    getstatus,
-    addcustomer,
-    getcustomercards
   };
 };
 

package/src/modules/payments/controller/payments.tinkoff.controller.js

@@ -0,0 +1,242 @@
+
+var jwt = require("jsonwebtoken");
+var axios = require('axios');
+var bcrypt = require("bcryptjs");
+var crypto = require('crypto');
+const { v4: uuidv4 } = require('uuid');
+
+var TerminalKey = process.env.TINKOFF_TERMINAL_KEY;
+var TerminalPassword = process.env.TINKOFF_TERMINAL_PASSWORD;
+
+const controllerFactory = (db) => {
+  const Payment = db.payment;
+  const Order = db.order;
+
+  const getAll = (req, res) => {
+    Payment.find({}).sort({'createdAt': 'desc'}).exec((err, paymentes) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!paymentes) {return res.status(404).send({ message: "Paymentes not found." }); }
+      // If succes
+      res.status(200).send(paymentes);
+    });
+  };
+
+  const create = (req, res) => {
+    console.log(req.body)
+    Payment.create({
+      type: req.body.type,
+      order: req.body.order, 
+      positions: req.body.positions
+    }, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when updating product. (with files)" }); }
+      res.status(200).send(payment);
+    })
+  };
+
+  const get = (req, res) => {
+    Payment.findOne({ _id: req.params._id }).exec((err, payment) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      // If succes
+      res.status(200).send(payment);
+    });
+  };
+
+  const update = (req, res) => {
+
+    Payment.findOneAndUpdate({ PaymentId: req.params._id }, req.body, { new: true, upsert: true}).exec((err, payment) => {
+      // If error
+      if (err) {return res.status(500).send({ message: err }); }
+      // If not found
+      if (!payment) {return res.status(404).send({ message: "Payment not found." }); }
+      // If succes
+      res.status(200).send(payment);
+    });
+  };
+
+  const deletePayment = (req, res) => {
+    Payment.findOneAndDelete({_id: req.params._id}, (err, payment) => {
+      if (err) {return res.status(500).send({ message: err }); }
+      if (!payment) {return res.status(404).send({ message: "Something wrong when deleting payment." }); }
+      res.status(200).send(payment);
+    })
+  };
+
+  function createToken (request) {
+    request = Object.entries(request).map(function(key) {
+      return { [key[0]]: key[1] }
+      })
+      request.push({Password: TerminalPassword})
+      request.sort(function(a, b){
+      if(Object.keys(a)[0] < Object.keys(b)[0]) { return -1; }
+      if(Object.keys(a)[0] > Object.keys(b)[0]) { return 1; }
+      return 0;
+        })
+    const requestContacted = request.map(function(key) {
+      return Object.values(key)[0]
+     }).join("")
+
+    const hash = crypto.createHash('sha256').update(requestContacted).digest('hex');
+
+    return hash
+  } 
+  const newpayment = (req, res) => {
+    // Data for payment init
+    console.log(req.body.phone);
+    // Send request to Tinkoff
+    axios.post('https://securepay.tinkoff.ru/v2/Init', {
+      TerminalKey: TerminalKey,
+      Amount: '350000',
+      OrderId: req.body._id,
+      Recurrent: 'y',
+      PayType: "О",
+      CustomerKey: req.body.phone,
+      Description: 'Оплата в интернет-магазине',
+      Data: {
+        phone: req.body.phone,
+      },
+      // SuccessURL: 'http://tandem.ohmybike.ru/rent/' + OrderId,
+      // FailURL: 'http://tandem.ohmybike.ru/account'
+      // SuccessURL: 'http://localhost:8082/rent/' + OrderId,
+      // FailURL: 'http://localhost:8082/account'
+    }).then(function(response) {
+        const payment = new Payment(response.data);
+        payment.save((err, payment) => {
+          if (err) {
+            res.status(500).send({ message: err });
+            return;
+          }
+
+          payment.save(err => {
+            if (err) {
+              res.status(500).send({ message: err });
+              return;
+            }
+            res.send(response.data);
+          });
+        })
+    }).catch(function(error) {
+      res.send(error);
+    })
+
+  };
+  const setpayment = (req, res) => {
+    // Data for payment
+    const payment = new Payment({
+      OrderId: req.body.OrderId,
+      Success: req.body.Success,
+      Status: req.body.Status,
+      PaymentId: req.body.PaymentId,
+      ErrorCode: req.body.ErrorCode,
+      Message: req.body.Message,
+      Details: req.body.Details
+    });
+    // Wright to db
+    console.log(payment)
+
+    payment.save((err, payment) => {
+      if (err) {
+        res.status(500).send({ message: err });
+        return;
+      }
+
+      payment.save(err => {
+        if (err) {
+          res.status(500).send({ message: err });
+          return;
+        }
+
+        res.send({ message: "Payment was created successfully!" });
+      });
+    })
+  };
+  const getstatus = (req, res) => {
+    console.log(req.body.order)
+    Payment.findOne({    
+      OrderId: req.body.order
+    })
+    .sort({createdAt: -1})
+    .exec((err, payment) => {
+      if (err) {
+        res.status(500).send({ message: err });
+        return;
+      }
+      if (!payment) {
+        return res.status(404).send({ message: "Payment Not found." });
+      }
+
+     
+      if (payment.Status === 'CONFIRMED') {
+        console.log(payment.Status)
+        console.log(req.body.order)
+         Order.findOneAndUpdate({ _id: req.body.order, status: 'Подтвержден' }, {$set: {status: "Ожидает отправки"}},{ new: true}).catch(function(error) {
+        res.status(500).send(error);
+      });
+      }
+
+      axios.post('https://securepay.tinkoff.ru/v2/GetState', {
+        TerminalKey: TerminalKey,
+        PaymentId: payment.PaymentId,
+        Token: createToken({TerminalKey: TerminalKey, PaymentId: payment.PaymentId})
+      }).then(function(response) {
+        payment.Status = response.data.Status
+        payment.save()
+        res.send(response.data);
+      }).catch(function(error) {
+        res.status(500).send(error);
+      });
+    });
+  };
+
+  const addcustomer = (req, res) => {
+    console.log(req.body)
+
+    axios.post('https://securepay.tinkoff.ru/v2/AddCustomer', {
+      TerminalKey: TerminalKey,
+      CustomerKey: req.body,
+      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
+    })
+    .then(function(response) {
+      res.send(response.data);
+    })
+    .catch(function(error) {
+      res.status(500).send(error);
+    });
+  }
+
+  const getcustomercards = (req, res) => {
+    axios.post('https://securepay.tinkoff.ru/v2/GetCardList', {
+      TerminalKey: TerminalKey,
+      CustomerKey: req.body.phone,
+      Token: createToken({TerminalKey: TerminalKey, CustomerKey: req.body.phone})
+    })
+    .then(function(response) {
+      console.log(response.data)
+      res.send(response.data);
+    })
+    .catch(function(error) {
+      res.status(500).send(error);
+    });
+  }
+
+  return {
+    getAll,
+    create,
+    get,
+    update,
+    delete: deletePayment,  
+    createToken,
+    newpayment,
+    setpayment,
+    getstatus,
+    addcustomer,
+    getcustomercards
+  };
+};
+
+module.exports = controllerFactory;

package/src/modules/payments/models/payment.model.js

@@ -0,0 +1,22 @@
+module.exports = (db) => {
+  
+  const PaymentSchema = new db.mongoose.Schema({
+    creator: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    },
+    owner: {
+      type: db.mongoose.Schema.Types.ObjectId,
+      ref: 'User', 
+    }
+  }, {
+    timestamps: { 
+      currentTime: () => Date.now() 
+    }
+  });
+
+  const Payment = db.mongoose.model("Payment", PaymentSchema);
+
+  return Payment;
+};
+

package/src/modules/payments/routes/payments.routes.js

@@ -12,42 +12,21 @@ module.exports = function(app, db) {
     next();
   });
 
-  app.post(
-    "/payment/newpayment",
-    controller.newpayment,
-  );
-  app.post(
-    "/payment/getstatus",
-    controller.getstatus
-  );
-  app.post(
-    "/payment/addcustomer",
-    controller.addcustomer
-  );
-  app.post(
-    "/payment/getcustomercards",
-    controller.getcustomercards
-  );
   
-  app.get(
+  app.post(
     "/payments",
-    controller.getAll
+    controller.create
   );
-  
+
   app.get(
     "/payments/:_id",
-    controller.get
+    controller.read
   );
 
    app.post(
     "/payments/:_id",
     controller.update
   );
-
-  app.post(
-    "/payments",
-    controller.create
-  );
   
   app.delete(
     "/payments/:_id",

package/src/modules/payments/routes/payments.tinkoff.routes.js

@@ -0,0 +1,58 @@
+// Factories
+const controllerFactory = require("../controllers/payments.controller");
+// Middlewares
+const middlewareFactory = require('@pf/src/modules/middlewares/server');
+// Routes
+module.exports = function(app, db) {
+  const controller = controllerFactory(db);
+  const { verifySignUp, verifyUser } = middlewareFactory(db);
+
+  app.use(function(req, res, next) {
+    res.header("Access-Control-Allow-Headers", "Access-Control-Allow-Origin: *", "x-access-token, Origin, Content-Type, Accept");
+    next();
+  });
+
+  app.post(
+    "/payment/newpayment",
+    controller.newpayment,
+  );
+  app.post(
+    "/payment/getstatus",
+    controller.getstatus
+  );
+  app.post(
+    "/payment/addcustomer",
+    controller.addcustomer
+  );
+  app.post(
+    "/payment/getcustomercards",
+    controller.getcustomercards
+  );
+  
+  app.get(
+    "/payments",
+    controller.getAll
+  );
+  
+  app.get(
+    "/payments/:_id",
+    controller.get
+  );
+
+   app.post(
+    "/payments/:_id",
+    controller.update
+  );
+
+  app.post(
+    "/payments",
+    controller.create
+  );
+  
+  app.delete(
+    "/payments/:_id",
+    controller.delete
+  );
+
+};
+

package/src/modules/products/components/pages/Product.vue

@@ -1,7 +1,8 @@
 <template>
 	<div class="flex flex-column w-100 o-hidden gap-thin pd-thin">
 		<!-- <Breadcrumbs class="bg-grey radius-big pd-small"/> -->
-		<SectionProduct v-if="product" :product="product" class="pos-relative"/>
+		{{product.quantity}}
+		<SectionProduct v-if="product" :product="product" :user="auth.state.user" class="pos-relative"/>
 
 		<PopularProducts />
 	</div>
@@ -22,6 +23,7 @@
 	import { useI18n }    from 'vue-i18n'
   import { useMeta } from 'vue-meta'
 
+  import * as auth from '@pf/src/modules/auth/store/auth';
  	import * as products from '@pf/src/modules/products/store/products';
   import * as categories from '@pf/src/modules/products/store/categories';
 

package/src/modules/products/components/sections/SectionProduct.vue

@@ -123,6 +123,9 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  user: {
+    type: String,
+  },
   recommendation: {
   	type: String
   }