Merge pull request 'dev' (#53) from dev into main

Reviewed-on: #53

.gitignore

@@ -94,8 +94,6 @@ dist
 /android-app/**/build/
 /android-app/local.properties
 /android-app/gradle-local.properties
-# Android Play Store / release artifacts are generated locally or in CI.
-/android-app/**/*.aab
 # JVM Heap-Dumps sind lokale Diagnoseartefakte und dürfen nie ins Repository.
 *.hprof
 

android-app/app/src/main/java/de/harheimertc/data/ApiService.kt

@@ -283,7 +283,6 @@ data class PushTokenRequest(
     val token: String,
     val platform: String = "android",
     val appVersion: String? = null,
-    val installationId: String? = null,
 )
 data class BirthdayDto(
     val name: String = "",

android-app/app/src/main/java/de/harheimertc/notifications/HarheimerMessagingService.kt

@@ -21,7 +21,7 @@ class HarheimerMessagingService : FirebaseMessagingService() {
     override fun onNewToken(token: String) {
         super.onNewToken(token)
         serviceScope.launch {
-            pushTokenRepository.registerCurrentDevice()
+            pushTokenRepository.registerToken(token)
         }
     }
 

android-app/app/src/main/java/de/harheimertc/notifications/HarheimerNotifications.kt

@@ -81,7 +81,6 @@ object HarheimerNotifications {
         "news", "news_expiring" -> Destinations.MemberNews.route
         "event", "events_today", "events_tomorrow" -> Destinations.Termine.route
         "team_matches" -> Destinations.Spielplan.route
-        "qttr_list_updated", "ttr_change" -> Destinations.Qttr.route
         "birthdays" -> Destinations.MemberArea.route
         "contact_request" -> Destinations.CmsContactRequests.route
         "user_registration" -> Destinations.CmsBenutzer.route

android-app/app/src/main/java/de/harheimertc/repositories/PushTokenRepository.kt

@@ -1,7 +1,6 @@
 package de.harheimertc.repositories
 
 import android.util.Log
-import com.google.firebase.installations.FirebaseInstallations
 import com.google.firebase.messaging.FirebaseMessaging
 import de.harheimertc.BuildConfig
 import de.harheimertc.data.ApiService
@@ -16,18 +15,16 @@ class PushTokenRepository @Inject constructor(
 ) {
     suspend fun registerCurrentDevice(): Result<Unit> = runCatching {
         val token = FirebaseMessaging.getInstance().token.await()
-        val installationId = FirebaseInstallations.getInstance().id.await()
-        registerToken(token, installationId).getOrThrow()
+        registerToken(token).getOrThrow()
     }
 
-    suspend fun registerToken(token: String, installationId: String? = null): Result<Unit> = runCatching {
+    suspend fun registerToken(token: String): Result<Unit> = runCatching {
         if (token.isBlank()) return@runCatching
         retryOnNetworkFailure {
             val response = api.registerPushToken(
                 PushTokenRequest(
                     token = token,
                     appVersion = "${BuildConfig.VERSION_NAME}+${BuildConfig.VERSION_CODE}",
-                    installationId = installationId,
                 ),
             )
             if (!response.isSuccessful) {

android-app/gradle.properties

@@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/
 PRODUCTION_API_BASE_URL=https://harheimertc.de/
 
 # Android app versioning for Play Store uploads
-ANDROID_VERSION_CODE=36
-ANDROID_VERSION_NAME=0.10.0
+ANDROID_VERSION_CODE=35
+ANDROID_VERSION_NAME=0.9.30
 
 # Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping.
 RELEASE_MINIFY_ENABLED=false

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harheimertc-website",
-  "version": "1.8.10",
+  "version": "1.8.9",
   "description": "Moderne Webseite für den Harheimer Tischtennis Club",
   "private": true,
   "type": "module",

pages/mitgliederbereich/qttr.vue

@@ -46,7 +46,7 @@
             <thead class="bg-gray-50">
               <tr>
                 <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">
-                  Vereinsrang<br>(QTTR / TTR)
+                  Rang
                 </th>
                 <th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">
                   Spieler
@@ -69,9 +69,7 @@
                 :class="isOwnRow(row.playerName) ? 'bg-primary-100' : ''"
               >
                 <td class="px-4 py-3 text-sm text-gray-600">
-                  <span :title="clubRankTitle(row)">
-                    {{ formatClubRank(row) }}
-                  </span>
+                  {{ row.rank ?? '–' }}
                 </td>
                 <td class="px-4 py-3">
                   <div :class="['font-medium', getPlayerNameClass(row)]">
@@ -135,20 +133,6 @@ function isOwnRow(playerName) {
   return normalizeName(playerName) === current
 }
 
-function formatClubRank(row) {
-  const qttrRank = row.clubQttrRank
-  const ttrRank = row.clubTtrRank
-  if (qttrRank == null) return '–'
-  return ttrRank == null ? String(qttrRank) : `${qttrRank} (${ttrRank})`
-}
-
-function clubRankTitle(row) {
-  if (row.clubQttrRank == null) return 'Keine QTTR-Platzierung verfügbar'
-  return row.clubTtrRank == null
-    ? `QTTR-Platzierung im Verein: ${row.clubQttrRank}`
-    : `QTTR-Platzierung im Verein: ${row.clubQttrRank}; TTR-Platzierung im Verein: ${row.clubTtrRank}`
-}
-
 function getPlayerNameClass(row) {
   const minor = isMinor(row.birthdate)
   if (minor && isMaleGender(row.gender)) return 'text-blue-400'

server/api/mitgliederbereich/qttr.get.js

@@ -37,26 +37,6 @@ function buildBirthdateLookup(entries) {
   return lookup
 }
 
-function addClubRanks(rows) {
-  const addRankFor = (valueKey, rankKey) => {
-    rows
-      .filter((row) => row[valueKey] != null)
-      .sort((a, b) => b[valueKey] - a[valueKey] || String(a.playerName || '').localeCompare(String(b.playerName || ''), 'de'))
-      .forEach((row, index) => {
-        row[rankKey] = index + 1
-      })
-  }
-
-  addRankFor('currentQttr', 'clubQttrRank')
-  addRankFor('currentTtr', 'clubTtrRank')
-
-  return rows.sort((a, b) =>
-    (a.clubQttrRank ?? Number.POSITIVE_INFINITY) - (b.clubQttrRank ?? Number.POSITIVE_INFINITY)
-    || (a.clubTtrRank ?? Number.POSITIVE_INFINITY) - (b.clubTtrRank ?? Number.POSITIVE_INFINITY)
-    || String(a.playerName || '').localeCompare(String(b.playerName || ''), 'de')
-  )
-}
-
 export default defineEventHandler(async (event) => {
   const token = getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
   if (!token || !verifyToken(token)) {
@@ -93,16 +73,16 @@ export default defineEventHandler(async (event) => {
     ].flatMap(entry => [entry?.name, `${entry?.firstName || ''} ${entry?.lastName || ''}`.trim()]).map(normalizeName).filter(Boolean))
     const birthdateLookup = buildBirthdateLookup([...visibleManualMembers, ...visibleUsers])
 
-    const rankedRows = addClubRanks(Array.isArray(payload.rows) ? payload.rows.map(row => ({ ...row })) : [])
-
     return {
       ...payload,
-      rows: rankedRows
+      rows: Array.isArray(payload.rows)
+        ? payload.rows
             .filter(row => !hiddenNames.has(normalizeName(row.playerName)))
             .map((row) => ({
               ...row,
               birthdate: birthdateLookup.get(normalizeName(row.playerName)) || row.birthdate || ''
             }))
+        : []
     }
   } catch (error) {
     if (error?.code === 'ENOENT') {
@@ -118,4 +98,4 @@ export default defineEventHandler(async (event) => {
       message: 'Fehler beim Laden der QTTR-Werte.'
     })
   }
-})
+})

server/api/profile/push-token.post.js

@@ -22,8 +22,7 @@ export default defineEventHandler(async (event) => {
   upsertPushToken(users[userIndex], {
     token: body.token,
     platform: body.platform || 'android',
-    appVersion: body.appVersion || null,
-    installationId: body.installationId || null
+    appVersion: body.appVersion || null
   })
   await writeUsers(users)
   return { success: true, message: 'Push-Token gespeichert.' }

server/utils/push-notifications.js

@@ -85,21 +85,16 @@ function pushTokensForUser(user) {
     : []
 }
 
-export function upsertPushToken(user, { token, platform = 'android', appVersion = null, installationId = null }) {
+export function upsertPushToken(user, { token, platform = 'android', appVersion = null }) {
   const normalizedToken = String(token || '').trim()
   if (!normalizedToken) return user
-  const normalizedInstallationId = String(installationId || '').trim().slice(0, 200) || null
   const now = new Date().toISOString()
   const tokens = Array.isArray(user.pushTokens) ? user.pushTokens : []
-  // A Firebase token can rotate for the same app installation. Retain tokens
-  // from other devices, but replace the previous token of this installation.
-  const next = tokens.filter(entry => entry?.token !== normalizedToken &&
-    (!normalizedInstallationId || entry?.installationId !== normalizedInstallationId))
+  const next = tokens.filter(entry => entry?.token !== normalizedToken)
   next.push({
     token: normalizedToken,
     platform: String(platform || 'android').slice(0, 30),
     appVersion: appVersion ? String(appVersion).slice(0, 80) : null,
-    installationId: normalizedInstallationId,
     updatedAt: now,
     createdAt: tokens.find(entry => entry?.token === normalizedToken)?.createdAt || now
   })
@@ -334,19 +329,6 @@ export async function sendOwnTtrChangePush(changes = []) {
   })
 }
 
-export async function sendQttrListUpdatedPush({ importedAt, rowCount }) {
-  return sendPushToUsers({
-    title: 'QTTR-Liste aktualisiert',
-    body: `Die aktuelle TTR- und QTTR-Liste wurde aktualisiert (${rowCount} Einträge).`,
-    data: {
-      type: 'qttr_list_updated',
-      importedAt: importedAt || '',
-      notificationId: notificationIdFor(`qttr-list:${importedAt || Date.now()}`)
-    },
-    failureLabel: 'FCM QTTR-Listen-Push'
-  })
-}
-
 export async function sendTestPushToUser(userId) {
   return sendPushToUsers({
     title: 'Harheimer TC: Push-Test',

server/utils/qttr-import.js

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs'
 import { getServerDataPath } from './paths.js'
-import { sendOwnTtrChangePush, sendQttrListUpdatedPush } from './push-notifications.js'
+import { sendOwnTtrChangePush } from './push-notifications.js'
 import { fetchClubRankings } from './mytischtennis-client.js'
 import { readMyTischtennisConnection, saveMyTischtennisConnection } from './mytischtennis-connection.js'
 
@@ -67,26 +67,6 @@ function normalizeGender(value) {
   return normalized || null
 }
 
-function addClubRanks(rows) {
-  const addRankFor = (valueKey, rankKey) => {
-    rows
-      .filter((row) => row[valueKey] != null)
-      .sort((a, b) => b[valueKey] - a[valueKey] || String(a.playerName || '').localeCompare(String(b.playerName || ''), 'de'))
-      .forEach((row, index) => {
-        row[rankKey] = index + 1
-      })
-  }
-
-  addRankFor('currentQttr', 'clubQttrRank')
-  addRankFor('currentTtr', 'clubTtrRank')
-
-  return rows.sort((a, b) =>
-    (a.clubQttrRank ?? Number.POSITIVE_INFINITY) - (b.clubQttrRank ?? Number.POSITIVE_INFINITY)
-    || (a.clubTtrRank ?? Number.POSITIVE_INFINITY) - (b.clubTtrRank ?? Number.POSITIVE_INFINITY)
-    || String(a.playerName || '').localeCompare(String(b.playerName || ''), 'de')
-  )
-}
-
 function extractTableBlocks(html) {
   return [...String(html || '').matchAll(/<table\b[^>]*>[\s\S]*?<\/table>/gi)].map((match) => match[0])
 }
@@ -210,7 +190,7 @@ export async function importQttrValues(options = {}) {
     throw new Error('QTTR-Tabelle ist leer oder unvollständig')
   }
 
-  const parsedRows = addClubRanks(rows.map((cells) => deriveQttrFields(headers, cells)))
+  const parsedRows = rows.map((cells) => deriveQttrFields(headers, cells))
   const payload = {
     format: 'harheimertc.qttr.v1',
     importedAt: new Date().toISOString(),
@@ -263,11 +243,7 @@ async function importAuthenticatedTtrValues(connection) {
   })
   }).filter(row => row.playerName && (row.currentTtr != null || row.currentQttr != null))
 
-  addClubRanks(rows)
-
   if (!rows.length) throw new Error('Keine verwertbaren TTR-Werte in der myTischtennis-Rangliste gefunden.')
-  const previousQttrSignature = qttrListSignature(previousPayload.rows)
-  const nextQttrSignature = qttrListSignature(rows)
   const importedAt = new Date().toISOString()
   const payload = {
     format: 'harheimertc.qttr.v2', importedAt,
@@ -286,21 +262,6 @@ async function importAuthenticatedTtrValues(connection) {
       : []
   })
   await sendOwnTtrChangePush(changes)
-  if (previousQttrSignature && previousQttrSignature !== nextQttrSignature) {
-    await sendQttrListUpdatedPush({ importedAt, rowCount: rows.length })
-  }
   await saveMyTischtennisConnection({ ...connection, lastSuccessfulImportAt: importedAt, lastImportError: null })
   return { outputFile: OUTPUT_FILE, tableCount: 1, ...payload }
 }
-
-function qttrListSignature(rows) {
-  if (!Array.isArray(rows) || rows.length === 0) return ''
-  return rows
-    .map(row => [
-      String(row?.playerName || '').trim().toLocaleLowerCase('de-DE'),
-      row?.rank ?? '',
-      row?.currentQttr ?? ''
-    ].join('|'))
-    .sort()
-    .join('\n')
-}

tests/config-profile-endpoints.spec.ts

@@ -247,7 +247,7 @@ describe('Config & Profil Endpoints', () => {
 
     it('speichert Android-Push-Token am Benutzer', async () => {
       const event = createEvent({ headers: { authorization: 'Bearer android-token' } })
-      mockSuccessReadBody({ token: 'fcm-token', platform: 'android', appVersion: '1.0+1', installationId: 'firebase-installation-id' })
+      mockSuccessReadBody({ token: 'fcm-token', platform: 'android', appVersion: '1.0+1' })
       const users = [{ id: '1', email: 'max@test.de', roles: ['mitglied'] }]
       authUtils.verifyToken.mockReturnValue({ id: '1' })
       authUtils.getUserFromToken.mockResolvedValue(users[0])
@@ -260,7 +260,7 @@ describe('Config & Profil Endpoints', () => {
       expect(authUtils.writeUsers).toHaveBeenCalledWith([
         expect.objectContaining({
           id: '1',
-          pushTokens: [expect.objectContaining({ token: 'fcm-token', platform: 'android', appVersion: '1.0+1', installationId: 'firebase-installation-id' })]
+          pushTokens: [expect.objectContaining({ token: 'fcm-token', platform: 'android', appVersion: '1.0+1' })]
         })
       ])
     })