Implemented the possibility ofa hidden user for playstore tests

server/utils/newsletter.js

@@ -1,7 +1,7 @@
 import fs from 'fs/promises'
 import path from 'path'
 import { readMembers } from './members.js'
-import { readUsers } from './auth.js'
+import { readUsers, isHiddenUser, normalizeUserEmail } from './auth.js'
 import { encryptObject, decryptObject } from './encryption.js'
 import crypto from 'crypto'
 import { writeDataFileWithRotation } from './data-file-rotation.js'
@@ -162,11 +162,11 @@ function calculateAge(geburtsdatum) {
   }
 }
 
-// Filtert den Admin-User aus Empfängerliste heraus
-function filterAdminUser(recipients) {
+// Filtert interne System-/Hidden-Accounts aus Empfängerliste heraus
+function filterInternalUsers(recipients, hiddenEmails = new Set()) {
   return recipients.filter(r => {
-    const email = (r.email || '').toLowerCase().trim()
-    return email !== 'admin@harheimertc.de'
+    const email = normalizeUserEmail(r.email)
+    return email && email !== 'admin@harheimertc.de' && !hiddenEmails.has(email)
   })
 }
 
@@ -174,20 +174,26 @@ function filterAdminUser(recipients) {
 export async function getRecipientsByGroup(targetGroup) {
   const members = await readMembers()
   const users = await readUsers()
+  const hiddenUserEmails = new Set(users.filter(isHiddenUser).map(user => normalizeUserEmail(user.email)).filter(Boolean))
+  const visibleUsers = users.filter(user => !isHiddenUser(user))
+  const visibleMembers = members.filter(member => {
+    const email = normalizeUserEmail(member.email)
+    return member.hidden !== true && member.invisible !== true && member.isHidden !== true && !hiddenUserEmails.has(email)
+  })
   
   let recipients = []
 
   switch (targetGroup) {
     case 'alle':
       // Alle Mitglieder mit E-Mail
-      recipients = members
+      recipients = visibleMembers
         .filter(m => m.email && m.email.trim() !== '')
         .map(m => ({
           email: m.email,
           name: `${m.firstName || ''} ${m.lastName || ''}`.trim() || m.name || ''
         }))
       // Auch alle aktiven Benutzer hinzufügen
-      users
+      visibleUsers
         .filter(u => u.active && u.email)
         .forEach(u => {
           if (!recipients.find(r => r.email.toLowerCase() === u.email.toLowerCase())) {
@@ -201,7 +207,7 @@ export async function getRecipientsByGroup(targetGroup) {
 
     case 'erwachsene':
       // Mitglieder über 18 Jahre
-      recipients = members
+      recipients = visibleMembers
         .filter(m => {
           if (!m.email || !m.email.trim()) return false
           const age = calculateAge(m.geburtsdatum)
@@ -212,7 +218,7 @@ export async function getRecipientsByGroup(targetGroup) {
           name: `${m.firstName || ''} ${m.lastName || ''}`.trim() || m.name || ''
         }))
       // Auch aktive Benutzer hinzufügen (als Erwachsene behandelt, wenn kein Geburtsdatum)
-      users
+      visibleUsers
         .filter(u => u.active && u.email && u.email.trim())
         .forEach(u => {
           // Prüfe ob bereits vorhanden
@@ -227,7 +233,7 @@ export async function getRecipientsByGroup(targetGroup) {
 
     case 'nachwuchs':
       // Mitglieder unter 18 Jahre
-      recipients = members
+      recipients = visibleMembers
         .filter(m => {
           if (!m.email || !m.email.trim()) return false
           const age = calculateAge(m.geburtsdatum)
@@ -239,7 +245,7 @@ export async function getRecipientsByGroup(targetGroup) {
         }))
 
       // Zusätzlich aktive Trainer aus users.json anschreiben
-      users
+      visibleUsers
         .filter(u => {
           if (!u.active || !u.email || !u.email.trim()) return false
           const roles = Array.isArray(u.roles) ? u.roles : (u.role ? [u.role] : [])
@@ -257,7 +263,7 @@ export async function getRecipientsByGroup(targetGroup) {
 
     case 'mannschaftsspieler':
       // Mitglieder die in einer Mannschaft spielen
-      recipients = members
+      recipients = visibleMembers
         .filter(m => {
           if (!m.email || !m.email.trim()) return false
           // Prüfe ob als Mannschaftsspieler markiert
@@ -276,7 +282,7 @@ export async function getRecipientsByGroup(targetGroup) {
 
     case 'vorstand':
       // Nur Vorstand (aus users.json)
-      recipients = users
+      recipients = visibleUsers
         .filter(u => {
           if (!u.active || !u.email) return false
           const roles = Array.isArray(u.roles) ? u.roles : (u.role ? [u.role] : [])
@@ -293,12 +299,13 @@ export async function getRecipientsByGroup(targetGroup) {
   }
 
   // Admin-User herausfiltern
-  return filterAdminUser(recipients)
+  return filterInternalUsers(recipients, hiddenUserEmails)
 }
 
 // Holt Newsletter-Abonnenten (bestätigt und nicht abgemeldet)
 export async function getNewsletterSubscribers(internalOnly = false, groupId = null) {
   const subscribers = await readSubscribers()
+  const hiddenUserEmails = new Set((await readUsers()).filter(isHiddenUser).map(user => normalizeUserEmail(user.email)).filter(Boolean))
   
   let confirmedSubscribers = subscribers.filter(s => {
     if (!s.confirmed || s.unsubscribedAt) {
@@ -329,12 +336,12 @@ export async function getNewsletterSubscribers(internalOnly = false, groupId = n
     const members = await readMembers()
     const memberEmails = new Set(
       members
-        .filter(m => m.email)
-        .map(m => m.email.toLowerCase())
+        .filter(m => m.email && m.hidden !== true && m.invisible !== true && m.isHidden !== true && !hiddenUserEmails.has(normalizeUserEmail(m.email)))
+        .map(m => normalizeUserEmail(m.email))
     )
     
     confirmedSubscribers = confirmedSubscribers.filter(s => 
-      memberEmails.has(s.email.toLowerCase())
+      memberEmails.has(normalizeUserEmail(s.email))
     )
   }
 
@@ -344,7 +351,7 @@ export async function getNewsletterSubscribers(internalOnly = false, groupId = n
   }))
   
   // Admin-User herausfiltern
-  return filterAdminUser(result)
+  return filterInternalUsers(result, hiddenUserEmails)
 }
 
 // Generiert Abmelde-Token für Abonnenten