Benachrichtigungen erweitert
Emails korrigiert
This commit is contained in:
@@ -1,5 +1,22 @@
|
||||
import { getUserFromToken, hasAnyRole } from '../utils/auth.js'
|
||||
import { saveMember } from '../utils/members.js'
|
||||
import { getUserFromToken, hasAnyRole, readUsers, writeUsers, normalizeUserEmail } from '../utils/auth.js'
|
||||
import { readMembers, saveMember } from '../utils/members.js'
|
||||
|
||||
function requestedBirthdayVisibility(body) {
|
||||
return body?.visibility?.showBirthday ?? body?.showBirthday
|
||||
}
|
||||
|
||||
function birthdayVisibilityIsTrue(value) {
|
||||
return value === true || value === 'true'
|
||||
}
|
||||
|
||||
function resolveAdminBirthdayVisibility({ requested, existingManualMember, existingUser }) {
|
||||
if (requested === false || requested === 'false') return false
|
||||
|
||||
const existingValue = existingUser?.visibility?.showBirthday ?? existingManualMember?.visibility?.showBirthday
|
||||
if (existingValue === true) return true
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
try {
|
||||
@@ -39,7 +56,7 @@ export default defineEventHandler(async (event) => {
|
||||
}
|
||||
|
||||
const body = await readBody(event)
|
||||
const { id, firstName, lastName, geburtsdatum, email, phone, address, notes, isMannschaftsspieler, hasHallKey, hasHallenschluessel, active } = body
|
||||
const { id, firstName, lastName, geburtsdatum, email, phone, address, notes, isMannschaftsspieler, hasHallKey, hasHallenschluessel, active, visibility } = body
|
||||
|
||||
if (!firstName || !lastName) {
|
||||
throw createError({
|
||||
@@ -56,6 +73,23 @@ export default defineEventHandler(async (event) => {
|
||||
}
|
||||
|
||||
try {
|
||||
const [members, users] = await Promise.all([readMembers(), readUsers()])
|
||||
const normalizedEmail = normalizeUserEmail(email)
|
||||
const existingManualMember = members.find(member => {
|
||||
if (id && member.id === id) return true
|
||||
return normalizedEmail && normalizeUserEmail(member.email) === normalizedEmail
|
||||
})
|
||||
const userIndex = users.findIndex(user => {
|
||||
if (id && user.id === id) return true
|
||||
return normalizedEmail && normalizeUserEmail(user.email) === normalizedEmail
|
||||
})
|
||||
const existingUser = userIndex !== -1 ? users[userIndex] : null
|
||||
const nextShowBirthday = resolveAdminBirthdayVisibility({
|
||||
requested: requestedBirthdayVisibility(body),
|
||||
existingManualMember,
|
||||
existingUser
|
||||
})
|
||||
|
||||
await saveMember({
|
||||
id: id || undefined,
|
||||
firstName,
|
||||
@@ -67,9 +101,21 @@ export default defineEventHandler(async (event) => {
|
||||
notes: notes || '',
|
||||
isMannschaftsspieler: isMannschaftsspieler === true || isMannschaftsspieler === 'true',
|
||||
hasHallKey: hasHallKey === true || hasHallKey === 'true' || hasHallenschluessel === true || hasHallenschluessel === 'true',
|
||||
visibility: {
|
||||
...(visibility && typeof visibility === 'object' ? visibility : {}),
|
||||
showBirthday: nextShowBirthday
|
||||
},
|
||||
active: typeof active === 'boolean' ? active : true
|
||||
})
|
||||
|
||||
if (userIndex !== -1 && (!birthdayVisibilityIsTrue(requestedBirthdayVisibility(body)) || existingUser?.visibility?.showBirthday === true)) {
|
||||
users[userIndex].visibility = {
|
||||
...(users[userIndex].visibility || {}),
|
||||
showBirthday: nextShowBirthday
|
||||
}
|
||||
await writeUsers(users)
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: 'Mitglied erfolgreich gespeichert.'
|
||||
@@ -98,4 +144,3 @@ export default defineEventHandler(async (event) => {
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user