dotkom · brage-andreas · Apr 1, 2026
diff --git a/apps/rpc/src/modules/user/user-repository.ts b/apps/rpc/src/modules/user/user-repository.ts
@@ -9,6 +9,9 @@ import {
   type UserProfileSlug,
   UserSchema,
   type UserWrite,
+  type UserFlagWithUsers,
+  UserFlagWithUsersSchema,
+  type UserFlagWrite,
 } from "@dotkomonline/types"
 import invariant from "tiny-invariant"
 import { parseOrReport } from "../../invariant"
@@ -33,6 +36,14 @@ export interface UserRepository {
   createMembership(handle: DBHandle, userId: UserId, membership: MembershipWrite): Promise<User>
   updateMembership(handle: DBHandle, membershipId: MembershipId, membership: Partial<MembershipWrite>): Promise<User>
   deleteMembership(handle: DBHandle, membershipId: MembershipId): Promise<User>
+
+  createFlag(handle: DBHandle, data: UserFlagWrite): Promise<void>
+  updateFlag(handle: DBHandle, name: string, data: Partial<UserFlagWrite>): Promise<void>
+  deleteFlag(handle: DBHandle, name: string): Promise<void>
+  findFlagByName(handle: DBHandle, name: string): Promise<UserFlagWithUsers | null>
+  findFlagsByUserId(handle: DBHandle, userId: UserId): Promise<UserFlagWithUsers[]>
+  assignFlagToUser(handle: DBHandle, userId: UserId, flagName: string): Promise<void>
+  removeFlagFromUser(handle: DBHandle, userId: UserId, flagName: string): Promise<void>
 }
 
 export function getUserRepository(): UserRepository {
@@ -51,6 +62,7 @@ export function getUserRepository(): UserRepository {
         },
         include: {
           memberships: true,
+          flags: true,
         },
       })
 
@@ -80,6 +92,7 @@ export function getUserRepository(): UserRepository {
         },
         include: {
           memberships: true,
+          flags: true,
         },
       })
 
@@ -93,6 +106,7 @@ export function getUserRepository(): UserRepository {
         },
         include: {
           memberships: true,
+          flags: true,
         },
       })
 
@@ -110,6 +124,7 @@ export function getUserRepository(): UserRepository {
         },
         include: {
           memberships: true,
+          flags: true,
         },
       })
 
@@ -129,6 +144,7 @@ export function getUserRepository(): UserRepository {
         where,
         include: {
           memberships: true,
+          flags: true,
         },
       })
 
@@ -183,5 +199,110 @@ export function getUserRepository(): UserRepository {
       invariant(user !== null, `User with id ${row.userId} not found after deleting membership`)
       return user
     },
+
+    async createFlag(handle, data) {
+      await handle.userFlag.create({
+        data: {
+          name: data.name,
+          description: data.description,
+          imageUrl: data.imageUrl,
+        },
+      })
+    },
+
+    async updateFlag(handle, name, data) {
+      await handle.userFlag.update({
+        where: {
+          name,
+        },
+        data: {
+          name: data.name,
+          description: data.description,
+          imageUrl: data.imageUrl,
+        },
+      })
+    },
+
+    async deleteFlag(handle, name) {
+      await handle.userFlag.delete({
+        where: {
+          name,
+        },
+      })
+    },
+
+    async findFlagByName(handle, name) {
+      const flag = await handle.userFlag.findUnique({
+        where: {
+          name,
+        },
+        include: {
+          users: {
+            select: {
+              id: true,
+              name: true,
+              profileSlug: true,
+              imageUrl: true,
+            },
+          },
+        },
+      })
+
+      return parseOrReport(UserFlagWithUsersSchema.nullable(), flag)
+    },
+
+    async findFlagsByUserId(handle, userId) {
+      const flags = await handle.userFlag.findMany({
+        where: {
+          users: {
+            some: {
+              id: userId,
+            },
+          },
+        },
+        include: {
+          users: {
+            select: {
+              id: true,
+              name: true,
+              profileSlug: true,
+              imageUrl: true,
+            },
+          },
+        },
+      })
+
+      return parseOrReport(UserFlagWithUsersSchema.array(), flags)
+    },
+
+    async assignFlagToUser(handle, userId, flagName) {
+      await handle.user.update({
+        where: {
+          id: userId,
+        },
+        data: {
+          flags: {
+            connect: {
+              name: flagName,
+            },
+          },
+        },
+      })
+    },
+
+    async removeFlagFromUser(handle, userId, flagName) {
+      await handle.user.update({
+        where: {
+          id: userId,
+        },
+        data: {
+          flags: {
+            disconnect: {
+              name: flagName,
+            },
+          },
+        },
+      })
+    },
   }
 }
diff --git a/apps/rpc/src/modules/user/user-service.ts b/apps/rpc/src/modules/user/user-service.ts
@@ -16,6 +16,8 @@ import {
   type UserWrite,
   UserWriteSchema,
   findActiveMembership,
+  type UserFlagWithUsers,
+  type UserFlagWrite,
 } from "@dotkomonline/types"
 import { createS3PresignedPost, slugify, getNextSemesterStart, getCurrentSemesterStart } from "@dotkomonline/utils"
 import { trace } from "@opentelemetry/api"
@@ -80,6 +82,14 @@ export interface UserService {
   updateMembership(handle: DBHandle, membershipId: MembershipId, membership: Partial<MembershipWrite>): Promise<User>
   deleteMembership(handle: DBHandle, membershipId: MembershipId): Promise<User>
 
+  createFlag(handle: DBHandle, data: UserFlagWrite): Promise<void>
+  updateFlag(handle: DBHandle, flagName: string, data: Partial<UserFlagWrite>): Promise<void>
+  deleteFlag(handle: DBHandle, flagName: string): Promise<void>
+  findFlagByName(handle: DBHandle, flagName: string): Promise<UserFlagWithUsers | null>
+  findFlagsByUserId(handle: DBHandle, userId: UserId): Promise<UserFlagWithUsers[]>
+  assignFlagToUser(handle: DBHandle, userId: UserId, flagName: string): Promise<void>
+  removeFlagFromUser(handle: DBHandle, userId: UserId, flagName: string): Promise<void>
+
   /**
    * Find the Feide federated access token for a user, if it exists.
    *
@@ -493,6 +503,34 @@ export function getUserService(
       return identity?.access_token ?? null
     },
 
+    async createFlag(handle, data) {
+      return userRepository.createFlag(handle, data)
+    },
+
+    async updateFlag(handle, flagName, data) {
+      return userRepository.updateFlag(handle, flagName, data)
+    },
+
+    async deleteFlag(handle, flagName) {
+      return userRepository.deleteFlag(handle, flagName)
+    },
+
+    async findFlagByName(handle, flagName) {
+      return userRepository.findFlagByName(handle, flagName)
+    },
+
+    async findFlagsByUserId(handle, userId) {
+      return userRepository.findFlagsByUserId(handle, userId)
+    },
+
+    async assignFlagToUser(handle, userId, flagName) {
+      return userRepository.assignFlagToUser(handle, userId, flagName)
+    },
+
+    async removeFlagFromUser(handle, userId, flagName) {
+      return userRepository.removeFlagFromUser(handle, userId, flagName)
+    },
+
     async createFileUpload(handle, filename, contentType, userId, createdByUserId) {
       const user = await this.getById(handle, userId)
 

diff --git a/packages/db/prisma/migrations/20260401120753_move_user_flags_to_table/migration.sql b/packages/db/prisma/migrations/20260401120753_move_user_flags_to_table/migration.sql
@@ -0,0 +1,40 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `flags` on the `ow_user` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "ow_user" DROP COLUMN "flags";
+
+-- CreateTable
+CREATE TABLE "user_flag" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "created_at" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updated_at" TIMESTAMPTZ(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "description" TEXT,
+    "image_url" TEXT,
+
+    CONSTRAINT "user_flag_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "_UserFlags" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL,
+
+    CONSTRAINT "_UserFlags_AB_pkey" PRIMARY KEY ("A","B")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_flag_name_key" ON "user_flag"("name");
+
+-- CreateIndex
+CREATE INDEX "_UserFlags_B_index" ON "_UserFlags"("B");
+
+-- AddForeignKey
+ALTER TABLE "_UserFlags" ADD CONSTRAINT "_UserFlags_A_fkey" FOREIGN KEY ("A") REFERENCES "ow_user"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_UserFlags" ADD CONSTRAINT "_UserFlags_B_fkey" FOREIGN KEY ("B") REFERENCES "user_flag"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
@@ -73,6 +73,19 @@ model Membership {
   @@map("membership")
 }
 
+model UserFlag {
+  id          String   @id @default(uuid())
+  name        String   @unique
+  createdAt   DateTime @default(now()) @map("created_at") @db.Timestamptz(3)
+  updatedAt   DateTime @default(now()) @updatedAt @map("updated_at") @db.Timestamptz(3)
+  description String?
+  imageUrl    String?  @map("image_url")
+
+  users User[] @relation("UserFlags")
+
+  @@map("user_flag")
+}
+
 model User {
   /// OpenID Connect Subject claim - for this reason there is no @default(uuid()) here.
   id                  String   @id
@@ -85,7 +98,6 @@ model User {
   gender              String?
   dietaryRestrictions String?  @map("dietary_restrictions")
   ntnuUsername        String?  @map("ntnu_username")
-  flags               String[]
   /// Used for identifying the user in Google Workspace (my.name@online.ntnu.no)
   workspaceUserId     String?  @unique @map("workspace_user_id")
   createdAt           DateTime @default(now()) @map("created_at") @db.Timestamptz(3)
@@ -107,6 +119,7 @@ model User {
   notificationsReceived NotificationRecipient[]
   notificationsCreated  Notification[]          @relation("created_by")
   notificationsUpdated  Notification[]          @relation("last_updated_by")
+  flags                 UserFlag[]              @relation("UserFlags")
 
   @@map("ow_user")
 }

diff --git a/packages/db/src/fixtures/user.ts b/packages/db/src/fixtures/user.ts
@@ -13,7 +13,6 @@ export const getUserFixtures = () =>
       gender: "Mann",
       dietaryRestrictions: "Vegetarianer",
       ntnuUsername: null,
-      flags: [],
       privacyPermissionsId: null,
       notificationPermissionsId: null,
     },
@@ -28,7 +27,6 @@ export const getUserFixtures = () =>
       gender: "Kvinne",
       dietaryRestrictions: null,
       ntnuUsername: null,
-      flags: [],
       privacyPermissionsId: null,
       notificationPermissionsId: null,
     },
@@ -42,7 +40,6 @@ export const getUserFixtures = () =>
       phone: null,
       gender: null,
       dietaryRestrictions: "Har dårlig reaksjon mot gluten",
-      flags: [],
       privacyPermissionsId: null,
       notificationPermissionsId: null,
     },

diff --git a/packages/types/src/user.ts b/packages/types/src/user.ts
@@ -24,13 +24,35 @@ export const MembershipWriteSchema = MembershipSchema.pick({
 })
 export type MembershipWrite = z.infer<typeof MembershipWriteSchema>
 
+export const UserFlagSchema = schemas.UserFlagSchema.extend({})
+export type UserFlag = z.infer<typeof UserFlagSchema>
+export type UserFlagId = UserFlag["id"]
+
+export const UserFlagWriteSchema = UserFlagSchema.pick({
+  name: true,
+  description: true,
+  imageUrl: true,
+})
+export type UserFlagWrite = z.infer<typeof UserFlagWriteSchema>
+
 export const UserSchema = schemas.UserSchema.extend({
   memberships: z.array(MembershipSchema),
+  flags: z.array(UserFlagSchema),
 })
 export type User = z.infer<typeof UserSchema>
 export type UserId = User["id"]
 export type UserProfileSlug = User["profileSlug"]
 
+export const UserFlagWithUsersSchema = schemas.UserFlagSchema.extend({
+  users: UserSchema.pick({
+    id: true,
+    name: true,
+    profileSlug: true,
+    imageUrl: true,
+  }).array(),
+})
+export type UserFlagWithUsers = z.infer<typeof UserFlagWithUsersSchema>
+
 export const NAME_REGEX = /^[\p{L}\p{M}\s'-]+$/u
 export const PHONE_REGEX = /^[0-9-+\s]*$/
 export const PROFILE_SLUG_REGEX = /^[a-z0-9-]+$/