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

patches v1.7.6 #129

Merged
jkeffects merged 4 commits from develop into main 2025-07-24 06:56:39 +00:00
Conversation 0 Commits 4 Files changed 4 +5 -4
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controller/admin/club/memberController.ts
View file

@ -215,7 +215,8 @@ export async function getMembershipTotalStatisticsById(req: Request, res: Respon
const memberId = req.params.memberId; const memberId = req.params.memberId;
let member = await MembershipService.getTotalStatisticsById(memberId); let member = await MembershipService.getTotalStatisticsById(memberId);
res.json(MembershipFactory.mapToSingleTotalStatistic(member)); if (!member) res.sendStatus(204);
else res.json(MembershipFactory.mapToSingleTotalStatistic(member));
} }
/** /**

2
src/routes/setup.ts
View file

@ -50,7 +50,7 @@ router.post(
router.post( router.post(
"/finish", "/finish",
ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "totp"]), ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]),
async (req, res) => { async (req, res) => {
await finishInvite(req, res, true); await finishInvite(req, res, true);
} }

2
src/service/club/member/membershipService.ts
View file

@ -77,7 +77,7 @@ export default abstract class MembershipService {
.getRepository(membershipTotalView) .getRepository(membershipTotalView)
.createQueryBuilder("membershipTotalView") .createQueryBuilder("membershipTotalView")
.where("membershipTotalView.memberId = :memberId", { memberId: memberId }) .where("membershipTotalView.memberId = :memberId", { memberId: memberId })
.getOneOrFail() .getOne()
.then((res) => { .then((res) => {
return res; return res;
}) })