From 6a2a4ee64922ab0545529c9df2359f0eec608d8d Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Wed, 24 Nov 2021 14:37:42 +0100 Subject: [PATCH] Change where to >= --- backend/src/graphql/resolver/AdminResolver.ts | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 2e867369f..9b49029e4 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -49,33 +49,33 @@ async function getUserCreations(id: number): Promise { // targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), // }) const createdAmountBeforeLastMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder() + .createQueryBuilder('transaction_creations') .select('SUM(transaction_creations.amount)', 'sum') .where('transaction_creations.state_user_id = :id', { id }) .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-09-01", enddate: "2021-10-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) }) .getRawOne() console.log('createdAmountBeforeLastMonth', createdAmountBeforeLastMonth) - + const createdAmountLastMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('transaction_creations') - .select('SUM(transaction_creations.amount)', 'sum') - .where('transaction_creations.state_user_id = :id', { id }) - .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - }) - .getRawOne() + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-10-01", enddate: "2021-11-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() console.log('createdAmountLastMonth', createdAmountLastMonth) const createdAmountMonth = await getCustomRepository(TransactionCreationRepository) - .createQueryBuilder('transaction_creations') - .select('SUM(transaction_creations.amount)', 'sum') - .where('transaction_creations.state_user_id = :id', { id }) - .andWhere({ - targetDate: Raw((alias) => `${alias} > :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) - }) - .getRawOne() + .createQueryBuilder('transaction_creations') + .select('SUM(transaction_creations.amount)', 'sum') + .where('transaction_creations.state_user_id = :id', { id }) + .andWhere({ + targetDate: Raw((alias) => `${alias} >= :date and ${alias} < :enddate`, { date: "2021-11-01", enddate: "2021-12-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }) + }) + .getRawOne() console.log('createdAmountMonth', createdAmountMonth) // const transactionCreationsMonthQuery = await findAllUserTransactionCreations.andWhere({