@winible/winible-typed 1.0.5 → 1.0.7
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/dist/migrations/20221122051433-default-plan.js +13 -0
- package/dist/migrations/20221122051433-default-plan.js.map +1 -0
- package/dist/migrations/20221128034620-invoice-id.js +12 -0
- package/dist/migrations/20221128034620-invoice-id.js.map +1 -0
- package/dist/scripts/mapCurrentPaymentsToInvoiceId.js +91 -0
- package/dist/scripts/mapCurrentPaymentsToInvoiceId.js.map +1 -0
- package/dist/scripts/payoutRecurlySubs.js +20 -2
- package/dist/scripts/payoutRecurlySubs.js.map +1 -1
- package/dist/scripts/payoutSubscriptions.js +23 -15
- package/dist/scripts/payoutSubscriptions.js.map +1 -1
- package/dist/typed-model/credit-payment.js +10 -6
- package/dist/typed-model/credit-payment.js.map +1 -1
- package/dist/typed-model/subscription-plan.js +5 -0
- package/dist/typed-model/subscription-plan.js.map +1 -1
- package/package.json +1 -1
- package/typed-model/credit-payment.ts +14 -9
- package/typed-model/subscription-plan.ts +6 -0
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const sequelize_1 = require("sequelize");
|
|
4
|
+
exports.default = {
|
|
5
|
+
async up(queryInterface, sequelize) {
|
|
6
|
+
queryInterface.addColumn("subscription_plans", "order", {
|
|
7
|
+
type: sequelize_1.DataTypes.INTEGER,
|
|
8
|
+
defaultValue: 0,
|
|
9
|
+
});
|
|
10
|
+
},
|
|
11
|
+
async down(queryInterface, sequelize) { },
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=20221122051433-default-plan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20221122051433-default-plan.js","sourceRoot":"","sources":["../../migrations/20221122051433-default-plan.ts"],"names":[],"mappings":";;AAAA,yCAAqE;AAErE,kBAAe;IACb,KAAK,CAAC,EAAE,CAAC,cAA8B,EAAE,SAAoB;QAC3D,cAAc,CAAC,SAAS,CAAC,oBAAoB,EAAE,OAAO,EAAE;YACtD,IAAI,EAAE,qBAAS,CAAC,OAAO;YACvB,YAAY,EAAE,CAAC;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,cAA8B,EAAE,SAAoB,IAAG,CAAC;CACpE,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const sequelize_1 = require("sequelize");
|
|
4
|
+
exports.default = {
|
|
5
|
+
async up(queryInterface, sequelize) {
|
|
6
|
+
queryInterface.addColumn("credit_payments", "invoice_id", {
|
|
7
|
+
type: sequelize_1.DataTypes.STRING,
|
|
8
|
+
});
|
|
9
|
+
},
|
|
10
|
+
async down(queryInterface, sequelize) { },
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=20221128034620-invoice-id.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20221128034620-invoice-id.js","sourceRoot":"","sources":["../../migrations/20221128034620-invoice-id.ts"],"names":[],"mappings":";;AAAA,yCAAqE;AAErE,kBAAe;IACb,KAAK,CAAC,EAAE,CAAC,cAA8B,EAAE,SAAoB;QAC3D,cAAc,CAAC,SAAS,CAAC,iBAAiB,EAAE,YAAY,EAAE;YACxD,IAAI,EAAE,qBAAS,CAAC,MAAM;SACvB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,cAA8B,EAAE,SAAoB,IAAG,CAAC;CACpE,CAAC"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
+
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
+
var m = o[Symbol.asyncIterator], i;
|
|
5
|
+
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
+
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
+
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
+
};
|
|
9
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
11
|
+
};
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
const dotenv = require("dotenv");
|
|
14
|
+
dotenv.config();
|
|
15
|
+
const sequelize_1 = require("sequelize");
|
|
16
|
+
const src_1 = require("../src");
|
|
17
|
+
const moment_1 = __importDefault(require("moment"));
|
|
18
|
+
const typed_model_1 = require("../typed-model");
|
|
19
|
+
const run = async () => {
|
|
20
|
+
const subscriptions = await typed_model_1.Subscription.findAll({
|
|
21
|
+
where: (0, sequelize_1.literal)("recurly_subscription_id IS NOT NULL"),
|
|
22
|
+
});
|
|
23
|
+
const creditPayments = await typed_model_1.CreditPayments.findAll({
|
|
24
|
+
where: {
|
|
25
|
+
id: {
|
|
26
|
+
[sequelize_1.Op.gt]: "1117488463210369567",
|
|
27
|
+
},
|
|
28
|
+
interactionType: "subscription",
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
for (let sub of subscriptions) {
|
|
32
|
+
await mapSubscription(sub, creditPayments);
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
const mapSubscription = async (sub, creditPayments) => {
|
|
36
|
+
var e_1, _a;
|
|
37
|
+
let subPayments = creditPayments
|
|
38
|
+
.filter((c) => {
|
|
39
|
+
return JSON.parse(c.metadata).subscription_id == sub.id;
|
|
40
|
+
})
|
|
41
|
+
.sort((c1, c2) => {
|
|
42
|
+
if ((0, moment_1.default)(c1.createdAt).isAfter((0, moment_1.default)(c2.createdAt))) {
|
|
43
|
+
return -1;
|
|
44
|
+
}
|
|
45
|
+
return 1;
|
|
46
|
+
});
|
|
47
|
+
let response = await src_1.recurlyInstance.listSubscriptionInvoices(sub.recurlySubscriptionId, {
|
|
48
|
+
params: { sort: "created_at", order: "desc", type: "charge" },
|
|
49
|
+
});
|
|
50
|
+
let invoices = [];
|
|
51
|
+
try {
|
|
52
|
+
for (var _b = __asyncValues(response.each()), _c; _c = await _b.next(), !_c.done;) {
|
|
53
|
+
const invoice = _c.value;
|
|
54
|
+
invoices.push(invoice);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
58
|
+
finally {
|
|
59
|
+
try {
|
|
60
|
+
if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
|
|
61
|
+
}
|
|
62
|
+
finally { if (e_1) throw e_1.error; }
|
|
63
|
+
}
|
|
64
|
+
let paidInvoices = invoices.filter((i) => i.paid > 0);
|
|
65
|
+
console.log(sub.id);
|
|
66
|
+
console.log(subPayments.map((i) => i.createdAt));
|
|
67
|
+
console.log(paidInvoices.map((i) => i.createdAt));
|
|
68
|
+
for (let i = 0; i < subPayments.length; i++) {
|
|
69
|
+
let cp = subPayments[i];
|
|
70
|
+
let invoice = paidInvoices[i];
|
|
71
|
+
if (cp.creditAmountInCents / 100.0 != invoice.total) {
|
|
72
|
+
console.log(`Amounts did not match: ${cp.creditAmountInCents / 100.0} <> ${invoice.total}`);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (cp.invoiceId) {
|
|
76
|
+
console.log(`Already has invoice id`);
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
cp.invoiceId = invoice.id;
|
|
80
|
+
await cp.save();
|
|
81
|
+
console.log("Update invoice id");
|
|
82
|
+
}
|
|
83
|
+
};
|
|
84
|
+
if (require.main === module) {
|
|
85
|
+
if (require.main === module) {
|
|
86
|
+
run().then(async () => {
|
|
87
|
+
console.log("Finished");
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=mapCurrentPaymentsToInvoiceId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mapCurrentPaymentsToInvoiceId.js","sourceRoot":"","sources":["../../scripts/mapCurrentPaymentsToInvoiceId.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,13 @@ class ActiveSub {
|
|
|
22
22
|
if (!this._recurlySub.autoRenew) {
|
|
23
23
|
return true;
|
|
24
24
|
}
|
|
25
|
-
return ["canceled", "expired", "failed", "paused"].includes(this.
|
|
25
|
+
return ["canceled", "expired", "failed", "paused"].includes(this.getRecurlyStatus());
|
|
26
|
+
}
|
|
27
|
+
getRecurlyStatus() {
|
|
28
|
+
return this._recurlySub.state;
|
|
29
|
+
}
|
|
30
|
+
getWinibleStatus() {
|
|
31
|
+
return this._subscription.status;
|
|
26
32
|
}
|
|
27
33
|
async cancelRecurlySubscription() {
|
|
28
34
|
console.log("cancelRecurlySubscription");
|
|
@@ -37,7 +43,14 @@ class ActiveSub {
|
|
|
37
43
|
}
|
|
38
44
|
async chargeLatestPayment() {
|
|
39
45
|
console.log("Charge latest payment");
|
|
40
|
-
|
|
46
|
+
if (this._latestRecurlyPayment &&
|
|
47
|
+
(this._latestRecurlyPayment.paid == 0 ||
|
|
48
|
+
["past_due", "failed"].includes(this._latestRecurlyPayment.state || ""))) {
|
|
49
|
+
console.log("This payment has failed");
|
|
50
|
+
console.log(JSON.stringify(this._latestRecurlyPayment));
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
await typed_model_1.CreditPayments.logSubscriptionPayment(this._subscription.userId, this._owner, this._latestRecurlyPayment.total * 100, this._subscription, undefined, this._latestRecurlyPayment.id);
|
|
41
54
|
this._subscription.numberOfPayments =
|
|
42
55
|
(this._subscription.numberOfPayments || 0) + 1;
|
|
43
56
|
this._subscription.lastPaymentDate = this._latestRecurlyPayment.createdAt;
|
|
@@ -95,6 +108,11 @@ const run = async () => {
|
|
|
95
108
|
});
|
|
96
109
|
if (!activeSub)
|
|
97
110
|
continue;
|
|
111
|
+
if (activeSub.getWinibleStatus() != activeSub.getRecurlyStatus()) {
|
|
112
|
+
console.log("Updating winible status" + sub.numberOfPayments);
|
|
113
|
+
sub.status = activeSub.getRecurlyStatus();
|
|
114
|
+
await sub.save();
|
|
115
|
+
}
|
|
98
116
|
if (activeSub.getNumberOfRecurlyPayments() == sub.numberOfPayments) {
|
|
99
117
|
console.log("activeSub.getNumberOfRecurlyPayments(): " +
|
|
100
118
|
activeSub.getNumberOfRecurlyPayments());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payoutRecurlySubs.js","sourceRoot":"","sources":["../../scripts/payoutRecurlySubs.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAElC,gDAKwB;AAExB,yCAAsC;AAEtC,iCAAkC;AAClC,gCAAyC;AAGzC,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,SAAS;IAQb,YACE,YAA0B,EAC1B,gBAAkC,EAClC,KAAiB,EACjB,kBAA0B,EAC1B,oBAA6B,EAC7B,mBAAiC;QAEjC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;QAClC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;QAC9C,IAAI,CAAC,qBAAqB,GAAG,oBAAoB,CAAC;QAClD,IAAI,CAAC,WAAW,GAAG,mBAAmB,CAAC;IACzC,CAAC;IAED,mBAAmB;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;IACzC,CAAC;IAED,mBAAmB;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CACzD,IAAI,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"payoutRecurlySubs.js","sourceRoot":"","sources":["../../scripts/payoutRecurlySubs.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ const typed_model_1 = require("../typed-model");
|
|
|
5
5
|
const pk_client_1 = require("../src/pk-client");
|
|
6
6
|
const sequelize_1 = require("sequelize");
|
|
7
7
|
const moment = require("moment");
|
|
8
|
+
const customer_profile_1 = require("../typed-model/customer-profile");
|
|
8
9
|
dotenv.config();
|
|
9
10
|
class ActiveSub {
|
|
10
11
|
constructor(subscription, subscriptionPlan, owner, pkSubscription, status, processorId) {
|
|
@@ -55,12 +56,19 @@ class ActiveSub {
|
|
|
55
56
|
console.log("createCreditPayment");
|
|
56
57
|
let transaction = await typed_model_1.pbSequelize.transaction();
|
|
57
58
|
let trans = this.getLatestPayment();
|
|
58
|
-
let cp = await
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
// let cp = await CreditPayments.logSubscriptionPayment(
|
|
60
|
+
// this._subscription.userId,
|
|
61
|
+
// this._owner,
|
|
62
|
+
// Math.round(amountInCents),
|
|
63
|
+
// this._subscription,
|
|
64
|
+
// transaction,
|
|
65
|
+
// trans && trans.getTransId()
|
|
66
|
+
// );
|
|
67
|
+
// if (cp) {
|
|
68
|
+
this._subscription.lastPaymentDate = new Date();
|
|
69
|
+
this._subscription.numberOfPayments = this.getNumberOfAuthorizePayments();
|
|
70
|
+
await this._subscription.save({ transaction });
|
|
71
|
+
// }
|
|
64
72
|
await transaction.commit();
|
|
65
73
|
}
|
|
66
74
|
getNumberOfAuthorizePayments() {
|
|
@@ -100,15 +108,15 @@ class ActiveSub {
|
|
|
100
108
|
if (!subscription.pkSubscriptionId) {
|
|
101
109
|
throw new Error("No pkSubscriptionId for this subscription");
|
|
102
110
|
}
|
|
103
|
-
const profile = await
|
|
104
|
-
|
|
105
|
-
});
|
|
106
|
-
if (!profile) {
|
|
107
|
-
|
|
108
|
-
}
|
|
109
|
-
const status = await (0, pk_client_1.getSubscriptionStatus)(subscription.pkSubscriptionId,
|
|
110
|
-
const pkSub = await (0, pk_client_1.getSubscription)(subscription.pkSubscriptionId,
|
|
111
|
-
return new ActiveSub(subscription, subscriptionPlan, owner, pkSub, status,
|
|
111
|
+
// const profile = await CustomerProfile.findOne({
|
|
112
|
+
// where: { userId: subscription.userId },
|
|
113
|
+
// });
|
|
114
|
+
// if (!profile) {
|
|
115
|
+
// throw new Error("No customer profile for this user");
|
|
116
|
+
// }
|
|
117
|
+
const status = await (0, pk_client_1.getSubscriptionStatus)(subscription.pkSubscriptionId, customer_profile_1.ProcessorId.KAJA);
|
|
118
|
+
const pkSub = await (0, pk_client_1.getSubscription)(subscription.pkSubscriptionId, customer_profile_1.ProcessorId.KAJA);
|
|
119
|
+
return new ActiveSub(subscription, subscriptionPlan, owner, pkSub, status, customer_profile_1.ProcessorId.KAJA);
|
|
112
120
|
}
|
|
113
121
|
}
|
|
114
122
|
const run = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payoutSubscriptions.js","sourceRoot":"","sources":["../../scripts/payoutSubscriptions.ts"],"names":[],"mappings":";;AAAA,iCAAkC;AAElC,gDAQwB;AAExB,gDAI0B;AAE1B,yCAA0C;AAE1C,iCAAkC;
|
|
1
|
+
{"version":3,"file":"payoutSubscriptions.js","sourceRoot":"","sources":["../../scripts/payoutSubscriptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,6 +72,10 @@ CreditPayments.init({
|
|
|
72
72
|
type: sequelize_1.DataTypes.BIGINT,
|
|
73
73
|
field: "trans_id",
|
|
74
74
|
},
|
|
75
|
+
invoiceId: {
|
|
76
|
+
type: sequelize_1.DataTypes.STRING,
|
|
77
|
+
field: "invoice_id",
|
|
78
|
+
},
|
|
75
79
|
createdAt: sequelize_1.DataTypes.DATE,
|
|
76
80
|
updatedAt: sequelize_1.DataTypes.DATE,
|
|
77
81
|
}, {
|
|
@@ -92,7 +96,7 @@ CreditPayments.getById = async (id) => {
|
|
|
92
96
|
},
|
|
93
97
|
});
|
|
94
98
|
};
|
|
95
|
-
CreditPayments.logContentPurchase = async (user, contentId, owner, alreadyPaid, transaction,
|
|
99
|
+
CreditPayments.logContentPurchase = async (user, contentId, owner, alreadyPaid, transaction, invoiceId) => {
|
|
96
100
|
const content = await premium_content_1.default.getById(contentId);
|
|
97
101
|
if (!content) {
|
|
98
102
|
throw new Error("No such content for id: " + contentId);
|
|
@@ -118,7 +122,7 @@ CreditPayments.logContentPurchase = async (user, contentId, owner, alreadyPaid,
|
|
|
118
122
|
earningAmountInCents: earningsAmount(content.amountInCents, owner && owner.serviceFeePercentage),
|
|
119
123
|
interactionType: INTERACTION_TYPES.CONTENT,
|
|
120
124
|
metadata: JSON.stringify({ contentId }),
|
|
121
|
-
|
|
125
|
+
invoiceId,
|
|
122
126
|
}, { transaction });
|
|
123
127
|
try {
|
|
124
128
|
await notification_1.default.create({
|
|
@@ -243,7 +247,7 @@ CreditPayments.logVideoCall = async (user, owner, callAmountInCents) => {
|
|
|
243
247
|
}
|
|
244
248
|
return creditPayment;
|
|
245
249
|
};
|
|
246
|
-
CreditPayments.logUnlockMessage = async (user, owner, message, alreadyPaid, transaction,
|
|
250
|
+
CreditPayments.logUnlockMessage = async (user, owner, message, alreadyPaid, transaction, invoiceId) => {
|
|
247
251
|
if (message.amountInCents > user.creditsInCents && !alreadyPaid) {
|
|
248
252
|
throw new Error(`Sorry, it looks like you've run out of credits`);
|
|
249
253
|
}
|
|
@@ -262,7 +266,7 @@ CreditPayments.logUnlockMessage = async (user, owner, message, alreadyPaid, tran
|
|
|
262
266
|
ownerId: owner.id,
|
|
263
267
|
creditAmountInCents: message.amountInCents,
|
|
264
268
|
earningAmountInCents: earningsAmount(message.amountInCents, owner.serviceFeePercentage),
|
|
265
|
-
|
|
269
|
+
invoiceId,
|
|
266
270
|
interactionType: INTERACTION_TYPES.UNLOCK_MESSAGE,
|
|
267
271
|
}, { transaction });
|
|
268
272
|
try {
|
|
@@ -307,7 +311,7 @@ CreditPayments.logUnlockedContent = async (user, owner, lockedContent) => {
|
|
|
307
311
|
}
|
|
308
312
|
return creditPayment;
|
|
309
313
|
};
|
|
310
|
-
CreditPayments.logSubscriptionPayment = async (userId, owner, subscriptionAmountInCents, subscription, transaction,
|
|
314
|
+
CreditPayments.logSubscriptionPayment = async (userId, owner, subscriptionAmountInCents, subscription, transaction, invoiceId) => {
|
|
311
315
|
let creditPayment = await CreditPayments.create({
|
|
312
316
|
userId: userId,
|
|
313
317
|
ownerId: owner.id,
|
|
@@ -315,7 +319,7 @@ CreditPayments.logSubscriptionPayment = async (userId, owner, subscriptionAmount
|
|
|
315
319
|
earningAmountInCents: earningsAmount(subscriptionAmountInCents, owner.serviceFeePercentage),
|
|
316
320
|
interactionType: INTERACTION_TYPES.SUBSCRIPTION,
|
|
317
321
|
metadata: JSON.stringify({ subscription_id: subscription.id }),
|
|
318
|
-
|
|
322
|
+
invoiceId,
|
|
319
323
|
}, { transaction });
|
|
320
324
|
try {
|
|
321
325
|
if (owner.referringOwnerId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credit-payment.js","sourceRoot":"","sources":["../../typed-model/credit-payment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"credit-payment.js","sourceRoot":"","sources":["../../typed-model/credit-payment.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,6 +71,11 @@ SubscriptionPlan.init({
|
|
|
71
71
|
type: sequelize_1.DataTypes.STRING,
|
|
72
72
|
field: "recurly_plan_id",
|
|
73
73
|
},
|
|
74
|
+
order: {
|
|
75
|
+
type: sequelize_1.DataTypes.INTEGER,
|
|
76
|
+
field: "order",
|
|
77
|
+
defaultValue: 0,
|
|
78
|
+
},
|
|
74
79
|
createdAt: sequelize_1.DataTypes.DATE,
|
|
75
80
|
updatedAt: sequelize_1.DataTypes.DATE,
|
|
76
81
|
}, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscription-plan.js","sourceRoot":"","sources":["../../typed-model/subscription-plan.ts"],"names":[],"mappings":";;;;;AAAA,yCASmB;AAEnB,kEAAuC;AACvC,gEAAuC;AACvC,kEAA0C;AAC1C,sFAA6D;AAE7D,mEAAmE;AACnE,MAAM,gBAAiB,SAAQ,iBAG9B;
|
|
1
|
+
{"version":3,"file":"subscription-plan.js","sourceRoot":"","sources":["../../typed-model/subscription-plan.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -59,6 +59,7 @@ class CreditPayments extends Model<
|
|
|
59
59
|
declare payoutId?: string;
|
|
60
60
|
declare referredCreditPaymentId?: string;
|
|
61
61
|
declare transId?: number;
|
|
62
|
+
declare invoiceId?: string;
|
|
62
63
|
declare createdAt: CreationOptional<Date>;
|
|
63
64
|
declare updatedAt: CreationOptional<Date>;
|
|
64
65
|
static getById: (id: string) => Promise<CreditPayments | null>;
|
|
@@ -68,7 +69,7 @@ class CreditPayments extends Model<
|
|
|
68
69
|
owner: PhoneOwner,
|
|
69
70
|
alreadyPaid?: boolean,
|
|
70
71
|
transaction?: Transaction,
|
|
71
|
-
|
|
72
|
+
invoiceId?: string
|
|
72
73
|
) => Promise<CreditPayments>;
|
|
73
74
|
static logMessage: (
|
|
74
75
|
user: PhoneUser,
|
|
@@ -96,7 +97,7 @@ class CreditPayments extends Model<
|
|
|
96
97
|
message: Message,
|
|
97
98
|
alreadyPaid?: boolean,
|
|
98
99
|
transaction?: Transaction,
|
|
99
|
-
|
|
100
|
+
invoiceId?: string
|
|
100
101
|
) => Promise<CreditPayments>;
|
|
101
102
|
static logSubscriptionPayment: (
|
|
102
103
|
userId: string,
|
|
@@ -104,7 +105,7 @@ class CreditPayments extends Model<
|
|
|
104
105
|
subscriptionAmountInCents: number,
|
|
105
106
|
subscription: Subscription,
|
|
106
107
|
transaction: Transaction | undefined,
|
|
107
|
-
|
|
108
|
+
invoiceId?: string
|
|
108
109
|
) => Promise<CreditPayments>;
|
|
109
110
|
static logUnlockedContent: (
|
|
110
111
|
user: PhoneUser,
|
|
@@ -162,6 +163,10 @@ CreditPayments.init(
|
|
|
162
163
|
type: DataTypes.BIGINT,
|
|
163
164
|
field: "trans_id",
|
|
164
165
|
},
|
|
166
|
+
invoiceId: {
|
|
167
|
+
type: DataTypes.STRING,
|
|
168
|
+
field: "invoice_id",
|
|
169
|
+
},
|
|
165
170
|
createdAt: DataTypes.DATE,
|
|
166
171
|
updatedAt: DataTypes.DATE,
|
|
167
172
|
},
|
|
@@ -194,7 +199,7 @@ CreditPayments.logContentPurchase = async (
|
|
|
194
199
|
owner: PhoneOwner,
|
|
195
200
|
alreadyPaid?: boolean,
|
|
196
201
|
transaction?: Transaction,
|
|
197
|
-
|
|
202
|
+
invoiceId?: string
|
|
198
203
|
) => {
|
|
199
204
|
const content = await PremiumContent.getById(contentId);
|
|
200
205
|
|
|
@@ -234,7 +239,7 @@ CreditPayments.logContentPurchase = async (
|
|
|
234
239
|
),
|
|
235
240
|
interactionType: INTERACTION_TYPES.CONTENT,
|
|
236
241
|
metadata: JSON.stringify({ contentId }),
|
|
237
|
-
|
|
242
|
+
invoiceId,
|
|
238
243
|
},
|
|
239
244
|
{ transaction }
|
|
240
245
|
);
|
|
@@ -439,7 +444,7 @@ CreditPayments.logUnlockMessage = async (
|
|
|
439
444
|
message: Message,
|
|
440
445
|
alreadyPaid?: boolean,
|
|
441
446
|
transaction?: Transaction,
|
|
442
|
-
|
|
447
|
+
invoiceId?: string
|
|
443
448
|
) => {
|
|
444
449
|
if (message.amountInCents! > user.creditsInCents! && !alreadyPaid) {
|
|
445
450
|
throw new Error(`Sorry, it looks like you've run out of credits`);
|
|
@@ -467,7 +472,7 @@ CreditPayments.logUnlockMessage = async (
|
|
|
467
472
|
message.amountInCents!,
|
|
468
473
|
owner.serviceFeePercentage
|
|
469
474
|
),
|
|
470
|
-
|
|
475
|
+
invoiceId,
|
|
471
476
|
interactionType: INTERACTION_TYPES.UNLOCK_MESSAGE,
|
|
472
477
|
},
|
|
473
478
|
{ transaction }
|
|
@@ -555,7 +560,7 @@ CreditPayments.logSubscriptionPayment = async (
|
|
|
555
560
|
subscriptionAmountInCents: number,
|
|
556
561
|
subscription: Subscription,
|
|
557
562
|
transaction: Transaction | undefined,
|
|
558
|
-
|
|
563
|
+
invoiceId?: string
|
|
559
564
|
) => {
|
|
560
565
|
let creditPayment = await CreditPayments.create(
|
|
561
566
|
{
|
|
@@ -568,7 +573,7 @@ CreditPayments.logSubscriptionPayment = async (
|
|
|
568
573
|
),
|
|
569
574
|
interactionType: INTERACTION_TYPES.SUBSCRIPTION,
|
|
570
575
|
metadata: JSON.stringify({ subscription_id: subscription.id }),
|
|
571
|
-
|
|
576
|
+
invoiceId,
|
|
572
577
|
},
|
|
573
578
|
{ transaction }
|
|
574
579
|
);
|
|
@@ -34,6 +34,7 @@ class SubscriptionPlan extends Model<
|
|
|
34
34
|
declare oneTimePurchase?: boolean;
|
|
35
35
|
declare accessEndDate?: Date;
|
|
36
36
|
declare recurlyPlanId?: string;
|
|
37
|
+
declare order?: number;
|
|
37
38
|
declare createdAt: CreationOptional<Date>;
|
|
38
39
|
declare updatedAt: CreationOptional<Date>;
|
|
39
40
|
static getById: (id: string) => Promise<SubscriptionPlan | null>;
|
|
@@ -108,6 +109,11 @@ SubscriptionPlan.init(
|
|
|
108
109
|
type: DataTypes.STRING,
|
|
109
110
|
field: "recurly_plan_id",
|
|
110
111
|
},
|
|
112
|
+
order: {
|
|
113
|
+
type: DataTypes.INTEGER,
|
|
114
|
+
field: "order",
|
|
115
|
+
defaultValue: 0,
|
|
116
|
+
},
|
|
111
117
|
createdAt: DataTypes.DATE,
|
|
112
118
|
updatedAt: DataTypes.DATE,
|
|
113
119
|
},
|