TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Supported comped status for create/update methods

Browse Source 
refs https://github.com/TryGhost/Team/issues/790

Both creating and updating members only ever need to explicitly set
either the 'comped' or 'free' status as these methods do not deal with
Stripe. When updating a member if the products are not changing, we do
not attempt to change the status either.
This commit is contained in:
Fabien O'Carroll 2021-07-01 19:51:54 +01:00
parent 7f71e28392
commit 8d8d886705
1 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ghost/members-api/lib/repositories/member/index.js
View File

@ -84,8 +84,17 @@ module.exports = class MemberRepository {
throw new errors.BadRequestError(tpl(messages.moreThanOneProduct));
}
const memberStatusData = {
status: 'free'
};
if (memberData.products.length === 1) {
memberStatusData.status = 'comped';
}
const member = await this._Member.add({
...memberData,
...memberStatusData,
labels
}, options);
@ -122,6 +131,18 @@ module.exports = class MemberRepository {
transacting: options.transacting
};
const memberData = _.pick(data, [
'email',
'name',
'note',
'subscribed',
'labels',
'geolocation',
'products'
]);
const memberStatusData = {};
if (this._stripeAPIService.configured && data.products) {
const member = await this._Member.findOne({
id: options.id
@ -140,7 +161,7 @@ module.exports = class MemberRepository {
const productsToRemove = _.differenceWith(existingProductIds, incomingProductIds);
const productsToModify = productsToAdd.concat(productsToRemove);
if (productsToModify.length > 0) {
if (productsToModify.length !== 0) {
const exisitingSubscriptions = await member.related('stripeSubscriptions').fetch(sharedOptions);
const existingActiveSubscriptions = exisitingSubscriptions.filter((subscription) => {
return this.isActiveSubscriptionStatus(subscription.get('status'));
@ -150,17 +171,24 @@ module.exports = class MemberRepository {
throw new errors.BadRequestError(tpl(messages.existingSubscriptions));
}
}
// CASE: We are removing all products from a member & there were no active subscriptions - the member is "free"
if (incomingProductIds.length === 0) {
memberStatusData.status = 'free';
} else {
// CASE: We are changing products & there were not active stripe subscriptions - the member is "comped"
if (productsToModify.length !== 0) {
memberStatusData.status = 'comped';
} else {
// CASE: We are not changing any products - leave the status alone
}
}
}
const member = await this._Member.edit(_.pick(data, [
'email',
'name',
'note',
'subscribed',
'labels',
'geolocation',
'products'
]), options);
const member = await this._Member.edit({
...memberData,
...memberStatusData
}, options);
// member._changed.subscribed has a value if the `subscribed` attribute is passed in the update call, regardless of the previous value
if (member.attributes.subscribed !== member._previousAttributes.subscribed) {
@ -188,6 +216,14 @@ module.exports = class MemberRepository {
}, sharedOptions);
}
if (member.attributes.status !== member._previousAttributes.status) {
await this._MemberStatusEvent.add({
member_id: member.id,
from_status: member._previousAttributes.status,
to_status: member.get('status')
}, sharedOptions);
}
if (this._stripeAPIService.configured && member._changed.email) {
await member.related('stripeCustomers').fetch();
const customers = member.related('stripeCustomers');