From b5baa9d8830bf1d3306ceaeaf09ddf0b1b084d5b Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 24 Nov 2021 12:29:49 +0100 Subject: [PATCH] Added PendingCreationRepository and added find all pending creations. --- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++++++--- backend/src/typeorm/repository/PendingCreation.ts | 5 +++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 backend/src/typeorm/repository/PendingCreation.ts diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f28fb13ab..8cdd78535 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -3,6 +3,7 @@ import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' +import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' @@ -12,7 +13,7 @@ export class AdminResolver { async searchUsers(@Arg('searchText') searchText: string): Promise { const loginUserRepository = getCustomRepository(LoginUserRepository) const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = loginUsers.map((loginUser) => { + const users = gloginUsers.map((loginUser) => { const user = new UserAdmin() user.firstName = loginUser.firstName user.lastName = loginUser.lastName @@ -42,13 +43,18 @@ export class AdminResolver { } async function getUserCreations(id: number): Promise { - // SELECT count(amount) FROM transaction_creations WHERE state_user_id = id AND target_date > (NOW()-ActualDays - 2 Monate) + // TODO: NOW()-ActualDays - 2 Monate const transactionCreations = await getCustomRepository(TransactionCreationRepository).find({ userId: id, - targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' */ }), + targetDate: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), }) console.log('transactionCreations', transactionCreations) // SELECT * FROM pending_creations WHERE userId = id + const pendingCreations = await getCustomRepository(PendingCreationRepository).find({ + userId: id, + date: Raw((alias) => `${alias} > :date`, { date: "2021-09-01" /* TODO: NOW().format("YYYY-MM") + '-01' - 2 Month */ }), + }) + console.log('pendingCreations', pendingCreations^) // COUNT amount from 2 tables // if amount < 3000 => Store in pending_creations return [ diff --git a/backend/src/typeorm/repository/PendingCreation.ts b/backend/src/typeorm/repository/PendingCreation.ts new file mode 100644 index 000000000..dbe589e37 --- /dev/null +++ b/backend/src/typeorm/repository/PendingCreation.ts @@ -0,0 +1,5 @@ +import { EntityRepository, Repository } from 'typeorm' +import { PendingCreation } from '@entity/PendingCreation' + +@EntityRepository(LoginUserBackup) +export class PendingCreationRepository extends Repository {}