feat: add userMetadata actions to userResource

front/lib/api/user.ts

@@ -10,7 +10,6 @@ import { Err, Ok } from "@dust-tt/types";
 import type { Authenticator } from "@app/lib/auth";
 import { Workspace } from "@app/lib/models/workspace";
 import { ExtensionConfigurationResource } from "@app/lib/resources/extension";
-import { UserMetadataModel } from "@app/lib/resources/storage/models/user";
 import { UserResource } from "@app/lib/resources/user_resource";
 import { renderLightWorkspaceType } from "@app/lib/workspace";
 import logger from "@app/logger/logger";
@@ -59,12 +58,7 @@ export async function getUserMetadata(
   user: UserType,
   key: string
 ): Promise<UserMetadataType | null> {
-  const metadata = await UserMetadataModel.findOne({
-    where: {
-      userId: user.id,
-      key,
-    },
-  });
+  const metadata = await UserResource.getMetadata(user.id, key);
 
   if (!metadata) {
     return null;
@@ -86,24 +80,7 @@ export async function setUserMetadata(
   user: UserType,
   update: UserMetadataType
 ): Promise<void> {
-  const metadata = await UserMetadataModel.findOne({
-    where: {
-      userId: user.id,
-      key: update.key,
-    },
-  });
-
-  if (!metadata) {
-    await UserMetadataModel.create({
-      userId: user.id,
-      key: update.key,
-      value: update.value,
-    });
-    return;
-  }
-
-  metadata.value = update.value;
-  await metadata.save();
+  await UserResource.setMetadata(user.id, update.key, update.value);
 }
 
 export async function fetchRevokedWorkspace(

front/lib/resources/user_resource.ts

@@ -12,7 +12,10 @@ import { Op } from "sequelize";
 import type { Authenticator } from "@app/lib/auth";
 import { BaseResource } from "@app/lib/resources/base_resource";
 import { MembershipModel } from "@app/lib/resources/storage/models/membership";
-import { UserModel } from "@app/lib/resources/storage/models/user";
+import {
+  UserMetadataModel,
+  UserModel,
+} from "@app/lib/resources/storage/models/user";
 import type { ReadonlyAttributesType } from "@app/lib/resources/storage/types";
 
 export interface SearchMembersPaginationParams {
@@ -211,6 +214,55 @@ export class UserResource extends BaseResource<UserModel> {
     }
   }
 
+  static async getMetadata(userId: ModelId, key: string) {
+    return UserMetadataModel.findOne({
+      where: {
+        userId,
+        key,
+      },
+    });
+  }
+
+  static async getAllMetadata(users: ModelId[]) {
+    return UserMetadataModel.findAll({
+      where: {
+        userId: {
+          [Op.in]: users,
+        },
+      },
+      raw: true,
+    });
+  }
+
+  static async setMetadata(userId: ModelId, key: string, value: string) {
+    const metadata = await UserMetadataModel.findOne({
+      where: {
+        userId,
+        key,
+      },
+    });
+
+    if (!metadata) {
+      await UserMetadataModel.create({
+        userId,
+        key,
+        value,
+      });
+      return;
+    }
+
+    metadata.value = value;
+    await metadata.save();
+  }
+
+  static async deleteMetadata(userId: ModelId) {
+    return UserMetadataModel.destroy({
+      where: {
+        userId,
+      },
+    });
+  }
+
   fullName(): string {
     return [this.firstName, this.lastName].filter(Boolean).join(" ");
   }

front/poke/temporal/activities.ts

@@ -60,7 +60,6 @@ import {
   LabsTranscriptsHistoryModel,
 } from "@app/lib/resources/storage/models/labs_transcripts";
 import { PlatformActionsConfigurationModel } from "@app/lib/resources/storage/models/platform_actions";
-import { UserMetadataModel } from "@app/lib/resources/storage/models/user";
 import { TrackerConfigurationResource } from "@app/lib/resources/tracker_resource";
 import { UserResource } from "@app/lib/resources/user_resource";
 import { renderLightWorkspaceType } from "@app/lib/workspace";
@@ -429,11 +428,7 @@ export async function deleteMembersActivity({
 
       // If the user we're removing the membership of only has one membership, we delete the user.
       if (membershipsOfUser.length === 1) {
-        await UserMetadataModel.destroy({
-          where: {
-            userId: user.id,
-          },
-        });
+        await UserResource.deleteMetadata(user.id);
         hardDeleteLogger.info(
           {
             membershipId: membership.id,

front/temporal/relocation/activities/source_region/front/sql.ts

@@ -7,10 +7,7 @@ import { getWorkspaceInfos } from "@app/lib/api/workspace";
 import { Workspace } from "@app/lib/models/workspace";
 import { MembershipResource } from "@app/lib/resources/membership_resource";
 import { frontSequelize } from "@app/lib/resources/storage";
-import {
-  UserMetadataModel,
-  UserModel,
-} from "@app/lib/resources/storage/models/user";
+import { UserModel } from "@app/lib/resources/storage/models/user";
 import { renderLightWorkspaceType } from "@app/lib/workspace";
 import logger from "@app/logger/logger";
 import type {
@@ -21,6 +18,7 @@ import type {
 import { writeToRelocationStorage } from "@app/temporal/relocation/lib/file_storage/relocation";
 import { generateParameterizedInsertStatements } from "@app/temporal/relocation/lib/sql/insert";
 import { getTopologicalOrder } from "@app/temporal/relocation/lib/sql/schema/dependencies";
+import { UserResource } from "@app/lib/resources/user_resource";
 
 export async function readCoreEntitiesFromSourceRegion({
   destRegion,
@@ -67,14 +65,9 @@ export async function readCoreEntitiesFromSourceRegion({
   });
 
   // Fetch all associated users metadata of the workspace.
-  const userMetadata = await UserMetadataModel.findAll({
-    where: {
-      userId: {
-        [Op.in]: memberships.map((m) => m.userId),
-      },
-    },
-    raw: true,
-  });
+  const userMetadata = await UserResource.getAllMetadata(
+    memberships.map((m) => m.userId)
+  );
 
   const subscriptions = await frontSequelize.query<{ planId: ModelId }>(
     'SELECT * FROM subscriptions WHERE "workspaceId" = :workspaceId',