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

Allowed storing attribution data on member events (#15487)

Browse Source 
refs 90034577b8

- this change was missed in above commit and would have blocked capturing attribution data for sites without the flag
This commit is contained in:
Rishabh Garg 2022-09-28 15:42:04 +05:30 committed by GitHub
parent 994f0eea64
commit b46258bbc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ghost/members-events-service/lib/event-storage.js
View File

@ -25,12 +25,6 @@ class EventStorage {
domainEvents.subscribe(MemberCreatedEvent, async (event) => {
let attribution = event.data.attribution;
if (!this.labsService.isSet('memberAttribution')){
// Prevent storing attribution
// Can replace this later with a privacy toggle
attribution = {};
}
await this.models.MemberCreatedEvent.add({
member_id: event.data.memberId,
created_at: event.timestamp,
@ -47,12 +41,6 @@ class EventStorage {
domainEvents.subscribe(SubscriptionCreatedEvent, async (event) => {
let attribution = event.data.attribution;
if (!this.labsService.isSet('memberAttribution')){
// Prevent storing attribution
// Can replace this later with a privacy toggle
attribution = {};
}
await this.models.SubscriptionCreatedEvent.add({
member_id: event.data.memberId,
subscription_id: event.data.subscriptionId,

22
ghost/members-events-service/test/event-storage.test.js
View File

@ -104,10 +104,13 @@ describe('EventStorage', function () {
sinon.assert.calledOnceWithMatch(MemberCreatedEventModel.add, {
member_id: '123',
created_at: new Date(0),
attribution_id: null,
attribution_type: null,
attribution_url: null,
source: 'test'
attribution_id: '123',
attribution_type: 'post',
attribution_url: 'url',
source: 'test',
referrer_source: null,
referrer_medium: null,
referrer_url: null
});
sinon.assert.calledTwice(subscribeSpy);
});
@ -178,7 +181,7 @@ describe('EventStorage', function () {
sinon.assert.calledTwice(subscribeSpy);
});
it('filters if disabled', function () {
it('works with flag disabled', function () {
const DomainEvents = {
subscribe: (type, handler) => {
if (type === SubscriptionCreatedEvent) {
@ -207,9 +210,12 @@ describe('EventStorage', function () {
member_id: '123',
subscription_id: '456',
created_at: new Date(0),
attribution_id: null,
attribution_type: null,
attribution_url: null
attribution_id: '123',
attribution_type: 'post',
attribution_url: 'url',
referrer_source: null,
referrer_medium: null,
referrer_url: null
});
sinon.assert.calledTwice(subscribeSpy);
});