TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-23 19:02:29 +03:00
Code Issues Projects Releases Wiki Activity

Updated empty referrer source to null (#15456)

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

- changes empty referrer source to null instead of explicit `Unavailable` in API
- makes it easier for clients/frontend to ignore empty referrers
This commit is contained in:
Rishabh Garg 2022-09-22 20:58:45 +05:30 committed by GitHub
parent c59ea73a80
commit 45a301277d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ghost/stats-service/lib/referrers.js
View File

@ -104,12 +104,7 @@ class ReferrersStatsService {
const rows = await knex('members_subscription_created_events')
.select(knex.raw(`DATE(created_at) as date`))
.select(knex.raw(`COUNT(*) as paid_conversions`))
.select(knex.raw(`
CASE
WHEN referrer_source IS NULL THEN 'Unavailable'
ELSE referrer_source
END
as source`))
.select(knex.raw(`referrer_source as source`))
.groupBy('date', 'referrer_source')
.orderBy('date');
@ -124,12 +119,7 @@ class ReferrersStatsService {
const rows = await knex('members_created_events')
.select(knex.raw(`DATE(created_at) as date`))
.select(knex.raw(`COUNT(*) as signups`))
.select(knex.raw(`
CASE
WHEN referrer_source IS NULL THEN 'Unavailable'
ELSE referrer_source
END
as source`))
.select(knex.raw(`referrer_source as source`))
.groupBy('date', 'referrer_source')
.orderBy('date');

37
ghost/stats-service/test/lib/referrers.test.js
View File

@ -58,6 +58,37 @@ describe('ReferrersStatsService', function () {
});
}
// Insert null referrer data for signups
signupInsert.push(...[
{
referrer_source: null,
referrer_medium: null,
referrer_url: null,
created_at: '1970-01-09'
},
{
referrer_source: null,
referrer_medium: null,
referrer_url: null,
created_at: '1970-01-09'
}
]);
// Insert null referrer data for paid conversions
paidInsert.push(...[
{
referrer_source: null,
referrer_medium: null,
referrer_url: null,
created_at: '1970-01-09'
},
{
referrer_source: null,
referrer_medium: null,
referrer_url: null,
created_at: '1970-01-09'
}
]);
await db('members_created_events').insert(signupInsert);
await db('members_subscription_created_events').insert(paidInsert);
}
@ -75,11 +106,12 @@ describe('ReferrersStatsService', function () {
};
// Is sorted by date
assert.deepStrictEqual(results.data.map(result => result.date), ['1970-01-01', '1970-01-02', '1970-01-03', '1970-01-04', '1970-01-05', '1970-01-06', '1970-01-07', '1970-01-08', '1970-01-09']);
assert.deepStrictEqual(results.data.map(result => result.date), ['1970-01-01', '1970-01-02', '1970-01-03', '1970-01-04', '1970-01-05', '1970-01-06', '1970-01-07', '1970-01-08', '1970-01-09', '1970-01-09']);
const firstDayCounts = results.data.find(finder('Twitter', '1970-01-01'));
const secondDayCounts = results.data.find(finder('Ghost Newsletter', '1970-01-02'));
const thirdDayCounts = results.data.find(finder('Ghost Explore', '1970-01-03'));
const nullReferrerCounts = results.data.find(finder(null, '1970-01-09'));
assert(firstDayCounts.signups === 0);
assert(firstDayCounts.paid_conversions === 1);
@ -89,6 +121,9 @@ describe('ReferrersStatsService', function () {
assert(thirdDayCounts.signups === 1);
assert(thirdDayCounts.paid_conversions === 1);
assert(nullReferrerCounts.signups === 2);
assert(nullReferrerCounts.paid_conversions === 2);
});
});
});