Compare commits
No commits in common. "main" and "v1.7.5" have entirely different histories.
6 changed files with 7 additions and 8 deletions
4
package-lock.json
generated
4
package-lock.json
generated
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "ff-admin-server",
|
"name": "ff-admin-server",
|
||||||
"version": "1.7.6",
|
"version": "1.7.5",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "ff-admin-server",
|
"name": "ff-admin-server",
|
||||||
"version": "1.7.6",
|
"version": "1.7.5",
|
||||||
"license": "AGPL-3.0-only",
|
"license": "AGPL-3.0-only",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"cors": "^2.8.5",
|
"cors": "^2.8.5",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "ff-admin-server",
|
"name": "ff-admin-server",
|
||||||
"version": "1.7.6",
|
"version": "1.7.5",
|
||||||
"description": "Feuerwehr/Verein Mitgliederverwaltung Server",
|
"description": "Feuerwehr/Verein Mitgliederverwaltung Server",
|
||||||
"main": "dist/index.js",
|
"main": "dist/index.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -215,8 +215,7 @@ 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);
|
||||||
|
|
||||||
if (!member) res.sendStatus(204);
|
res.json(MembershipFactory.mapToSingleTotalStatistic(member));
|
||||||
else res.json(MembershipFactory.mapToSingleTotalStatistic(member));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -50,7 +50,7 @@ router.post(
|
||||||
|
|
||||||
router.post(
|
router.post(
|
||||||
"/finish",
|
"/finish",
|
||||||
ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "secret", "routine"]),
|
ParamaterPassCheckHelper.requiredIncludedMiddleware(["mail", "token", "totp"]),
|
||||||
async (req, res) => {
|
async (req, res) => {
|
||||||
await finishInvite(req, res, true);
|
await finishInvite(req, res, true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 })
|
||||||
.getOne()
|
.getOneOrFail()
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
return res;
|
return res;
|
||||||
})
|
})
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue