A couple of fixes

Author: ericallam

apps/webapp/app/platform/zodWorker.server.ts

@@ -195,12 +195,13 @@ export class ZodWorker<TMessageCatalog extends MessageCatalogSchema> {
   ): Promise<GraphileJob> {
     const task = this.#tasks[identifier];
 
-    const optionsWithoutTx = omit(options ?? {}, ["tx"]);
+    const optionsWithoutTx = removeUndefinedKeys(omit(options ?? {}, ["tx"]));
     const taskWithoutJobKey = omit(task, ["jobKey"]);
 
+    // Make sure options passed in to enqueue take precedence over task options
     const spec = {
-      ...optionsWithoutTx,
       ...taskWithoutJobKey,
+      ...optionsWithoutTx,
     };
 
     if (typeof task.queueName === "function") {
@@ -437,3 +438,12 @@ export class ZodWorker<TMessageCatalog extends MessageCatalogSchema> {
     logger.debug(`[worker][${this.#name}] ${message}`, args);
   }
 }
+
+function removeUndefinedKeys<T extends object>(obj: T): T {
+  for (let key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key) && obj[key] === undefined) {
+      delete obj[key];
+    }
+  }
+  return obj;
+}

apps/webapp/app/services/endpoints/recurringEndpointIndex.server.ts

@@ -19,7 +19,6 @@ export class RecurringEndpointIndexService {
         environment: {
           type: RuntimeEnvironmentType.PRODUCTION,
         },
-
         indexings: {
           none: {
             createdAt: {
@@ -28,9 +27,6 @@ export class RecurringEndpointIndexService {
           },
         },
       },
-      include: {
-        environment: true,
-      },
     });
 
     logger.debug("Found endpoints that haven't been indexed in the last 10 minutes", {
@@ -39,17 +35,10 @@ export class RecurringEndpointIndexService {
 
     // Enqueue each endpoint for indexing
     for (const endpoint of endpoints) {
-      await workerQueue.enqueue(
-        "indexEndpoint",
-        {
-          id: endpoint.id,
-          source: "INTERNAL",
-        },
-        {
-          maxAttempts:
-            endpoint.environment.type === RuntimeEnvironmentType.DEVELOPMENT ? 1 : undefined,
-        }
-      );
+      await workerQueue.enqueue("indexEndpoint", {
+        id: endpoint.id,
+        source: "INTERNAL",
+      });
     }
   }
 }