Skip to content

Pending payments workflow fixes #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grunch merged 1 commit into from
Aug 10, 2021
Merged

Pending payments workflow fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 50 additions & 31 deletions ln/subscribe_invoice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,40 +28,59 @@ const subscribeInvoice = async (ctx, bot, id) => {
if (invoice.is_confirmed) {
const order = await Order.findOne({ hash: invoice.id });
order.status = 'PAID_HOLD_INVOICE';
const payment = await pay({ lnd, request: order.buyer_invoice });
if (payment.is_confirmed) {
order.status = 'SUCCESS';
const orderUser = await User.findOne({ _id: order.creator_id });
if (order.type === 'sell') {
await order.save();
try {
const payment = await pay({ lnd, request: order.buyer_invoice });
if (payment.is_confirmed) {
order.status = 'SUCCESS';
await order.save();
const orderUser = await User.findOne({ _id: order.creator_id });
if (order.type === 'sell') {
const buyerUser = await User.findOne({ _id: order.buyer_id });
await messages.doneTakeSellMessage(bot, orderUser, buyerUser);
buyerUser.trades_completed++;
await buyerUser.save();
} else if (order.type === 'buy') {
const sellerUser = await User.findOne({ _id: order.seller_id });
await messages.doneTakeBuyMessage(bot, orderUser, sellerUser);
sellerUser.trades_completed++;
sellerUser.save();
}
orderUser.trades_completed++;
await orderUser.save();
} else {
// TODO: cronjob que haga estos pagos cada cierto tiempo y con cada intento incremente 'attempts'
// si attemps > 3 el admin se debe comunicar directamente con el usuario para hacer el pago manualmente
const buyerUser = await User.findOne({ _id: order.buyer_id });
await messages.doneTakeSellMessage(bot, orderUser, buyerUser);
buyerUser.trades_completed++;
await buyerUser.save();
} else if (order.type === 'buy') {
const sellerUser = await User.findOne({ _id: order.seller_id });
await messages.doneTakeBuyMessage(bot, orderUser, sellerUser);
sellerUser.trades_completed++;
sellerUser.save();
const message = 'No he podido pagar tu invoice, en unos minutos intentaré pagarla nuevamente, asegúrate que tu nodo/wallet esté online';
await messages.customMessage(bot, buyerUser, message);
const pp = new PendingPayment({
amount: order.amount,
payment_request: order.buyer_invoice,
user_id: buyerUser._id,
description: order.description,
hash: order.hash,
order_id: order._id,
});
await pp.save();
}
orderUser.trades_completed++;
await orderUser.save();
} else {
// TODO: cronjob que haga estos pagos cada cierto tiempo y con cada intento incremente 'attempts'
// si attemps > 3 el admin se debe comunicar directamente con el usuario para hacer el pago manualmente
const buyerUser = await User.findOne({ _id: order.buyer_id });
const message = 'No he podido pagar tu invoice, en unos minutos intentaré pagarla nuevamente, asegúrate que tu nodo/wallet esté online';
await messages.customMessage(bot, buyerUser, message);
const pp = new PendingPayment({
amount: order.amount,
payment_request: order.buyer_invoice,
user_id: buyerUser._id,
description: order.description,
hash: order.hash,
order_id: order._id,
});
await pp.save();
} catch (error) {
if (order.status === 'PAID_HOLD_INVOICE') {
const buyerUser = await User.findOne({ _id: order.buyer_id });
const message = 'El vendedor ha liberado los satoshis pero no he podido pagar tu invoice, en unos minutos intentaré pagarla nuevamente, asegúrate que tu nodo/wallet esté online';
await messages.customMessage(bot, buyerUser, message);
const pp = new PendingPayment({
amount: order.amount,
payment_request: order.buyer_invoice,
user_id: buyerUser._id,
description: order.description,
hash: order.hash,
order_id: order._id,
});
await pp.save();
}
console.log(error)
}
await order.save();
}
});
} catch (e) {
Expand Down
2 changes: 1 addition & 1 deletion models/order.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const OrderSchema = new mongoose.Schema({
canceled_by: { type: String },
status: {
type: String,
enum: ['WAITING_PAYMENT', 'PENDING', 'ACTIVE', 'CLOSED', 'DISPUTE', 'CANCELED', 'SUCCESS', 'PAID_HODL_INVOICE'],
enum: ['WAITING_PAYMENT', 'PENDING', 'ACTIVE', 'CLOSED', 'DISPUTE', 'CANCELED', 'SUCCESS', 'PAID_HOLD_INVOICE'],
default: 'WAITING_PAYMENT',
},
type: { type: String },
Expand Down
2 changes: 1 addition & 1 deletion models/pending_payment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const PendingPaymentSchema = new mongoose.Schema({
message : '{VALUE} is not an integer value'
}
},
attempts: { type: Number, min: 1, default: 0 },
attempts: { type: Number, min: 0, default: 0 },
paid: { type: Boolean, default: false },
payment_request: { type: String },
hash: { type: String },
Expand Down