TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-09-21 01:27:10 +03:00
Code Issues Projects Releases Wiki Activity

Fixed created_at dates for member event objects

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

Importing members with a created_at date will incorrectly create events
for the member for the date of the import. This updates our event
handling to use either the passed created_at date, or in the case of
subscriptions the start_date of the subscription. We're using start_date
for subscriptions rather than created, as this is more accurate because
start_date works correctly for backdated subscriptions in Stripe.
This commit is contained in:
Fabien O'Carroll 2021-07-15 10:25:41 +01:00 committed by Fabien 'egg' O'Carroll
parent aad662267c
commit d427e72b1c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,17 +109,21 @@ module.exports = class MemberRepository {
source = 'member';
}
const eventData = _.pick(data, ['created_at']);
await this._MemberStatusEvent.add({
member_id: member.id,
from_status: null,
to_status: member.get('status')
to_status: member.get('status'),
...eventData
}, options);
if (member.get('subscribed')) {
await this._MemberSubscribeEvent.add({
member_id: member.id,
subscribed: true,
source
source,
...eventData
}, options);
}
@ -410,6 +414,7 @@ module.exports = class MemberRepository {
plan_amount: subscriptionPriceData.unit_amount,
plan_currency: subscriptionPriceData.currency
};
let eventData = {};
if (model) {
const updated = await this._StripeCustomerSubscription.edit(subscriptionData, {
...options,
@ -430,6 +435,7 @@ module.exports = class MemberRepository {
}, options);
}
} else {
eventData.created_at = new Date(subscription.start_date * 1000);
await this._StripeCustomerSubscription.add(subscriptionData, options);
await this._MemberPaidSubscriptionEvent.add({
member_id: member.id,
@ -437,7 +443,8 @@ module.exports = class MemberRepository {
from_plan: null,
to_plan: subscriptionPriceData.id,
currency: subscriptionPriceData.currency,
mrr_delta: getMRRDelta({interval: _.get(subscriptionPriceData, 'recurring.interval'), amount: subscriptionPriceData.unit_amount, status: subscriptionPriceData.status})
mrr_delta: getMRRDelta({interval: _.get(subscriptionPriceData, 'recurring.interval'), amount: subscriptionPriceData.unit_amount, status: subscriptionPriceData.status}),
...eventData
}, options);
}
@ -489,7 +496,8 @@ module.exports = class MemberRepository {
await this._MemberStatusEvent.add({
member_id: data.id,
from_status: updatedMember._previousAttributes.status,
to_status: updatedMember.get('status')
to_status: updatedMember.get('status'),
...eventData
}, options);
}
}