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

move sendNewsletter flag to communication table

Browse source
This commit is contained in:
Julian Krauser 2025-01-25 16:37:52 +01:00
parent b678067874
commit 46ad96c470
12 changed files with 171 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import {
CreateMemberCommand,
DeleteMemberCommand,
UpdateMemberCommand,
UpdateMemberNewsletterCommand,
} from "../../../command/club/member/memberCommand";
import MemberCommandHandler from "../../../command/club/member/memberCommandHandler";
import {
@ -409,6 +408,7 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
const memberId = parseInt(req.params.memberId);
const preferred = req.body.preferred;
const isSMSAlarming = req.body.isSMSAlarming;
const isSendNewsletter = req.body.isNewsletterMain;
const mobile = req.body.mobile;
const email = req.body.email;
const postalCode = req.body.postalCode;
@ -417,11 +417,11 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
const streetNumber = req.body.streetNumber;
const streetNumberAddition = req.body.streetNumberAddition;
const typeId = req.body.typeId;
const isNewsletterMain = req.body.isNewsletterMain;
let createCommunication: CreateCommunicationCommand = {
preferred,
isSMSAlarming,
isSendNewsletter,
mobile,
email,
postalCode,
@ -434,14 +434,6 @@ export async function addCommunicationToMember(req: Request, res: Response): Pro
};
let id = await CommunicationCommandHandler.create(createCommunication);
if (isNewsletterMain) {
let updateNewsletter: UpdateMemberNewsletterCommand = {
id: memberId,
communicationId: id,
};
await MemberCommandHandler.updateNewsletter(updateNewsletter);
}
res.sendStatus(204);
}
@ -595,6 +587,7 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
const recordId = parseInt(req.params.recordId);
const preferred = req.body.preferred;
const isSMSAlarming = req.body.isSMSAlarming;
const isSendNewsletter = req.body.isNewsletterMain;
const mobile = req.body.mobile;
const email = req.body.email;
const postalCode = req.body.postalCode;
@ -602,12 +595,12 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
const street = req.body.street;
const streetNumber = req.body.streetNumber;
const streetNumberAddition = req.body.streetNumberAddition;
const isNewsletterMain = req.body.isNewsletterMain;
let updateCommunication: UpdateCommunicationCommand = {
id: recordId,
preferred,
isSMSAlarming,
isSendNewsletter,
mobile,
email,
postalCode,
@ -619,18 +612,6 @@ export async function updateCommunicationOfMember(req: Request, res: Response):
};
await CommunicationCommandHandler.update(updateCommunication);
let currentUserNewsletterMain = await MemberService.getNewsletterById(memberId);
if (isNewsletterMain) {
let updateNewsletter: UpdateMemberNewsletterCommand = {
id: memberId,
communicationId: recordId,
};
await MemberCommandHandler.updateNewsletter(updateNewsletter);
} else if (currentUserNewsletterMain.sendNewsletter?.id == recordId) {
await MemberCommandHandler.unsetNewsletter(memberId);
}
res.sendStatus(204);
}