From 2594a607dc4315a8fdfe42c8b961b6c3a30b4428 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Sat, 2 Jan 2021 18:30:03 +0100 Subject: [PATCH] Added address check for donors that want a receipt on update ref #65 --- src/models/actions/CreateDonor.ts | 2 +- src/models/actions/UpdateDonor.ts | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/models/actions/CreateDonor.ts b/src/models/actions/CreateDonor.ts index bf4e206..25a631c 100644 --- a/src/models/actions/CreateDonor.ts +++ b/src/models/actions/CreateDonor.ts @@ -29,7 +29,7 @@ export class CreateDonor extends CreateParticipant { newDonor.address = await this.getAddress(); newDonor.receiptNeeded = this.receiptNeeded; - if (this.receiptNeeded == true && this.email == "" && this.address == null) { + if (this.receiptNeeded == true && this.address == null) { throw new DonorReceiptAddressNeededError() } diff --git a/src/models/actions/UpdateDonor.ts b/src/models/actions/UpdateDonor.ts index 9ace6f9..b7139c8 100644 --- a/src/models/actions/UpdateDonor.ts +++ b/src/models/actions/UpdateDonor.ts @@ -1,4 +1,5 @@ import { IsBoolean, IsInt, IsOptional } from 'class-validator'; +import { DonorReceiptAddressNeededError } from '../../errors/DonorErrors'; import { Donor } from '../entities/Donor'; import { CreateParticipant } from './CreateParticipant'; @@ -34,6 +35,10 @@ export class UpdateDonor extends CreateParticipant { donor.receiptNeeded = this.receiptNeeded; donor.address = await this.getAddress(); + if (this.receiptNeeded == true && this.address == null) { + throw new DonorReceiptAddressNeededError() + } + return donor; } } \ No newline at end of file