IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into frontend-generate-link-for-send-gdd

Browse Source
This commit is contained in:
Alexander Friedland 2022-03-09 19:40:39 +01:00 committed by GitHub
commit 85e39a47af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/graphql/model/TransactionLink.ts
View File

@ -40,6 +40,9 @@ export class TransactionLink {
@Field(() => Date)
createdAt: Date
@Field(() => Date, { nullable: true })
deletedAt: Date | null
@Field(() => Date)
validUntil: Date

2
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -12,7 +12,7 @@ import CONFIG from '@/config'
import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail'
// import { klicktippSignIn } from '@/apis/KlicktippController'
jest.setTimeout(10000)
jest.setTimeout(1000000)
jest.mock('@/mailer/sendAccountActivationEmail', () => {
return {

5
database/entity/0030-transaction_link/TransactionLink.ts
View File

@ -1,5 +1,5 @@
import Decimal from 'decimal.js-light'
import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
@Entity('transaction_links')
@ -41,6 +41,9 @@ export class TransactionLink extends BaseEntity {
})
createdAt: Date
@DeleteDateColumn()
deletedAt?: Date | null
@Column({
type: 'datetime',
nullable: false,

1
database/migrations/0030-transaction_link.ts
View File

@ -13,6 +13,7 @@ export async function upgrade(queryFn: (query: string, values?: any[]) => Promis
\`memo\` varchar(255) NOT NULL,
\`code\` varchar(24) NOT NULL,
\`createdAt\` datetime NOT NULL,
\`deletedAt\` datetime DEFAULT NULL,
\`validUntil\` datetime NOT NULL,
\`showEmail\` boolean NOT NULL DEFAULT false,
\`redeemedAt\` datetime,