Revert "Disable upserting task queues when triggering a task"

matt-aitken · matt-aitken · commit 9a9bdc20c911 · 2024-08-15T20:42:50.000+01:00
This reverts commit 6652edf.
diff --git a/apps/webapp/app/v3/services/triggerTask.server.ts b/apps/webapp/app/v3/services/triggerTask.server.ts
@@ -311,46 +311,46 @@ export class TriggerTaskService extends BaseService {
                     ? Math.max(0, body.options.queue.concurrencyLimit)
                     : undefined;
 
-                // let taskQueue = await tx.taskQueue.findFirst({
-                //   where: {
-                //     runtimeEnvironmentId: environment.id,
-                //     name: queueName,
-                //   },
-                // });
-
-                // if (taskQueue) {
-                //   taskQueue = await tx.taskQueue.update({
-                //     where: {
-                //       id: taskQueue.id,
-                //     },
-                //     data: {
-                //       concurrencyLimit,
-                //       rateLimit: body.options.queue.rateLimit,
-                //     },
-                //   });
-                // } else {
-                //   taskQueue = await tx.taskQueue.create({
-                //     data: {
-                //       friendlyId: generateFriendlyId("queue"),
-                //       name: queueName,
-                //       concurrencyLimit,
-                //       runtimeEnvironmentId: environment.id,
-                //       projectId: environment.projectId,
-                //       rateLimit: body.options.queue.rateLimit,
-                //       type: "NAMED",
-                //     },
-                //   });
-                // }
-
-                // if (typeof taskQueue.concurrencyLimit === "number") {
-                //   await marqs?.updateQueueConcurrencyLimits(
-                //     environment,
-                //     taskQueue.name,
-                //     taskQueue.concurrencyLimit
-                //   );
-                // } else {
-                //   await marqs?.removeQueueConcurrencyLimits(environment, taskQueue.name);
-                // }
+                let taskQueue = await tx.taskQueue.findFirst({
+                  where: {
+                    runtimeEnvironmentId: environment.id,
+                    name: queueName,
+                  },
+                });
+
+                if (taskQueue) {
+                  taskQueue = await tx.taskQueue.update({
+                    where: {
+                      id: taskQueue.id,
+                    },
+                    data: {
+                      concurrencyLimit,
+                      rateLimit: body.options.queue.rateLimit,
+                    },
+                  });
+                } else {
+                  taskQueue = await tx.taskQueue.create({
+                    data: {
+                      friendlyId: generateFriendlyId("queue"),
+                      name: queueName,
+                      concurrencyLimit,
+                      runtimeEnvironmentId: environment.id,
+                      projectId: environment.projectId,
+                      rateLimit: body.options.queue.rateLimit,
+                      type: "NAMED",
+                    },
+                  });
+                }
+
+                if (typeof taskQueue.concurrencyLimit === "number") {
+                  await marqs?.updateQueueConcurrencyLimits(
+                    environment,
+                    taskQueue.name,
+                    taskQueue.concurrencyLimit
+                  );
+                } else {
+                  await marqs?.removeQueueConcurrencyLimits(environment, taskQueue.name);
+                }
               }
 
               if (taskRun.delayUntil) {
