This commit is contained in:
einhornimmond 2025-12-19 14:18:42 +01:00
parent 4368530f6e
commit 9349943925
2 changed files with 5 additions and 4 deletions

View File

@ -20,19 +20,18 @@ export class Contribution extends UnconfirmedContribution {
this.updatedAt = dbContribution.updatedAt this.updatedAt = dbContribution.updatedAt
this.updatedBy = dbContribution.updatedBy this.updatedBy = dbContribution.updatedBy
this.resubmissionAt = dbContribution.resubmissionAt this.resubmissionAt = dbContribution.resubmissionAt
if( ContributionStatus.CONFIRMED === dbContribution.contributionStatus) { if (ContributionStatus.CONFIRMED === dbContribution.contributionStatus) {
this.closedAt = dbContribution.confirmedAt this.closedAt = dbContribution.confirmedAt
this.closedBy = dbContribution.confirmedBy this.closedBy = dbContribution.confirmedBy
} else if (ContributionStatus.DELETED === dbContribution.contributionStatus) { } else if (ContributionStatus.DELETED === dbContribution.contributionStatus) {
this.closedAt = dbContribution.deletedAt this.closedAt = dbContribution.deletedAt
this.closedBy = dbContribution.deletedBy this.closedBy = dbContribution.deletedBy
} else if (ContributionStatus.DENIED === dbContribution.contributionStatus ) { } else if (ContributionStatus.DENIED === dbContribution.contributionStatus) {
this.closedAt = dbContribution.deniedAt this.closedAt = dbContribution.deniedAt
this.closedBy = dbContribution.deniedBy this.closedBy = dbContribution.deniedBy
} }
} }
@Field(() => Date, { nullable: true }) @Field(() => Date, { nullable: true })
closedAt?: Date | null closedAt?: Date | null

View File

@ -67,7 +67,9 @@ export const findContributions = async (
qb.orWhere('user.first_name LIKE :firstName', { firstName: queryString }) qb.orWhere('user.first_name LIKE :firstName', { firstName: queryString })
.orWhere('user.last_name LIKE :lastName', { lastName: queryString }) .orWhere('user.last_name LIKE :lastName', { lastName: queryString })
.orWhere('user.alias LIKE :alias', { alias: queryString }) .orWhere('user.alias LIKE :alias', { alias: queryString })
.orWhere("LOWER(CONCAT(user.first_name, ' ', user.last_name)) LIKE LOWER(:fullName)", { fullName: queryString.toLowerCase() }) .orWhere("LOWER(CONCAT(user.first_name, ' ', user.last_name)) LIKE LOWER(:fullName)", {
fullName: queryString.toLowerCase(),
})
.orWhere('emailContact.email LIKE :emailContact', { emailContact: queryString }) .orWhere('emailContact.email LIKE :emailContact', { emailContact: queryString })
.orWhere({ memo: Like(queryString) }) .orWhere({ memo: Like(queryString) })
} }