Fixing the create tags in the new run engine trigger task service

Author: ericallam

apps/webapp/app/models/taskRunTag.server.ts

@@ -1,11 +1,15 @@
 import { prisma } from "~/db.server";
 import { generateFriendlyId } from "~/v3/friendlyIdentifiers";
+import { PrismaClientOrTransaction } from "@trigger.dev/database";
 
 export const MAX_TAGS_PER_RUN = 10;
 
-export async function createTag({ tag, projectId }: { tag: string; projectId: string }) {
+export async function createTag(
+  { tag, projectId }: { tag: string; projectId: string },
+  prismaClient: PrismaClientOrTransaction = prisma
+) {
   if (tag.trim().length === 0) return;
-  return prisma.taskRunTag.upsert({
+  return prismaClient.taskRunTag.upsert({
     where: {
       projectId_name: {
         projectId: projectId,
@@ -21,6 +25,48 @@ export async function createTag({ tag, projectId }: { tag: string; projectId: st
   });
 }
 
+export type TagRecord = {
+  id: string;
+  name: string;
+};
+
+export async function createTags(
+  {
+    tags,
+    projectId,
+  }: {
+    tags: string | string[] | undefined;
+    projectId: string;
+  },
+  prismaClient: PrismaClientOrTransaction = prisma
+): Promise<TagRecord[]> {
+  if (!tags) {
+    return [];
+  }
+
+  const tagsArray = typeof tags === "string" ? [tags] : tags;
+
+  if (tagsArray.length === 0) {
+    return [];
+  }
+
+  const tagRecords: TagRecord[] = [];
+  for (const tag of tagsArray) {
+    const tagRecord = await createTag(
+      {
+        tag,
+        projectId,
+      },
+      prismaClient
+    );
+    if (tagRecord) {
+      tagRecords.push({ id: tagRecord.id, name: tagRecord.name });
+    }
+  }
+
+  return tagRecords;
+}
+
 export async function getTagsForRunId({
   friendlyId,
   environmentId,

apps/webapp/app/runEngine/services/triggerTask.server.ts

@@ -298,20 +298,13 @@ export class RunEngineTriggerTaskService extends WithRunEngine {
                 span.setAttribute("queueName", queueName);
 
                 //upsert tags
-                let tags: { id: string; name: string }[] = [];
-                const bodyTags =
-                  typeof body.options?.tags === "string" ? [body.options.tags] : body.options?.tags;
-
-                if (bodyTags && bodyTags.length > 0) {
-                  const tagRecords = await createTags(
-                    {
-                      tags: bodyTags,
-                      projectId: environment.projectId,
-                    },
-                    this._prisma
-                  );
-                  tags = tagRecords.filter(Boolean).map((tr) => ({ id: tr.id, name: tr.name }));
-                }
+                const tags = await createTags(
+                  {
+                    tags: body.options?.tags,
+                    projectId: environment.projectId,
+                  },
+                  this._prisma
+                );
 
                 const depth = parentRun ? parentRun.depth + 1 : 0;