Merge pull request #1474 from bakaphp/feat-task-list

refact: migration and response
bakaphp · Jun 9, 2024 · 09dca2b · 09dca2b
2 parents 5b0abd0 + 66f6a41
commit 09dca2b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/database/migrations/ActionEngine/2024_06_08_173343_company_task_engagement_items.php b/database/migrations/ActionEngine/2024_06_08_173343_company_task_engagement_items.php
@@ -17,9 +17,9 @@ public function up(): void
             $table->bigInteger('apps_id')->index();
             $table->bigInteger('users_id')->index();
             $table->enum('status', ['pending', 'in_progress', 'completed'])->default('pending')->comment('pending, in_progress, completed')->index();
-            $table->bigInteger('engagement_start_id')->index();
-            $table->bigInteger('engagement_end_id')->index();
-            $table->json('config');
+            $table->bigInteger('engagement_start_id')->nullable()->index();
+            $table->bigInteger('engagement_end_id')->nullable()->index();
+            $table->json('config')->nullable();
             $table->timestamps();
             $table->tinyInteger('is_deleted')->default(0)->index();
 

diff --git a/src/Domains/ActionEngine/Tasks/Models/TaskEngagementItem.php b/src/Domains/ActionEngine/Tasks/Models/TaskEngagementItem.php
@@ -42,17 +42,11 @@ public function lead(): BelongsTo
         return $this->belongsTo(Lead::class, 'lead_id');
     }
 
-    /**
-     * temp relationship to engagement will only work on LeadTaskEngagementItem
-     */
     public function engagementStart(): HasOne
     {
         return $this->hasOne(Engagement::class, 'id', 'engagement_start_id');
     }
 
-    /**
-     * temp relationship to engagement will only work on LeadTaskEngagementItem
-     */
     public function engagementEnd(): HasOne
     {
         return $this->hasOne(Engagement::class, 'id', 'engagement_end_id');

diff --git a/src/Domains/ActionEngine/Tasks/Models/TaskListItem.php b/src/Domains/ActionEngine/Tasks/Models/TaskListItem.php
@@ -44,8 +44,19 @@ public function action(): BelongsTo
         return $this->belongsTo(CompanyAction::class, 'companies_action_id');
     }
 
+    /**
+      * temp relationship to engagement will only work on LeadTaskEngagementItem
+      */
     public function engagementStart(): HasOne
     {
         return $this->hasOne(Engagement::class, 'id', 'engagement_start_id');
     }
+
+    /**
+     * temp relationship to engagement will only work on LeadTaskEngagementItem
+     */
+    public function engagementEnd(): HasOne
+    {
+        return $this->hasOne(Engagement::class, 'id', 'engagement_end_id');
+    }
 }