Fix type issues in ObjectQL storage implementations

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

packages/automation/objects/automation_rule.object.yml

@@ -15,10 +15,6 @@ fields:
     type: object
     label: Trigger Configuration
     blackbox: true
-  conditions:
-    type: object
-    label: Conditions
-    blackbox: true
   actions:
     type: object
     label: Actions

packages/automation/src/objectql-storage.ts

@@ -71,7 +71,7 @@ export class ObjectQLAutomationStorage implements AutomationStorage {
 
         // Filter by trigger type if specified (post-query filtering)
         if (filter?.triggerType) {
-            rules = rules.filter(r => r.trigger.type === filter.triggerType);
+            rules = rules.filter((r: AutomationRule) => r.trigger.type === filter.triggerType);
         }
 
         return rules;
@@ -84,9 +84,10 @@ export class ObjectQLAutomationStorage implements AutomationStorage {
         const docUpdates: any = {};
 
         if (updates.name !== undefined) docUpdates.name = updates.name;
-        if (updates.objectName !== undefined) docUpdates.object_name = updates.objectName;
-        if (updates.trigger !== undefined) docUpdates.trigger = updates.trigger;
-        if (updates.conditions !== undefined) docUpdates.conditions = updates.conditions;
+        if (updates.trigger !== undefined) {
+            docUpdates.trigger = updates.trigger;
+            docUpdates.object_name = (updates.trigger as any).objectName;
+        }
         if (updates.actions !== undefined) docUpdates.actions = updates.actions;
         if (updates.status !== undefined) docUpdates.status = updates.status;
         if (updates.priority !== undefined) docUpdates.priority = updates.priority;
@@ -205,9 +206,8 @@ export class ObjectQLAutomationStorage implements AutomationStorage {
             _id: rule.id,
             id: rule.id,
             name: rule.name,
-            object_name: rule.objectName,
+            object_name: (rule.trigger as any).objectName,
             trigger: rule.trigger,
-            conditions: rule.conditions,
             actions: rule.actions,
             status: rule.status,
             priority: rule.priority,
@@ -226,11 +226,9 @@ export class ObjectQLAutomationStorage implements AutomationStorage {
         return {
             id: doc.id || doc._id,
             name: doc.name,
-            objectName: doc.object_name,
+            status: doc.status,
             trigger: doc.trigger,
-            conditions: doc.conditions,
             actions: doc.actions,
-            status: doc.status,
             priority: doc.priority,
             executionCount: doc.execution_count || 0,
             lastExecutedAt: doc.last_executed_at ? new Date(doc.last_executed_at) : undefined,

packages/jobs/objects/job.object.yml

@@ -56,10 +56,14 @@ fields:
     type: number
     label: Retry Attempts
     default: 0
-  max_attempts:
+  max_retries:
     type: number
     label: Max Retry Attempts
     default: 3
+  retry_delay:
+    type: number
+    label: Retry Delay (ms)
+    default: 1000
   timeout:
     type: number
     label: Timeout (ms)

packages/jobs/src/objectql-storage.ts

@@ -50,7 +50,8 @@ export class ObjectQLJobStorage implements JobStorage {
         if (updates.result !== undefined) docUpdates.result = updates.result;
         if (updates.error !== undefined) docUpdates.error = updates.error;
         if (updates.attempts !== undefined) docUpdates.attempts = updates.attempts;
-        if (updates.maxAttempts !== undefined) docUpdates.max_attempts = updates.maxAttempts;
+        if (updates.maxRetries !== undefined) docUpdates.max_retries = updates.maxRetries;
+        if (updates.retryDelay !== undefined) docUpdates.retry_delay = updates.retryDelay;
         if (updates.timeout !== undefined) docUpdates.timeout = updates.timeout;
         if (updates.nextRun !== undefined) docUpdates.next_run = updates.nextRun;
         if (updates.cronExpression !== undefined) docUpdates.cron_expression = updates.cronExpression;
@@ -205,7 +206,8 @@ export class ObjectQLJobStorage implements JobStorage {
             result: job.result,
             error: job.error,
             attempts: job.attempts,
-            max_attempts: job.maxAttempts,
+            max_retries: job.maxRetries,
+            retry_delay: job.retryDelay,
             timeout: job.timeout,
             next_run: job.nextRun,
             cron_expression: job.cronExpression,
@@ -228,7 +230,8 @@ export class ObjectQLJobStorage implements JobStorage {
             result: doc.result,
             error: doc.error,
             attempts: doc.attempts || 0,
-            maxAttempts: doc.max_attempts,
+            maxRetries: doc.max_retries || 3,
+            retryDelay: doc.retry_delay || 1000,
             timeout: doc.timeout,
             nextRun: doc.next_run ? new Date(doc.next_run) : undefined,
             cronExpression: doc.cron_expression,