Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

Updated members-api to allow passing options to models

Browse source 
no-issue

This allows us to do multiple operations within a db transaction, which
will be used for the importer to ensure atomic inserts
This commit is contained in:
Fabien O'Carroll 2020-10-27 10:29:08 +00:00 • committed by Fabien 'egg' O'Carroll
parent bd1173ef9f
commit 05d5310343
3 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ghost/members-api/index.js
View file

@ -87,8 +87,8 @@ module.exports = function MembersApi({
async get(member) { async get(member) {
return metadata.getMetadata('stripe', member); return metadata.getMetadata('stripe', member);
}, },
async set(data) { async set(data, options) {
return metadata.setMetadata('stripe', data); return metadata.setMetadata('stripe', data, options);
} }
}; };
/** @type {StripePaymentProcessor} */ /** @type {StripePaymentProcessor} */

9
ghost/members-api/lib/metadata.js
View file

@ -4,7 +4,7 @@ module.exports = function ({
StripeCustomer, StripeCustomer,
StripeCustomerSubscription StripeCustomerSubscription
}) { }) {
async function setMetadata(module, metadata) { async function setMetadata(module, metadata, options = {}) {
if (module !== 'stripe') { if (module !== 'stripe') {
return; return;
} }
@ -12,10 +12,11 @@ module.exports = function ({
if (metadata.customer) { if (metadata.customer) {
const member = await Member.findOne({ const member = await Member.findOne({
id: metadata.customer.member_id id: metadata.customer.member_id
}); }, options);
if (member) { if (member) {
await StripeCustomer.upsert(metadata.customer, { await StripeCustomer.upsert(metadata.customer, {
...options,
customer_id: metadata.customer.customer_id customer_id: metadata.customer.customer_id
}); });
} }
@ -24,9 +25,10 @@ module.exports = function ({
if (metadata.subscription) { if (metadata.subscription) {
const customer = await StripeCustomer.findOne({ const customer = await StripeCustomer.findOne({
customer_id: metadata.subscription.customer_id customer_id: metadata.subscription.customer_id
}); }, options);
if (customer) { if (customer) {
await StripeCustomerSubscription.upsert(metadata.subscription, { await StripeCustomerSubscription.upsert(metadata.subscription, {
...options,
subscription_id: metadata.subscription.subscription_id subscription_id: metadata.subscription.subscription_id
}); });
} }
@ -34,6 +36,7 @@ module.exports = function ({
if (metadata.webhook) { if (metadata.webhook) {
await StripeWebhook.upsert(metadata.webhook, { await StripeWebhook.upsert(metadata.webhook, {
...options,
webhook_id: metadata.webhook.webhook_id webhook_id: metadata.webhook.webhook_id
}); });
} }

36
ghost/members-api/lib/stripe/index.js
View file

@ -192,16 +192,16 @@ module.exports = class StripePaymentProcessor {
}; };
} }
async linkStripeCustomer(id, member) { async linkStripeCustomer(id, member, options) {
const customer = await retrieve(this._stripe, 'customers', id); const customer = await retrieve(this._stripe, 'customers', id);
await this._updateCustomer(member, customer); await this._updateCustomer(member, customer, options);
debug(`Linking customer:${id} subscriptions`, JSON.stringify(customer.subscriptions)); debug(`Linking customer:${id} subscriptions`, JSON.stringify(customer.subscriptions));
if (customer.subscriptions && customer.subscriptions.data) { if (customer.subscriptions && customer.subscriptions.data) {
for (const subscription of customer.subscriptions.data) { for (const subscription of customer.subscriptions.data) {
await this._updateSubscription(subscription); await this._updateSubscription(subscription, options);
} }
} }
@ -292,8 +292,8 @@ module.exports = class StripePaymentProcessor {
}); });
} }
async setComplimentarySubscription(member) { async setComplimentarySubscription(member, options) {
const subscriptions = await this.getActiveSubscriptions(member); const subscriptions = await this.getActiveSubscriptions(member, options);
// NOTE: Because we allow for multiple Complimentary plans, need to take into account currently availalbe // NOTE: Because we allow for multiple Complimentary plans, need to take into account currently availalbe
// plan currencies so that we don't end up giving a member complimentary subscription in wrong currency. // plan currencies so that we don't end up giving a member complimentary subscription in wrong currency.
@ -308,7 +308,11 @@ module.exports = class StripePaymentProcessor {
const complimentaryFilter = plan => (plan.nickname === 'Complimentary' && plan.currency === complimentaryCurrency); const complimentaryFilter = plan => (plan.nickname === 'Complimentary' && plan.currency === complimentaryCurrency);
const complimentaryPlan = this._plans.find(complimentaryFilter); const complimentaryPlan = this._plans.find(complimentaryFilter);
const customer = await this._customerForMemberCheckoutSession(member); if (!complimentaryPlan) {
throw new Error('Could not find Complimentary plan');
}
const customer = await this._customerForMemberCheckoutSession(member, options);
if (!subscriptions.length) { if (!subscriptions.length) {
const subscription = await create(this._stripe, 'subscriptions', { const subscription = await create(this._stripe, 'subscriptions', {
@ -318,7 +322,7 @@ module.exports = class StripePaymentProcessor {
}] }]
}); });
await this._updateSubscription(subscription); await this._updateSubscription(subscription, options);
} else { } else {
// NOTE: we should only ever have 1 active subscription, but just in case there is more update is done on all of them // NOTE: we should only ever have 1 active subscription, but just in case there is more update is done on all of them
for (const subscription of subscriptions) { for (const subscription of subscriptions) {
@ -327,7 +331,7 @@ module.exports = class StripePaymentProcessor {
plan: complimentaryPlan.id plan: complimentaryPlan.id
}); });
await this._updateSubscription(updatedSubscription); await this._updateSubscription(updatedSubscription, options);
} }
} }
} }
@ -425,7 +429,7 @@ module.exports = class StripePaymentProcessor {
return null; return null;
} }
async _updateCustomer(member, customer) { async _updateCustomer(member, customer, options = {}) {
debug(`Attaching customer to member ${member.get('email')} ${customer.id}`); debug(`Attaching customer to member ${member.get('email')} ${customer.id}`);
await this.storage.set({ await this.storage.set({
customer: { customer: {
@ -434,17 +438,17 @@ module.exports = class StripePaymentProcessor {
name: customer.name, name: customer.name,
email: customer.email email: customer.email
} }
}); }, options);
} }
async _updateSubscription(subscription) { async _updateSubscription(subscription, options) {
const payment = subscription.default_payment_method; const payment = subscription.default_payment_method;
if (typeof payment === 'string') { if (typeof payment === 'string') {
debug(`Fetching default_payment_method for subscription ${subscription.id}`); debug(`Fetching default_payment_method for subscription ${subscription.id}`);
const subscriptionWithPayment = await retrieve(this._stripe, 'subscriptions', subscription.id, { const subscriptionWithPayment = await retrieve(this._stripe, 'subscriptions', subscription.id, {
expand: ['default_payment_method'] expand: ['default_payment_method']
}); });
return this._updateSubscription(subscriptionWithPayment); return this._updateSubscription(subscriptionWithPayment, options);
} }
const mappedSubscription = { const mappedSubscription = {
@ -472,11 +476,11 @@ module.exports = class StripePaymentProcessor {
await this.storage.set({ await this.storage.set({
subscription: mappedSubscription subscription: mappedSubscription
}); }, options);
} }
async _customerForMemberCheckoutSession(member) { async _customerForMemberCheckoutSession(member, options) {
const metadata = await this.storage.get(member); const metadata = await this.storage.get(member, options);
for (const data of metadata.customers) { for (const data of metadata.customers) {
try { try {
@ -494,7 +498,7 @@ module.exports = class StripePaymentProcessor {
email: member.get('email') email: member.get('email')
}); });
await this._updateCustomer(member, customer); await this._updateCustomer(member, customer, options);
return customer; return customer;
} }