IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

use enum as creation type, date criteria as variable

Browse Source
This commit is contained in:
Moriz Wahl 2022-02-22 14:43:03 +01:00
parent c0c5510903
commit 55211f0940
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/graphql/resolver/AdminResolver.ts
View File

@ -311,15 +311,18 @@ async function getUserCreations(ids: number[]): Promise<CreationMap[]> {
const queryRunner = getConnection().createQueryRunner()
await queryRunner.connect()
const dateFilter = 'last_day(curdate() - interval 3 month) + interval 1 day'
const unionQuery = await queryRunner.manager.query(`
SELECT MONTH(date) AS month, sum(amount) AS sum, userId AS id FROM
(SELECT creation_date AS date, amount AS amount, user_id AS userId FROM transactions
WHERE user_id IN (${ids.toString()}) AND transaction_type_id = 1
AND creation_date >= last_day(curdate() - interval 3 month) + interval 1 day
UNION
SELECT date AS date, amount AS amount, userId AS userId FROM admin_pending_creations
WHERE userId IN (${ids.toString()})
AND date >= last_day(curdate() - interval 3 month) + interval 1 day) AS result
WHERE user_id IN (${ids.toString()})
AND transaction_type_id = ${TransactionTypeId.CREATION}
AND creation_date >= ${dateFilter}
UNION
SELECT date AS date, amount AS amount, userId AS userId FROM admin_pending_creations
WHERE userId IN (${ids.toString()})
AND date >= ${dateFilter}) AS result
GROUP BY month, userId
ORDER BY date DESC
`)