Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 14 Pull requests Projects Releases 24 Packages Wiki Activity Actions

Merge pull request 'patches v1.3.9' (#81) from develop into main

Browse source 
Reviewed-on: #81
This commit is contained in:
Julian Krauser 2025-04-07 13:33:30 +00:00
commit edf509afae
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/service/club/member/memberService.ts
View file

@ -1,4 +1,4 @@
import { SelectQueryBuilder } from "typeorm"; import { Brackets, Like, SelectQueryBuilder } from "typeorm";
import { dataSource } from "../../../data-source"; import { dataSource } from "../../../data-source";
import { member } from "../../../entity/club/member/member"; import { member } from "../../../entity/club/member/member";
import { membership } from "../../../entity/club/member/membership"; import { membership } from "../../../entity/club/member/membership";
@ -28,19 +28,29 @@ export default abstract class MemberService {
let query = this.applyMemberBaseJoins(); let query = this.applyMemberBaseJoins();
if (search != "") { if (search != "") {
search.split(" ").forEach((term, index) => { let searchBits = search.split(" ");
const searchQuery = `%${term}%`;
const dynamic = "searchQuery" + Math.random().toString(36).substring(2); if (searchBits.length < 2) {
if (index == 0) { query = query.where(`member.firstname LIKE :searchQuery OR member.lastname LIKE :searchQuery`, {
query = query.where(`member.firstname LIKE :${dynamic} OR member.lastname LIKE :${dynamic}`, { searchQuery: `%${searchBits[0]}%`,
[dynamic]: searchQuery, });
} else {
searchBits
.flatMap((v, i) => searchBits.slice(i + 1).map((w) => [v, w]))
.forEach((term) => {
query = query
.orWhere(
new Brackets((qb) =>
qb.where({ firstname: Like(`%${term[0]}%`) }).andWhere({ lastname: Like(`%${term[1]}%`) })
)
)
.orWhere(
new Brackets((qb) =>
qb.where({ firstname: Like(`%${term[1]}%`) }).andWhere({ lastname: Like(`%${term[0]}%`) })
)
);
}); });
} else { }
query = query.orWhere(`member.firstname LIKE :${dynamic} OR member.lastname LIKE :${dynamic}`, {
[dynamic]: searchQuery,
});
}
});
} }
if (ids.length != 0) { if (ids.length != 0) {