diff --git a/src/helpers/demoDataHelper.ts b/src/helpers/demoDataHelper.ts index b577eb7..d5fd27e 100644 --- a/src/helpers/demoDataHelper.ts +++ b/src/helpers/demoDataHelper.ts @@ -12,6 +12,16 @@ export abstract class DemoDataHelper { return newsletterDemoData; case "member": return memberDemoData; + case "listprint": + return { + today: new Date(), + list: [memberDemoData.memberships], + }; + case "listprint.member": + return { + today: new Date(), + list: [memberDemoData.member], + }; default: return {}; } diff --git a/src/service/club/member/memberService.ts b/src/service/club/member/memberService.ts index bcac6c6..b6f4d5c 100644 --- a/src/service/club/member/memberService.ts +++ b/src/service/club/member/memberService.ts @@ -30,10 +30,12 @@ export default abstract class MemberService { if (searchBits.length < 2) { query = query.where( - `member.firstname ILIKE :searchQuery OR member.lastname ILIKE :searchQuery OR member.internalId ILIKE :searchQuery`, - { - searchQuery: `%${searchBits[0]}%`, - } + new Brackets((qb) => + qb + .where({ firstname: ILike(`%${searchBits[0]}%`) }) + .orWhere({ lastname: ILike(`%${searchBits[0]}%`) }) + .orWhere({ internalId: ILike(`%${searchBits[0]}%`) }) + ) ); } else { searchBits