Merge remote-tracking branch 'origin/main' into fix/notifications

# Conflicts:
#	apps/game-client/src/features/settings/components/detector/detector-routing-settings-tab-form.test.tsx
#	apps/game-client/src/i18n/translations/settings.json

Author: Copilot

apps/api/openapi.yaml

@@ -5179,6 +5179,8 @@ components:
                   id:
                     type: string
                     minLength: 1
+                  name:
+                    type: string
                   minLevel:
                     type: number
                     minimum: 0
@@ -5187,6 +5189,8 @@ components:
                     type: number
                     minimum: 0
                     maximum: 500
+                  world:
+                    type: string
                   guildIds:
                     type: array
                     items:
@@ -5416,6 +5420,8 @@ components:
                   id:
                     type: string
                     minLength: 1
+                  name:
+                    type: string
                   minLevel:
                     type: number
                     minimum: 0
@@ -5424,6 +5430,8 @@ components:
                     type: number
                     minimum: 0
                     maximum: 500
+                  world:
+                    type: string
                   guildIds:
                     type: array
                     items:

apps/api/src/shared/dto/user-account-preferences-response.dto.ts

@@ -21,8 +21,10 @@ const NotificationsSettingsSchema = z.object({
 
 const DetectorRoutingRuleSchema = z.object({
   id: z.string().min(1),
+  name: z.string().optional(),
   minLevel: z.number().min(0).max(500),
   maxLevel: z.number().min(0).max(500),
+  world: z.string().optional(),
   guildIds: z.array(z.string()),
 });
 

apps/api/src/users/dto/update-user-account-preferences.dto.ts

@@ -12,8 +12,10 @@ const PartialNotificationSettingsSchema = z.object({
 
 const DetectorRoutingRuleSchema = z.object({
   id: z.string().min(1),
+  name: z.string().optional(),
   minLevel: z.number().min(0).max(500),
   maxLevel: z.number().min(0).max(500),
+  world: z.string().optional(),
   guildIds: z.array(z.string()),
 });
 

apps/api/src/users/users.service.spec.ts

@@ -488,8 +488,10 @@ describe("UsersService", () => {
           routingRules: [
             {
               id: "hero-range-1",
+              name: "Hero route",
               minLevel: 100,
               maxLevel: 200,
+              world: "pandora",
               guildIds: ["guild-2"],
             },
           ],
@@ -513,8 +515,10 @@ describe("UsersService", () => {
             routingRules: [
               {
                 id: "hero-range-1",
+                name: "Hero route",
                 minLevel: 100,
                 maxLevel: 200,
+                world: "pandora",
                 guildIds: ["guild-2"],
               },
             ],
@@ -533,8 +537,10 @@ describe("UsersService", () => {
         routingRules: [
           {
             id: "hero-range-1",
+            name: "Hero route",
             minLevel: 100,
             maxLevel: 200,
+            world: "pandora",
             guildIds: ["guild-2"],
           },
         ],
@@ -564,6 +570,7 @@ describe("UsersService", () => {
               id: "",
               minLevel: 220,
               maxLevel: 120,
+              world: "  Pandora  ",
               guildIds: ["guild-1", 123, "guild-2"],
             },
           ],
@@ -586,6 +593,7 @@ describe("UsersService", () => {
             id: "rule-1",
             minLevel: 120,
             maxLevel: 220,
+            world: "Pandora",
             guildIds: ["guild-1", "guild-2"],
           },
         ],
@@ -597,6 +605,71 @@ describe("UsersService", () => {
     });
   });
 
+  it("trims detector routing rule names and keeps old rules without name", async () => {
+    mockPrismaService.userGameAccountSettings.findUnique.mockResolvedValue({
+      id: 10,
+      userId: "auth-user-current",
+      accountId: "444",
+      settings: {
+        detector: {
+          HERO: {
+            detect: true,
+            notifyWindow: true,
+            highlight: true,
+            notifySound: false,
+          },
+          routingRules: [
+            {
+              id: "rule-with-name",
+              name: "  Bossy hero  ",
+              minLevel: 100,
+              maxLevel: 200,
+              guildIds: ["guild-1"],
+            },
+            {
+              id: "rule-without-name",
+              minLevel: 210,
+              maxLevel: 300,
+              guildIds: ["guild-2"],
+            },
+          ],
+        },
+      },
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    });
+
+    const result = await service.getUserGameAccountPreferences(
+      "auth-user-current",
+      "444",
+    );
+
+    expect(result).toEqual({
+      accountId: "444",
+      detector: expect.objectContaining({
+        routingRules: [
+          {
+            id: "rule-with-name",
+            name: "Bossy hero",
+            minLevel: 100,
+            maxLevel: 200,
+            guildIds: ["guild-1"],
+          },
+          {
+            id: "rule-without-name",
+            minLevel: 210,
+            maxLevel: 300,
+            guildIds: ["guild-2"],
+          },
+        ],
+      }),
+      hasStoredDetector: true,
+      hasStoredNotifications: false,
+      hasStoredPreferences: true,
+      notifications: defaultNotificationsSettings,
+    });
+  });
+
   it("deletes auth-owned and discord-owned records with the correct identifiers", async () => {
     await service.deleteAccount({
       authUserId: "auth-user-current",

apps/api/src/users/users.service.ts

@@ -773,14 +773,19 @@ export class UsersService {
       );
       const minLevel = Math.min(normalizedMinLevel, normalizedMaxLevel);
       const maxLevel = Math.max(normalizedMinLevel, normalizedMaxLevel);
+      const name = typeof rule.name === "string" ? rule.name.trim() : undefined;
+      const world =
+        typeof rule.world === "string" ? rule.world.trim() : undefined;
 
       acc.push({
         id:
           typeof rule.id === "string" && rule.id.length > 0
             ? rule.id
             : `rule-${index + 1}`,
+        name: name && name.length > 0 ? name : undefined,
         minLevel,
         maxLevel,
+        world: world && world.length > 0 ? world : undefined,
         guildIds: Array.isArray(rule.guildIds)
           ? rule.guildIds.filter(
               (guildId): guildId is string => typeof guildId === "string",