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

patches v1.0.1 #38

Merged
jkeffects merged 4 commits from develop into main 2025-01-10 11:10:01 +00:00
Conversation 0 Commits 4 Files changed 7 +14 -11
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 03cc0f02b7 - Show all commits

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

@ -120,17 +120,20 @@ export default abstract class MemberService {
*/ */
static async getByRunningMembership(): Promise<Array<member>> { static async getByRunningMembership(): Promise<Array<member>> {
return await dataSource return await dataSource
.getRepository(member) .getRepository(member)
.createQueryBuilder("member") .createQueryBuilder("member")
.leftJoinAndSelect("member.memberships", "membership") .leftJoinAndSelect("member.memberships", "membership")
.where("membership.end IS NULL") .where("membership.end IS NULL")
.getMany() .orderBy("member.lastname")
.then((res) => { .addOrderBy("member.firstname")
return res; .addOrderBy("member.nameaffix")
}) .getMany()
.catch((err) => { .then((res) => {
throw new InternalException("member not found by id", err); return res;
}); })
.catch((err) => {
throw new InternalException("member not found by id", err);
});
} }
/** /**