feat: move user flags to table

Author: brage-andreas

apps/rpc/src/modules/event/attendance-repository.ts

@@ -102,6 +102,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -129,6 +130,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -165,6 +167,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -208,6 +211,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -237,6 +241,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -266,6 +271,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -295,6 +301,7 @@ export function getAttendanceRepository(): AttendanceRepository {
               user: {
                 include: {
                   memberships: true,
+                  flags: true,
                 },
               },
             },
@@ -375,6 +382,7 @@ export function getAttendanceRepository(): AttendanceRepository {
           user: {
             include: {
               memberships: true,
+              flags: true,
             },
           },
         },
@@ -400,6 +408,7 @@ export function getAttendanceRepository(): AttendanceRepository {
           user: {
             include: {
               memberships: true,
+              flags: true,
             },
           },
         },
@@ -418,6 +427,7 @@ export function getAttendanceRepository(): AttendanceRepository {
           user: {
             include: {
               memberships: true,
+              flags: true,
             },
           },
         },
@@ -436,6 +446,7 @@ export function getAttendanceRepository(): AttendanceRepository {
           user: {
             include: {
               memberships: true,
+              flags: true,
             },
           },
         },

apps/rpc/src/modules/user/__test__/user-merging.spec.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto"
 import type { DBHandle } from "@dotkomonline/db"
-import { GenderSchema, type Membership, type User } from "@dotkomonline/types"
+import { GenderSchema, type Membership, type User, type UserFlag } from "@dotkomonline/types"
 import { beforeEach, describe, expect, it, type vi } from "vitest"
 import { mockDeep } from "vitest-mock-extended"
 import type { GroupRepository } from "../../group/group-repository"
@@ -42,6 +42,18 @@ function makeMembership(userId: string, overrides: Partial<Membership> = {}): Me
   }
 }
 
+function makeUserFlag(overrides: Partial<UserFlag> = {}): UserFlag {
+  return {
+    id: randomUUID(),
+    name: randomUUID(),
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    description: null,
+    imageUrl: null,
+    ...overrides,
+  }
+}
+
 describe("mergeUsers", () => {
   let handle: ReturnType<typeof mockDeep<DBHandle>>
   let groupRepository: ReturnType<typeof mockDeep<GroupRepository>>
@@ -113,15 +125,60 @@ describe("mergeUsers", () => {
     })
   })
 
-  describe("flags custom merger", () => {
-    it("concatenates and deduplicates flags from both users", async () => {
-      const survivor = makeUser({ flags: ["a", "b"] })
-      const consumed = makeUser({ flags: ["b", "c"] })
+  describe("flags custom relation merger", () => {
+    it("connects consumed flags that are not already attached to survivor", async () => {
+      const sharedFlag = makeUserFlag({ name: "shared" })
+      const survivorFlag = makeUserFlag({ name: "survivor" })
+      const consumedFlag = makeUserFlag({ name: "consumed" })
+      const survivor = makeUser({ flags: [survivorFlag, sharedFlag] })
+      const consumed = makeUser({ flags: [sharedFlag, consumedFlag] })
 
       await mergeUsers(handle, groupRepository, survivor, consumed)
 
-      const [[updateArgs]] = (handle.user.update as ReturnType<typeof vi.fn>).mock.calls
-      expect(new Set(updateArgs.data.flags)).toEqual(new Set(["a", "b", "c"]))
+      expect(handle.user.update).toHaveBeenCalledWith({
+        where: {
+          id: survivor.id,
+        },
+        data: {
+          flags: {
+            connect: [{ id: consumedFlag.id }],
+          },
+        },
+      })
+    })
+
+    it("does not connect flags when consumed only has duplicates", async () => {
+      const sharedFlag = makeUserFlag({ name: "shared" })
+      const survivor = makeUser({ flags: [sharedFlag] })
+      const consumed = makeUser({ flags: [sharedFlag] })
+
+      await mergeUsers(handle, groupRepository, survivor, consumed)
+
+      const updateCalls = (handle.user.update as ReturnType<typeof vi.fn>).mock.calls
+      expect(updateCalls).not.toEqual(
+        expect.arrayContaining([
+          [
+            expect.objectContaining({
+              data: expect.objectContaining({
+                flags: expect.objectContaining({
+                  connect: expect.any(Array),
+                }),
+              }),
+            }),
+          ],
+        ])
+      )
+    })
+
+    it("does not write flags as a scalar array", async () => {
+      const survivor = makeUser({ flags: [makeUserFlag({ name: "survivor" })] })
+      const consumed = makeUser({ flags: [makeUserFlag({ name: "consumed" })] })
+
+      await mergeUsers(handle, groupRepository, survivor, consumed)
+
+      for (const [updateArgs] of (handle.user.update as ReturnType<typeof vi.fn>).mock.calls) {
+        expect(Array.isArray(updateArgs.data.flags)).toBe(false)
+      }
     })
   })
 

apps/rpc/src/modules/user/user-merging.ts

@@ -28,7 +28,7 @@ import { simplifyGroupMemberships } from "../group/group-service"
 //          1. Add a { fkField, relationName, deleteOrphan } entry.
 //
 //    CUSTOM_SCALAR_MERGERS
-//      - Scalars that need special logic (e.g. username, flags).
+//      - Scalars that need special logic (e.g. username).
 //      - What you need to do:
 //          1. Add the field to the object.
 //          2. Add a function value.
@@ -42,7 +42,7 @@ import { simplifyGroupMemberships } from "../group/group-service"
 //                User relation name as the key.
 //
 //    CUSTOM_RELATION_MERGERS
-//      - Relations needing deduplication logic (memberships, group memberships).
+//      - Relations needing deduplication logic (flags, memberships, group memberships).
 //      - What you need to do:
 //          1. Add the field to the object.
 //          2. Add a handler function.
@@ -120,9 +120,6 @@ const CUSTOM_SCALAR_MERGERS = {
   // it's a custom username).
   username: (survivor: User, consumed: User): string =>
     isUuid(survivor.username) && !isUuid(consumed.username) ? consumed.username : survivor.username,
-
-  // Concatenate and deduplicate
-  flags: (survivor: User, consumed: User): string[] => [...new Set([...survivor.flags, ...consumed.flags])],
 } satisfies Partial<Record<AllUserKeys, (survivor: User, consumed: User) => unknown>>
 
 /**
@@ -192,6 +189,26 @@ const REASSIGN_RELATION_HANDLERS = {
  * Relations with custom merge logic (deduplication).
  */
 const CUSTOM_RELATION_MERGERS = {
+  flags: async (handle: DBHandle, _groupRepository: GroupRepository, survivor: User, consumed: User) => {
+    const survivorFlagIds = new Set(survivor.flags.map((flag) => flag.id))
+    const consumedFlagsToConnect = consumed.flags
+      .filter((flag) => !survivorFlagIds.has(flag.id))
+      .map((flag) => ({ id: flag.id }))
+
+    if (consumedFlagsToConnect.length > 0) {
+      await handle.user.update({
+        where: {
+          id: survivor.id,
+        },
+        data: {
+          flags: {
+            connect: consumedFlagsToConnect,
+          },
+        },
+      })
+    }
+  },
+
   memberships: async (handle: DBHandle, _groupRepository: GroupRepository, survivor: User, consumed: User) => {
     const survivorMembershipKeys = new Set(survivor.memberships.map(buildMembershipDeduplicationKey))