Normalize API counters in the server mappers instead of route loaders

web-player/src/lib/server/mappers.test.ts

@@ -1,6 +1,16 @@
 import { describe, expect, it } from 'vitest';
 import type { components } from '$lib/api/schema';
-import { toAlbum, toDatedTrack, toLikedTrack, toMix, toPage, toPlaylist, toTrack } from './mappers';
+import {
+	toAlbum,
+	toCount,
+	toDatedTrack,
+	toLikedTrack,
+	toListeningStats,
+	toMix,
+	toPage,
+	toPlaylist,
+	toTrack
+} from './mappers';
 
 const trackDto: components['schemas']['TrackApplicationResponse'] = {
 	id: 't1',
@@ -129,3 +139,29 @@ describe('toPage', () => {
 		).toEqual({ items: [2, 4], pageNumber: 2, hasNextPage: true, totalItemCount: 10 });
 	});
 });
+
+describe('toCount', () => {
+	it('normalizes numbers, numeric strings and missing values', () => {
+		expect(toCount(4)).toBe(4);
+		expect(toCount('12')).toBe(12);
+		expect(toCount(undefined)).toBe(0);
+		expect(toCount(null)).toBe(0);
+		expect(toCount('abc')).toBe(0);
+	});
+});
+
+describe('toListeningStats', () => {
+	it('converts string counters to numbers', () => {
+		expect(
+			toListeningStats({ tracksThisWeek: '5', secondsThisWeek: 300, streakDays: '2' })
+		).toEqual({ tracksThisWeek: 5, secondsThisWeek: 300, streakDays: 2 });
+	});
+
+	it('falls back to zeros without data', () => {
+		expect(toListeningStats(undefined)).toEqual({
+			tracksThisWeek: 0,
+			secondsThisWeek: 0,
+			streakDays: 0
+		});
+	});
+});

web-player/src/lib/server/mappers.ts

@@ -82,6 +82,26 @@ export function toPlaylist(dto: PlaylistDto): Playlist {
 	};
 }
 
+type ListeningStatsDto = components['schemas']['ListeningStatsResponse'];
+
+export interface ListeningStats {
+	tracksThisWeek: number;
+	secondsThisWeek: number;
+	streakDays: number;
+}
+
+export function toCount(value: number | string | null | undefined): number {
+	return Number(value ?? 0) || 0;
+}
+
+export function toListeningStats(dto: ListeningStatsDto | null | undefined): ListeningStats {
+	return {
+		tracksThisWeek: toCount(dto?.tracksThisWeek),
+		secondsThisWeek: toCount(dto?.secondsThisWeek),
+		streakDays: toCount(dto?.streakDays)
+	};
+}
+
 export function toPage<D, T>(dto: PageDto<D>, map: (item: D) => T): Paged<T> {
 	return {
 		items: dto.items.map(map),