From 02b1cb9904cc593faeac025ae302a8684f650f5e Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Mon, 28 Apr 2025 19:32:06 +0200 Subject: [PATCH] refactor(donations): Make anon prepaid --- src/models/actions/create/CreateAnonymousDonation.ts | 2 +- src/models/actions/create/CreateDistanceDonation.ts | 6 ++++++ src/models/actions/create/CreateDonation.ts | 7 +------ src/models/actions/create/CreateFixedDonation.ts | 6 ++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/models/actions/create/CreateAnonymousDonation.ts b/src/models/actions/create/CreateAnonymousDonation.ts index 2db5d9c..29bfbc9 100644 --- a/src/models/actions/create/CreateAnonymousDonation.ts +++ b/src/models/actions/create/CreateAnonymousDonation.ts @@ -22,7 +22,7 @@ export class CreateAnonymousDonation extends CreateDonation { let newDonation = new FixedDonation; newDonation.amount = this.amount; - newDonation.paidAmount = this.paidAmount; + newDonation.paidAmount = this.amount; return newDonation; } diff --git a/src/models/actions/create/CreateDistanceDonation.ts b/src/models/actions/create/CreateDistanceDonation.ts index e9920dc..9df2cd8 100644 --- a/src/models/actions/create/CreateDistanceDonation.ts +++ b/src/models/actions/create/CreateDistanceDonation.ts @@ -18,6 +18,12 @@ export class CreateDistanceDonation extends CreateDonation { @IsPositive() donor: number; + /** + * The donation's paid amount in the smalles unit of your currency (default: euro cent). + */ + @IsInt() + paidAmount?: number; + /** * The donation's associated runner's id. * This is important to link the runner's distance ran to the donation. diff --git a/src/models/actions/create/CreateDonation.ts b/src/models/actions/create/CreateDonation.ts index 726fbc4..e54a1be 100644 --- a/src/models/actions/create/CreateDonation.ts +++ b/src/models/actions/create/CreateDonation.ts @@ -1,5 +1,4 @@ import { Exclude } from 'class-transformer'; -import { IsInt, IsOptional } from 'class-validator'; import { getConnection } from 'typeorm'; import { Donation } from '../../entities/Donation'; import { Donor } from '../../entities/Donor'; @@ -11,11 +10,7 @@ export abstract class CreateDonation { @Exclude() donor: number; - /** - * The donation's paid amount in the smalles unit of your currency (default: euro cent). - */ - @IsInt() - @IsOptional() + @Exclude() paidAmount?: number; /** diff --git a/src/models/actions/create/CreateFixedDonation.ts b/src/models/actions/create/CreateFixedDonation.ts index 08c37f3..9721982 100644 --- a/src/models/actions/create/CreateFixedDonation.ts +++ b/src/models/actions/create/CreateFixedDonation.ts @@ -15,6 +15,12 @@ export class CreateFixedDonation extends CreateDonation { @IsPositive() donor: number; + /** + * The donation's paid amount in the smalles unit of your currency (default: euro cent). + */ + @IsInt() + paidAmount?: number; + /** * The donation's amount. * The unit is your currency's smallest unit (default: euro cent).