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

member base data extend

Browse source
This commit is contained in:
Julian Krauser 2024-09-17 16:44:39 +02:00
parent 80b1b5cf62
commit e4e5f6dffb
7 changed files with 37 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/service/memberService.ts
View file

@ -26,6 +26,15 @@ export default abstract class MemberService {
)
.leftJoinAndSelect("membership_first.status", "status_first")
.leftJoinAndSelect("membership_last.status", "status_last")
.leftJoinAndSelect("member.sendNewsletter", "communication")
.leftJoinAndSelect("communication.type", "communicationtype")
.leftJoinAndMapMany(
"member.preferredCommunication",
"member.communications",
"preferredCommunication",
"preferredCommunication.preferred = TRUE"
)
.leftJoinAndSelect("preferredCommunication.type", "communicationtype_preferred")
.offset(offset)
.limit(count)
.orderBy("member.lastname")

4
src/service/membershipService.ts
View file

@ -12,7 +12,7 @@ export default abstract class MembershipService {
return await dataSource
.getRepository(membership)
.createQueryBuilder("membership")
.leftJoinAndSelect("membership.membership", "membership")
.leftJoinAndSelect("membership.status", "membershipStatus")
.where("membership.memberId = :memberId", { memberId: memberId })
.getMany()
.then((res) => {
@ -33,7 +33,7 @@ export default abstract class MembershipService {
return await dataSource
.getRepository(membership)
.createQueryBuilder("membership")
.leftJoinAndSelect("membership.membership", "membership")
.leftJoinAndSelect("membership.status", "membershipStatus")
.where("membership.memberId = :memberId", { memberId: memberId })
.andWhere("membership.id = :recordId", { recordId: recordId })
.getOneOrFail()