Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Fixed member status events query

Browse source 
refs https://github.com/TryGhost/Ghost/issues/12602

- Adds aggregate option to permitted options
- Cleans up SQL query to fetch delta values
This commit is contained in:
Rish 2021-02-18 18:11:50 +05:30
parent 7abc6ac705
commit 6d2b731379
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/server/models/member-status-event.js
View file

@ -18,17 +18,17 @@ const MemberStatusEvent = ghostBookshelf.Model.extend({
.select(knex.raw('DATE(created_at) as date'))
.select(knex.raw(`SUM(
CASE WHEN to_status='paid' THEN 1
CASE WHEN from_status='paid' THEN -1
WHEN from_status='paid' THEN -1
ELSE 0 END
) as paid_delta`))
.select(knex.raw(`SUM(
CASE WHEN to_status='comped' THEN 1
CASE WHEN from_status='comped' THEN -1
WHEN from_status='comped' THEN -1
ELSE 0 END
) as comped_delta`))
.select(knex.raw(`SUM(
CASE WHEN to_status='free' THEN 1
CASE WHEN from_status='free' THEN -1
WHEN from_status='free' THEN -1
ELSE 0 END
) as free_delta`))
.groupByRaw('DATE(created_at)')
@ -36,6 +36,15 @@ const MemberStatusEvent = ghostBookshelf.Model.extend({
}
}
}, {
permittedOptions(methodName) {
const options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
if (methodName === 'findAll') {
return options.concat('aggregateStatusCounts');
}
return options;
},
async edit() {
throw new errors.IncorrectUsageError('Cannot edit MemberStatusEvent');
},