From e6d9420d8e4307c9a55125eb5e06f4f849843090 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 10:40:55 +0200 Subject: [PATCH 01/22] migration to rename admin-pending-creations --- .../migrations/0037-contributions_table.ts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 database/migrations/0037-contributions_table.ts diff --git a/database/migrations/0037-contributions_table.ts b/database/migrations/0037-contributions_table.ts new file mode 100644 index 000000000..983593f51 --- /dev/null +++ b/database/migrations/0037-contributions_table.ts @@ -0,0 +1,53 @@ +/* MIGRATION to rename ADMIN_PENDING_CREATION table and add columns + */ + +/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ +/* eslint-disable @typescript-eslint/no-explicit-any */ + +export async function upgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn('RENAME TABLE `admin_pending_creations` TO `contributions`;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `userId` `user_id` int(10);') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created` `contribution_date` datetime;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `date` `created_at` datetime;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `moderator` `moderator_id` int(10);') + + await queryFn( + 'ALTER TABLE `contributions` ADD COLUMN `contribution_link_id` int(10) unsigned DEFAULT NULL AFTER `moderator_id`;', + ) + + await queryFn( + 'ALTER TABLE `contributions` ADD COLUMN `confirmed_by` int(10) unsigned DEFAULT NULL AFTER `contribution_link_id`;', + ) + + await queryFn( + 'ALTER TABLE `contributions` ADD COLUMN `confirmed_at` datetime DEFAULT NULL AFTER `confirmed_by`;', + ) + + await queryFn( + 'ALTER TABLE `contributions` ADD COLUMN `deleted_at` datetime DEFAULT NULL AFTER `confirmed_at`;', + ) +} + +export async function downgrade(queryFn: (query: string, values?: any[]) => Promise>) { + await queryFn('ALTER TABLE `contributions` DROP COLUMN IF EXISTS `deleted_at`;') + + await queryFn('ALTER TABLE `contributions` DROP COLUMN IF EXISTS `confirmed_at`;') + + await queryFn('ALTER TABLE `contributions` DROP COLUMN IF EXISTS `confirmed_by`;') + + await queryFn('ALTER TABLE `contributions` DROP COLUMN IF EXISTS `contribution_link_id`;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `moderator_id` `moderator` int(10);') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created_at` `date` datetime;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `contribution_date` `created` datetime;') + + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `user_id` `userId` int(10);') + + await queryFn('RENAME TABLE `contributions` TO `admin_pending_creations`;') +} From 617ea9a2b0e43bd6d5207d31814e0d7ea622dcfe Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 10:56:54 +0200 Subject: [PATCH 02/22] contribution entity --- .../0037-contributions_table/Contribution.ts | 45 +++++++++++++++++++ database/entity/Contribution.ts | 1 + database/entity/index.ts | 4 +- .../migrations/0037-contributions_table.ts | 8 ++-- 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 database/entity/0037-contributions_table/Contribution.ts create mode 100644 database/entity/Contribution.ts diff --git a/database/entity/0037-contributions_table/Contribution.ts b/database/entity/0037-contributions_table/Contribution.ts new file mode 100644 index 000000000..997bef2c7 --- /dev/null +++ b/database/entity/0037-contributions_table/Contribution.ts @@ -0,0 +1,45 @@ +import Decimal from 'decimal.js-light' +import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm' +import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' + +@Entity('contributions') +export class Contribution extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ unsigned: true, nullable: false, name: 'user_id' }) + userId: number + + @Column({ type: 'datetime', default: () => 'CURRENT_TIMESTAMP', name: 'created_at' }) + createdAt: Date + + @Column({ type: 'datetime', nullable: false, name: 'contribution_date' }) + contributionDate: Date + + @Column({ length: 255, nullable: false, collation: 'utf8mb4_unicode_ci' }) + memo: string + + @Column({ + type: 'decimal', + precision: 40, + scale: 20, + nullable: false, + transformer: DecimalTransformer, + }) + amount: Decimal + + @Column({ unsigned: true, nullable: true, name: 'moderator_id' }) + moderatorId: number + + @Column({ unsigned: true, nullable: true, name: 'contribution_link_id' }) + contributionLinkId: number + + @Column({ unsigned: true, nullable: true, name: 'confirmed_by' }) + confirmedBy: number + + @Column({ nullable: true, name: 'confirmed_at' }) + confirmedAt: Date + + @Column({ nullable: true, name: 'deleted_at' }) + deletedAt: Date +} diff --git a/database/entity/Contribution.ts b/database/entity/Contribution.ts new file mode 100644 index 000000000..ccb227359 --- /dev/null +++ b/database/entity/Contribution.ts @@ -0,0 +1 @@ +export { Contribution } from './0037-contributions_table/Contribution' diff --git a/database/entity/index.ts b/database/entity/index.ts index 542333755..54495975c 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -5,10 +5,10 @@ import { Transaction } from './Transaction' import { TransactionLink } from './TransactionLink' import { User } from './User' import { UserSetting } from './UserSetting' -import { AdminPendingCreation } from './AdminPendingCreation' +import { Contribution } from './Contribution' export const entities = [ - AdminPendingCreation, + Contribution, LoginElopageBuys, LoginEmailOptIn, Migration, diff --git a/database/migrations/0037-contributions_table.ts b/database/migrations/0037-contributions_table.ts index 983593f51..163959a3a 100644 --- a/database/migrations/0037-contributions_table.ts +++ b/database/migrations/0037-contributions_table.ts @@ -9,9 +9,9 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `userId` `user_id` int(10);') - await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created` `contribution_date` datetime;') + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created` `created_at` datetime;') - await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `date` `created_at` datetime;') + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `date` `contribution_date` datetime;') await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `moderator` `moderator_id` int(10);') @@ -43,9 +43,9 @@ export async function downgrade(queryFn: (query: string, values?: any[]) => Prom await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `moderator_id` `moderator` int(10);') - await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created_at` `date` datetime;') + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `created_at` `created` datetime;') - await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `contribution_date` `created` datetime;') + await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `contribution_date` `date` datetime;') await queryFn('ALTER TABLE `contributions` CHANGE COLUMN `user_id` `userId` int(10);') From 4c7fc10d8f13378759a30f51589282d1ccf338bb Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 10:57:25 +0200 Subject: [PATCH 03/22] change DB version --- backend/src/config/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 559b8e9c5..011fd8c3a 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -10,7 +10,7 @@ Decimal.set({ }) const constants = { - DB_VERSION: '0036-unique_previous_in_transactions', + DB_VERSION: '0037-contributions_table', DECAY_START_TIME: new Date('2021-05-13 17:46:31'), // GMT+0 LOG4JS_CONFIG: 'log4js-config.json', // default log level on production should be info From 69a3cc0264f04c167d825603c50dbf0a6f26627a Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 14:15:34 +0200 Subject: [PATCH 04/22] use new Contribution Data Model --- ...dingCreation.ts => PendingContribution.ts} | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 127 +++++++++--------- 2 files changed, 68 insertions(+), 61 deletions(-) rename backend/src/graphql/model/{PendingCreation.ts => PendingContribution.ts} (93%) diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingContribution.ts similarity index 93% rename from backend/src/graphql/model/PendingCreation.ts rename to backend/src/graphql/model/PendingContribution.ts index 500ba6f6b..e8991deb7 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class PendingCreation { +export class PendingContribution { @Field(() => String) firstName: string diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8c3d71b73..323df8a99 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -11,7 +11,7 @@ import { FindOperator, } from '@dbTools/typeorm' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' -import { PendingCreation } from '@model/PendingCreation' +import { PendingContribution } from '@model/PendingContribution' import { CreatePendingCreations } from '@model/CreatePendingCreations' import { UpdatePendingCreation } from '@model/UpdatePendingCreation' import { RIGHTS } from '@/auth/RIGHTS' @@ -25,7 +25,7 @@ import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { TransactionRepository } from '@repository/Transaction' import { calculateDecay } from '@/util/decay' -import { AdminPendingCreation } from '@entity/AdminPendingCreation' +import { Contribution } from '@entity/Contribution' import { hasElopageBuys } from '@/util/hasElopageBuys' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User as dbUser } from '@entity/User' @@ -183,15 +183,15 @@ export class AdminResolver { const creations = await getUserCreation(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { - const adminPendingCreation = AdminPendingCreation.create() - adminPendingCreation.userId = user.id - adminPendingCreation.amount = amount - adminPendingCreation.created = new Date() - adminPendingCreation.date = creationDateObj - adminPendingCreation.memo = memo - adminPendingCreation.moderator = moderator.id + const contribution = Contribution.create() + contribution.userId = user.id + contribution.amount = amount + contribution.createdAt = new Date() + contribution.contributionDate = creationDateObj + contribution.memo = memo + contribution.moderatorId = moderator.id - await AdminPendingCreation.save(adminPendingCreation) + await Contribution.save(contribution) } return getUserCreation(user.id) } @@ -200,20 +200,20 @@ export class AdminResolver { @Mutation(() => CreatePendingCreations) async createPendingCreations( @Arg('pendingCreations', () => [CreatePendingCreationArgs]) - pendingCreations: CreatePendingCreationArgs[], + contributions: CreatePendingCreationArgs[], @Ctx() context: Context, ): Promise { let success = false const successfulCreation: string[] = [] const failedCreation: string[] = [] - for (const pendingCreation of pendingCreations) { - await this.createPendingCreation(pendingCreation, context) + for (const contribution of contributions) { + await this.createPendingCreation(contribution, context) .then(() => { - successfulCreation.push(pendingCreation.email) + successfulCreation.push(contribution.email) success = true }) .catch(() => { - failedCreation.push(pendingCreation.email) + failedCreation.push(contribution.email) }) } return { @@ -239,34 +239,34 @@ export class AdminResolver { const moderator = getUser(context) - const pendingCreationToUpdate = await AdminPendingCreation.findOne({ id }) + const contributionToUpdate = await Contribution.findOne({ id }) - if (!pendingCreationToUpdate) { - throw new Error('No creation found to given id.') + if (!contributionToUpdate) { + throw new Error('No contribution found to given id.') } - if (pendingCreationToUpdate.userId !== user.id) { - throw new Error('user of the pending creation and send user does not correspond') + if (contributionToUpdate.userId !== user.id) { + throw new Error('user of the pending contribution and send user does not correspond') } const creationDateObj = new Date(creationDate) let creations = await getUserCreation(user.id) - if (pendingCreationToUpdate.date.getMonth() === creationDateObj.getMonth()) { - creations = updateCreations(creations, pendingCreationToUpdate) + if (contributionToUpdate.contributionDate.getMonth() === creationDateObj.getMonth()) { + creations = updateCreations(creations, contributionToUpdate) } // all possible cases not to be true are thrown in this function isCreationValid(creations, amount, creationDateObj) - pendingCreationToUpdate.amount = amount - pendingCreationToUpdate.memo = memo - pendingCreationToUpdate.date = new Date(creationDate) - pendingCreationToUpdate.moderator = moderator.id + contributionToUpdate.amount = amount + contributionToUpdate.memo = memo + contributionToUpdate.contributionDate = new Date(creationDate) + contributionToUpdate.moderatorId = moderator.id - await AdminPendingCreation.save(pendingCreationToUpdate) + await Contribution.save(contributionToUpdate) const result = new UpdatePendingCreation() result.amount = amount - result.memo = pendingCreationToUpdate.memo - result.date = pendingCreationToUpdate.date + result.memo = contributionToUpdate.memo + result.date = contributionToUpdate.contributionDate result.creation = await getUserCreation(user.id) @@ -274,24 +274,28 @@ export class AdminResolver { } @Authorized([RIGHTS.SEARCH_PENDING_CREATION]) - @Query(() => [PendingCreation]) - async getPendingCreations(): Promise { - const pendingCreations = await AdminPendingCreation.find() - if (pendingCreations.length === 0) { + @Query(() => [PendingContribution]) + async getPendingCreations(): Promise { + const contributions = await Contribution.find() + if (contributions.length === 0) { return [] } - const userIds = pendingCreations.map((p) => p.userId) + const userIds = contributions.map((p) => p.userId) const userCreations = await getUserCreations(userIds) const users = await dbUser.find({ where: { id: In(userIds) }, withDeleted: true }) - return pendingCreations.map((pendingCreation) => { - const user = users.find((u) => u.id === pendingCreation.userId) - const creation = userCreations.find((c) => c.id === pendingCreation.userId) + return contributions.map((contribution) => { + const user = users.find((u) => u.id === contribution.userId) + const creation = userCreations.find((c) => c.id === contribution.userId) return { - ...pendingCreation, - amount: pendingCreation.amount, + id: contribution.id, + userId: contribution.userId, + date: contribution.contributionDate, + memo: contribution.memo, + amount: contribution.amount, + moderator: contribution.moderatorId, firstName: user ? user.firstName : '', lastName: user ? user.lastName : '', email: user ? user.email : '', @@ -303,11 +307,11 @@ export class AdminResolver { @Authorized([RIGHTS.DELETE_PENDING_CREATION]) @Mutation(() => Boolean) async deletePendingCreation(@Arg('id', () => Int) id: number): Promise { - const pendingCreation = await AdminPendingCreation.findOne(id) - if (!pendingCreation) { + const contribution = await Contribution.findOne(id) + if (!contribution) { throw new Error('Creation not found for given id.') } - const res = await AdminPendingCreation.delete(pendingCreation) + const res = await contribution.softRemove() return !!res } @@ -317,26 +321,26 @@ export class AdminResolver { @Arg('id', () => Int) id: number, @Ctx() context: Context, ): Promise { - const pendingCreation = await AdminPendingCreation.findOne(id) - if (!pendingCreation) { + const contribution = await Contribution.findOne(id) + if (!contribution) { throw new Error('Creation not found to given id.') } const moderatorUser = getUser(context) - if (moderatorUser.id === pendingCreation.userId) + if (moderatorUser.id === contribution.userId) throw new Error('Moderator can not confirm own pending creation') - const user = await dbUser.findOneOrFail({ id: pendingCreation.userId }, { withDeleted: true }) + const user = await dbUser.findOneOrFail({ id: contribution.userId }, { withDeleted: true }) if (user.deletedAt) throw new Error('This user was deleted. Cannot confirm a creation.') - const creations = await getUserCreation(pendingCreation.userId, false) - if (!isCreationValid(creations, pendingCreation.amount, pendingCreation.date)) { + const creations = await getUserCreation(contribution.userId, false) + if (!isCreationValid(creations, contribution.amount, contribution.contributionDate)) { throw new Error('Creation is not valid!!') } const receivedCallDate = new Date() const transactionRepository = getCustomRepository(TransactionRepository) - const lastTransaction = await transactionRepository.findLastForUser(pendingCreation.userId) + const lastTransaction = await transactionRepository.findLastForUser(contribution.userId) let newBalance = new Decimal(0) let decay: Decay | null = null @@ -344,15 +348,15 @@ export class AdminResolver { decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, receivedCallDate) newBalance = decay.balance } - newBalance = newBalance.add(pendingCreation.amount.toString()) + newBalance = newBalance.add(contribution.amount.toString()) const transaction = new DbTransaction() transaction.typeId = TransactionTypeId.CREATION - transaction.memo = pendingCreation.memo - transaction.userId = pendingCreation.userId + transaction.memo = contribution.memo + transaction.userId = contribution.userId transaction.previous = lastTransaction ? lastTransaction.id : null - transaction.amount = pendingCreation.amount - transaction.creationDate = pendingCreation.date + transaction.amount = contribution.amount + transaction.creationDate = contribution.contributionDate transaction.balance = newBalance transaction.balanceDate = receivedCallDate transaction.decay = decay ? decay.decay : new Decimal(0) @@ -361,7 +365,10 @@ export class AdminResolver { throw new Error('Unable to confirm creation.') }) - await AdminPendingCreation.delete(pendingCreation) + contribution.confirmedAt = receivedCallDate + contribution.confirmedBy = moderatorUser.id + + await Contribution.save(contribution) return true } @@ -478,9 +485,9 @@ async function getUserCreations(ids: number[], includePending = true): Promise= ${dateFilter}` + AND contribution_date >= ${dateFilter}` : '' const unionQuery = await queryRunner.manager.query(` @@ -510,13 +517,13 @@ async function getUserCreations(ids: number[], includePending = true): Promise Date: Mon, 30 May 2022 14:50:58 +0200 Subject: [PATCH 05/22] add logger to admin resolver, log some tracing, fix seeds --- backend/src/graphql/resolver/AdminResolver.test.ts | 8 ++++---- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++++++++- backend/src/seeds/factory/creation.ts | 8 ++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 4771232ea..8d4efd283 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -25,7 +25,7 @@ import { User } from '@entity/User' /* eslint-disable-next-line @typescript-eslint/no-unused-vars */ import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' import Decimal from 'decimal.js-light' -import { AdminPendingCreation } from '@entity/AdminPendingCreation' +import { Contribution } from '@entity/Contribution' import { Transaction as DbTransaction } from '@entity/Transaction' // mock account activation email to avoid console spam @@ -54,7 +54,7 @@ afterAll(async () => { let admin: User let user: User -let creation: AdminPendingCreation | void +let creation: Contribution | void describe('AdminResolver', () => { describe('delete user', () => { @@ -1275,8 +1275,8 @@ describe('AdminResolver', () => { }) describe('confirm two creations one after the other quickly', () => { - let c1: AdminPendingCreation | void - let c2: AdminPendingCreation | void + let c1: Contribution | void + let c2: Contribution | void beforeAll(async () => { const now = new Date() diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 323df8a99..7247faa8d 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -40,6 +40,7 @@ import { communityUser } from '@/util/communityUser' import { checkOptInCode, activationLink, printTimeDuration } from './UserResolver' import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' import CONFIG from '@/config' +import { backendLogger as logger } from '@/server/logger' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? @@ -169,6 +170,7 @@ export class AdminResolver { @Args() { email, amount, memo, creationDate }: CreatePendingCreationArgs, @Ctx() context: Context, ): Promise { + logger.trace('createPendingCreation...') const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { throw new Error(`Could not find user with email: ${email}`) @@ -180,7 +182,9 @@ export class AdminResolver { throw new Error('Creation could not be saved, Email is not activated') } const moderator = getUser(context) + logger.trace('moderator: ', moderator.id) const creations = await getUserCreation(user.id) + logger.trace('creations', creations) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { const contribution = Contribution.create() @@ -191,6 +195,7 @@ export class AdminResolver { contribution.memo = memo contribution.moderatorId = moderator.id + logger.trace('contribution to save', contribution) await Contribution.save(contribution) } return getUserCreation(user.id) @@ -470,23 +475,27 @@ interface CreationMap { } async function getUserCreation(id: number, includePending = true): Promise { + logger.trace('getUserCreation', id, includePending) const creations = await getUserCreations([id], includePending) return creations[0] ? creations[0].creations : FULL_CREATION_AVAILABLE } async function getUserCreations(ids: number[], includePending = true): Promise { + logger.trace('getUserCreations:', ids, includePending) const months = getCreationMonths() + logger.trace('getUserCreations months', months) const queryRunner = getConnection().createQueryRunner() await queryRunner.connect() const dateFilter = 'last_day(curdate() - interval 3 month) + interval 1 day' + logger.trace('getUserCreations dateFilter', dateFilter) const unionString = includePending ? ` UNION SELECT contribution_date AS date, amount AS amount, user_id AS userId FROM contributions - WHERE userId IN (${ids.toString()}) + WHERE user_id IN (${ids.toString()}) AND contribution_date >= ${dateFilter}` : '' @@ -528,6 +537,7 @@ function updateCreations(creations: Decimal[], contribution: Contribution): Deci } function isCreationValid(creations: Decimal[], amount: Decimal, creationDate: Date) { + logger.trace('isCreationValid', creations, amount, creationDate) const index = getCreationIndex(creationDate.getMonth()) if (index < 0) { diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index e49be3758..dc17c4084 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -7,7 +7,7 @@ import { CreationInterface } from '@/seeds/creation/CreationInterface' import { ApolloServerTestClient } from 'apollo-server-testing' import { User } from '@entity/User' import { Transaction } from '@entity/Transaction' -import { AdminPendingCreation } from '@entity/AdminPendingCreation' +import { Contribution } from '@entity/Contribution' // import CONFIG from '@/config/index' export const nMonthsBefore = (date: Date, months = 1): string => { @@ -17,7 +17,7 @@ export const nMonthsBefore = (date: Date, months = 1): string => { export const creationFactory = async ( client: ApolloServerTestClient, creation: CreationInterface, -): Promise => { +): Promise => { const { mutate, query } = client await query({ query: login, variables: { email: 'peter@lustig.de', password: 'Aa12345_' } }) @@ -27,9 +27,9 @@ export const creationFactory = async ( const user = await User.findOneOrFail({ where: { email: creation.email } }) - const pendingCreation = await AdminPendingCreation.findOneOrFail({ + const pendingCreation = await Contribution.findOneOrFail({ where: { userId: user.id, amount: creation.amount }, - order: { created: 'DESC' }, + order: { createdAt: 'DESC' }, }) if (creation.confirmed) { From fa2a05c35ff5d4808b414155dd05e9e23e120405 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 14:59:51 +0200 Subject: [PATCH 06/22] enable soft delete --- database/entity/0037-contributions_table/Contribution.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/entity/0037-contributions_table/Contribution.ts b/database/entity/0037-contributions_table/Contribution.ts index 997bef2c7..61a7550af 100644 --- a/database/entity/0037-contributions_table/Contribution.ts +++ b/database/entity/0037-contributions_table/Contribution.ts @@ -1,5 +1,5 @@ import Decimal from 'decimal.js-light' -import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm' +import { BaseEntity, Column, Entity, PrimaryGeneratedColumn, DeleteDateColumn } from 'typeorm' import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer' @Entity('contributions') @@ -40,6 +40,6 @@ export class Contribution extends BaseEntity { @Column({ nullable: true, name: 'confirmed_at' }) confirmedAt: Date - @Column({ nullable: true, name: 'deleted_at' }) - deletedAt: Date + @DeleteDateColumn({ name: 'deleted_at' }) + deletedAt: Date | null } From 22944bce2871f4ae2b8b0a2649349325717e1c23 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 15:00:23 +0200 Subject: [PATCH 07/22] get tests running again --- backend/src/graphql/resolver/AdminResolver.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 8d4efd283..61da03dfa 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -981,7 +981,7 @@ describe('AdminResolver', () => { }), ).resolves.toEqual( expect.objectContaining({ - errors: [new GraphQLError('No creation found to given id.')], + errors: [new GraphQLError('No contribution found to given id.')], }), ) }) @@ -1004,7 +1004,7 @@ describe('AdminResolver', () => { expect.objectContaining({ errors: [ new GraphQLError( - 'user of the pending creation and send user does not correspond', + 'user of the pending contribution and send user does not correspond', ), ], }), From 56ba42babdcda2bf3d59b21634be40c38267f93e Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 30 May 2022 21:00:56 +0200 Subject: [PATCH 08/22] do not read confirmed and deleted contributions --- backend/src/graphql/resolver/AdminResolver.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 7247faa8d..bf92597b3 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -496,7 +496,8 @@ async function getUserCreations(ids: number[], includePending = true): Promise= ${dateFilter}` + AND contribution_date >= ${dateFilter} + AND confirmed_at IS NULL AND deleted_at IS NULL` : '' const unionQuery = await queryRunner.manager.query(` From e44a41b22be204bebb3276102493433a163a9f42 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 31 May 2022 08:12:41 +0200 Subject: [PATCH 09/22] contribution to transaction as transaction --- .../graphql/resolver/AdminResolver.test.ts | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 78 ++++++++++++------- 2 files changed, 50 insertions(+), 30 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index 61da03dfa..c44757a00 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -1315,7 +1315,7 @@ describe('AdminResolver', () => { ) await expect(r2).resolves.toEqual( expect.objectContaining({ - errors: [new GraphQLError('Unable to confirm creation.')], + errors: [new GraphQLError('Creation was not successful.')], }), ) }) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index bf92597b3..909580ead 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -344,37 +344,57 @@ export class AdminResolver { const receivedCallDate = new Date() - const transactionRepository = getCustomRepository(TransactionRepository) - const lastTransaction = await transactionRepository.findLastForUser(contribution.userId) + const queryRunner = getConnection().createQueryRunner() + await queryRunner.connect() + await queryRunner.startTransaction('READ UNCOMMITTED') + try { + const lastTransaction = await queryRunner.manager + .createQueryBuilder() + .select('transaction') + .from(DbTransaction, 'transaction') + .where('transaction.userId = :id', { id: contribution.userId }) + .orderBy('transaction.balanceDate', 'DESC') + .getOne() + logger.info('lastTransaction ID', lastTransaction ? lastTransaction.id : 'undefined') - let newBalance = new Decimal(0) - let decay: Decay | null = null - if (lastTransaction) { - decay = calculateDecay(lastTransaction.balance, lastTransaction.balanceDate, receivedCallDate) - newBalance = decay.balance + let newBalance = new Decimal(0) + let decay: Decay | null = null + if (lastTransaction) { + decay = calculateDecay( + lastTransaction.balance, + lastTransaction.balanceDate, + receivedCallDate, + ) + newBalance = decay.balance + } + newBalance = newBalance.add(contribution.amount.toString()) + + const transaction = new DbTransaction() + transaction.typeId = TransactionTypeId.CREATION + transaction.memo = contribution.memo + transaction.userId = contribution.userId + transaction.previous = lastTransaction ? lastTransaction.id : null + transaction.amount = contribution.amount + transaction.creationDate = contribution.contributionDate + transaction.balance = newBalance + transaction.balanceDate = receivedCallDate + transaction.decay = decay ? decay.decay : new Decimal(0) + transaction.decayStart = decay ? decay.start : null + await queryRunner.manager.insert(DbTransaction, transaction) + + contribution.confirmedAt = receivedCallDate + contribution.confirmedBy = moderatorUser.id + await queryRunner.manager.update(Contribution, { id: contribution.id }, contribution) + + await queryRunner.commitTransaction() + logger.info('creation commited successfuly.') + } catch (e) { + await queryRunner.rollbackTransaction() + logger.error(`Creation was not successful: ${e}`) + throw new Error(`Creation was not successful.`) + } finally { + await queryRunner.release() } - newBalance = newBalance.add(contribution.amount.toString()) - - const transaction = new DbTransaction() - transaction.typeId = TransactionTypeId.CREATION - transaction.memo = contribution.memo - transaction.userId = contribution.userId - transaction.previous = lastTransaction ? lastTransaction.id : null - transaction.amount = contribution.amount - transaction.creationDate = contribution.contributionDate - transaction.balance = newBalance - transaction.balanceDate = receivedCallDate - transaction.decay = decay ? decay.decay : new Decimal(0) - transaction.decayStart = decay ? decay.start : null - await transaction.save().catch(() => { - throw new Error('Unable to confirm creation.') - }) - - contribution.confirmedAt = receivedCallDate - contribution.confirmedBy = moderatorUser.id - - await Contribution.save(contribution) - return true } From d048a001437e8eec311471efd8d7049d94acc548 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 2 Jun 2022 08:43:30 +0200 Subject: [PATCH 10/22] getPendingCreations excludes confirmed contributions --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 909580ead..b75222e5c 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -281,7 +281,7 @@ export class AdminResolver { @Authorized([RIGHTS.SEARCH_PENDING_CREATION]) @Query(() => [PendingContribution]) async getPendingCreations(): Promise { - const contributions = await Contribution.find() + const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } }) if (contributions.length === 0) { return [] } From 5845f708f67fb04d965947f3570c2968117a4b4d Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 14 Jun 2022 19:47:18 +0200 Subject: [PATCH 11/22] rename from pending creation to unconfirmed contribution --- ...Args.ts => AdminCreateContributionArgs.ts} | 2 +- ...AdminUpdateUnconfirmedContributionArgs.ts} | 2 +- ...reations.ts => AdminCreateContribution.ts} | 2 +- ... => AdminUpdateUnconfirmedContribution.ts} | 2 +- ...ribution.ts => UnconfirmedContribution.ts} | 2 +- backend/src/graphql/resolver/AdminResolver.ts | 32 +++++++++---------- 6 files changed, 21 insertions(+), 21 deletions(-) rename backend/src/graphql/arg/{CreatePendingCreationArgs.ts => AdminCreateContributionArgs.ts} (85%) rename backend/src/graphql/arg/{UpdatePendingCreationArgs.ts => AdminUpdateUnconfirmedContributionArgs.ts} (84%) rename backend/src/graphql/model/{CreatePendingCreations.ts => AdminCreateContribution.ts} (89%) rename backend/src/graphql/model/{UpdatePendingCreation.ts => AdminUpdateUnconfirmedContribution.ts} (84%) rename backend/src/graphql/model/{PendingContribution.ts => UnconfirmedContribution.ts} (93%) diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/AdminCreateContributionArgs.ts similarity index 85% rename from backend/src/graphql/arg/CreatePendingCreationArgs.ts rename to backend/src/graphql/arg/AdminCreateContributionArgs.ts index 11c345465..b09edea32 100644 --- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/AdminCreateContributionArgs.ts @@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light' @InputType() @ArgsType() -export default class CreatePendingCreationArgs { +export default class AdminCreateContributionArgs { @Field(() => String) email: string diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts similarity index 84% rename from backend/src/graphql/arg/UpdatePendingCreationArgs.ts rename to backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts index 691d73154..228207707 100644 --- a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts +++ b/backend/src/graphql/arg/AdminUpdateUnconfirmedContributionArgs.ts @@ -2,7 +2,7 @@ import { ArgsType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ArgsType() -export default class UpdatePendingCreationArgs { +export default class AdminUpdatePendingContributionArgs { @Field(() => Int) id: number diff --git a/backend/src/graphql/model/CreatePendingCreations.ts b/backend/src/graphql/model/AdminCreateContribution.ts similarity index 89% rename from backend/src/graphql/model/CreatePendingCreations.ts rename to backend/src/graphql/model/AdminCreateContribution.ts index 8d5bcef2c..c2df3d73e 100644 --- a/backend/src/graphql/model/CreatePendingCreations.ts +++ b/backend/src/graphql/model/AdminCreateContribution.ts @@ -1,7 +1,7 @@ import { ObjectType, Field } from 'type-graphql' @ObjectType() -export class CreatePendingCreations { +export class AdminCreateContribution { constructor() { this.success = false this.successfulCreation = [] diff --git a/backend/src/graphql/model/UpdatePendingCreation.ts b/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts similarity index 84% rename from backend/src/graphql/model/UpdatePendingCreation.ts rename to backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts index e19e1e064..5f905cd6c 100644 --- a/backend/src/graphql/model/UpdatePendingCreation.ts +++ b/backend/src/graphql/model/AdminUpdateUnconfirmedContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class UpdatePendingCreation { +export class AdminUpdateUnconfirmedContribution { @Field(() => Date) date: Date diff --git a/backend/src/graphql/model/PendingContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts similarity index 93% rename from backend/src/graphql/model/PendingContribution.ts rename to backend/src/graphql/model/UnconfirmedContribution.ts index e8991deb7..69001c19b 100644 --- a/backend/src/graphql/model/PendingContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -2,7 +2,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import Decimal from 'decimal.js-light' @ObjectType() -export class PendingContribution { +export class UnconfirmedContribution { @Field(() => String) firstName: string diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index cf179263d..b0e2fcbec 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -11,13 +11,13 @@ import { FindOperator, } from '@dbTools/typeorm' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' -import { PendingContribution } from '@model/PendingContribution' -import { CreatePendingCreations } from '@model/CreatePendingCreations' -import { UpdatePendingCreation } from '@model/UpdatePendingCreation' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { AdminCreateContribution } from '@model/AdminCreateContribution' +import { AdminUpdateUnconfirmedContribution } from '@model/AdminUpdateUnconfirmedContribution' import { RIGHTS } from '@/auth/RIGHTS' import { UserRepository } from '@repository/User' -import CreatePendingCreationArgs from '@arg/CreatePendingCreationArgs' -import UpdatePendingCreationArgs from '@arg/UpdatePendingCreationArgs' +import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' +import AdminUpdateUnconfirmedContributionArgs from '@arg/AdminUpdateUnconfirmedContributionArgs' import SearchUsersArgs from '@arg/SearchUsersArgs' import { Transaction as DbTransaction } from '@entity/Transaction' import { Transaction } from '@model/Transaction' @@ -167,7 +167,7 @@ export class AdminResolver { @Authorized([RIGHTS.CREATE_PENDING_CREATION]) @Mutation(() => [Number]) async createPendingCreation( - @Args() { email, amount, memo, creationDate }: CreatePendingCreationArgs, + @Args() { email, amount, memo, creationDate }: AdminCreateContributionArgs, @Ctx() context: Context, ): Promise { logger.trace('createPendingCreation...') @@ -202,12 +202,12 @@ export class AdminResolver { } @Authorized([RIGHTS.CREATE_PENDING_CREATION]) - @Mutation(() => CreatePendingCreations) + @Mutation(() => AdminCreateContribution) async createPendingCreations( - @Arg('pendingCreations', () => [CreatePendingCreationArgs]) - contributions: CreatePendingCreationArgs[], + @Arg('pendingCreations', () => [AdminCreateContributionArgs]) + contributions: AdminCreateContributionArgs[], @Ctx() context: Context, - ): Promise { + ): Promise { let success = false const successfulCreation: string[] = [] const failedCreation: string[] = [] @@ -229,11 +229,11 @@ export class AdminResolver { } @Authorized([RIGHTS.UPDATE_PENDING_CREATION]) - @Mutation(() => UpdatePendingCreation) + @Mutation(() => AdminUpdateUnconfirmedContribution) async updatePendingCreation( - @Args() { id, email, amount, memo, creationDate }: UpdatePendingCreationArgs, + @Args() { id, email, amount, memo, creationDate }: AdminUpdateUnconfirmedContributionArgs, @Ctx() context: Context, - ): Promise { + ): Promise { const user = await dbUser.findOne({ email }, { withDeleted: true }) if (!user) { throw new Error(`Could not find user with email: ${email}`) @@ -268,7 +268,7 @@ export class AdminResolver { contributionToUpdate.moderatorId = moderator.id await Contribution.save(contributionToUpdate) - const result = new UpdatePendingCreation() + const result = new AdminUpdateUnconfirmedContribution() result.amount = amount result.memo = contributionToUpdate.memo result.date = contributionToUpdate.contributionDate @@ -279,8 +279,8 @@ export class AdminResolver { } @Authorized([RIGHTS.SEARCH_PENDING_CREATION]) - @Query(() => [PendingContribution]) - async getPendingCreations(): Promise { + @Query(() => [UnconfirmedContribution]) + async getPendingCreations(): Promise { const contributions = await Contribution.find({ where: { confirmedAt: IsNull() } }) if (contributions.length === 0) { return [] From 916706a9736939b228ac8c9539ec433be7779d67 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 15 Jun 2022 08:21:53 +0200 Subject: [PATCH 12/22] fix mutation for admin mass creation --- admin/src/graphql/createPendingCreations.js | 2 +- backend/src/seeds/graphql/mutations.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/graphql/createPendingCreations.js b/admin/src/graphql/createPendingCreations.js index 95d60bc9a..225adb71a 100644 --- a/admin/src/graphql/createPendingCreations.js +++ b/admin/src/graphql/createPendingCreations.js @@ -1,7 +1,7 @@ import gql from 'graphql-tag' export const createPendingCreations = gql` - mutation ($pendingCreations: [CreatePendingCreationArgs!]!) { + mutation ($pendingCreations: [AdminCreateContributionArgs!]!) { createPendingCreations(pendingCreations: $pendingCreations) { success successfulCreation diff --git a/backend/src/seeds/graphql/mutations.ts b/backend/src/seeds/graphql/mutations.ts index e66827566..55c20614b 100644 --- a/backend/src/seeds/graphql/mutations.ts +++ b/backend/src/seeds/graphql/mutations.ts @@ -106,7 +106,7 @@ export const unDeleteUser = gql` ` export const createPendingCreations = gql` - mutation ($pendingCreations: [CreatePendingCreationArgs!]!) { + mutation ($pendingCreations: [AdminCreateContributionArgs!]!) { createPendingCreations(pendingCreations: $pendingCreations) { success successfulCreation From e60f06bb9b969c37d8d519d24dd401a501f1003e Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 15 Jun 2022 08:32:30 +0200 Subject: [PATCH 13/22] rename mutations to create admin contributions --- admin/src/components/CreationFormular.spec.js | 14 ++--- admin/src/components/CreationFormular.vue | 16 +++--- admin/src/graphql/adminCreateContribution.js | 12 +++++ ...eations.js => adminCreateContributions.js} | 4 +- admin/src/graphql/createPendingCreation.js | 7 --- .../graphql/resolver/AdminResolver.test.ts | 54 ++++++++++--------- backend/src/graphql/resolver/AdminResolver.ts | 8 +-- backend/src/seeds/factory/creation.ts | 4 +- backend/src/seeds/graphql/mutations.ts | 13 +++-- 9 files changed, 74 insertions(+), 58 deletions(-) create mode 100644 admin/src/graphql/adminCreateContribution.js rename admin/src/graphql/{createPendingCreations.js => adminCreateContributions.js} (59%) delete mode 100644 admin/src/graphql/createPendingCreation.js diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index 08ec71bdc..6c89ec727 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -1,14 +1,14 @@ import { mount } from '@vue/test-utils' import CreationFormular from './CreationFormular.vue' -import { createPendingCreation } from '../graphql/createPendingCreation' -import { createPendingCreations } from '../graphql/createPendingCreations' +import { adminCreateContribution } from '../graphql/adminCreateContribution' +import { adminCreateContributions } from '../graphql/adminCreateContributions' import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup' const localVue = global.localVue const apolloMutateMock = jest.fn().mockResolvedValue({ data: { - createPendingCreation: [0, 0, 0], + adminCreateContribution: [0, 0, 0], }, }) const stateCommitMock = jest.fn() @@ -110,7 +110,7 @@ describe('CreationFormular', () => { it('sends ... to apollo', () => { expect(apolloMutateMock).toBeCalledWith( expect.objectContaining({ - mutation: createPendingCreation, + mutation: adminCreateContribution, variables: { email: 'benjamin@bluemchen.de', creationDate: getCreationDate(2), @@ -334,7 +334,7 @@ describe('CreationFormular', () => { jest.clearAllMocks() apolloMutateMock.mockResolvedValue({ data: { - createPendingCreations: { + adminCreateContributions: { success: true, successfulCreation: ['bob@baumeister.de', 'bibi@bloxberg.de'], failedCreation: [], @@ -355,7 +355,7 @@ describe('CreationFormular', () => { it('calls the API', () => { expect(apolloMutateMock).toBeCalledWith( expect.objectContaining({ - mutation: createPendingCreations, + mutation: adminCreateContributions, variables: { pendingCreations: [ { @@ -390,7 +390,7 @@ describe('CreationFormular', () => { jest.clearAllMocks() apolloMutateMock.mockResolvedValue({ data: { - createPendingCreations: { + adminCreateContributions: { success: true, successfulCreation: [], failedCreation: ['bob@baumeister.de', 'bibi@bloxberg.de'], diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index cdcd6ef1d..8531eaa16 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -85,8 +85,8 @@