Merge branch 'develop' into milestone/ff-admin-unit

src/controller/admin/club/memberController.ts

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

src/routes/invite.ts

@@ -10,7 +10,7 @@ router.post("/verify", ParamaterPassCheckHelper.requiredIncludedMiddleware(["mai
 
 router.put(
   "/",
-  ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine "]),
+  ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]),
   async (req, res) => {
     await finishInvite(req, res);
   }

src/routes/setup.ts

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

src/service/club/member/membershipService.ts

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