From 96aed6b8f4949b4c8ce4dc29bad48efd15763103 Mon Sep 17 00:00:00 2001
From: Dillon <dillonngoweijoon@gmail.com>
Date: Sat, 5 Aug 2023 02:48:11 +0800
Subject: [PATCH] Fix error from production logs

---
 .../Processors/CreatePerfexCRMTaskProcessor.php   | 15 +--------------
 .../Processors/UpdatePerfexCRMProcessor.php       | 11 ++++++++---
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php
index 4aa5a089..efd6df0e 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/CreatePerfexCRMTaskProcessor.php
@@ -25,20 +25,7 @@ class CreatePerfexCRMTaskProcessor
     * @throws \App\Classes\Exceptions\MalformedRequestException
     */
    public function execute(CreateTaskPerfexCRMObject $createTaskPerfexCRMObject) {
-        $this->createsPerfexCRMTask->execute(
-            $createTaskPerfexCRMObject->getName(),
-            $createTaskPerfexCRMObject->getDescription(),
-            $createTaskPerfexCRMObject->getLeadId(),
-            $createTaskPerfexCRMObject->getMilestoneId(),
-            $createTaskPerfexCRMObject->getProjectId(),
-            $createTaskPerfexCRMObject->getReference(),
-            $createTaskPerfexCRMObject->getOnTaskCompletion(),
-            $createTaskPerfexCRMObject->getDepartment(),
-            $createTaskPerfexCRMObject->getStatus(),
-            $createTaskPerfexCRMObject->getPriority(),
-            $createTaskPerfexCRMObject->getDuedate(),
-            $createTaskPerfexCRMObject->getInvoiceId(),
-        );
+        $this->createsPerfexCRMTask->execute($createTaskPerfexCRMObject);
         return true;
    }
 
diff --git a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
index 5552edd9..1852eb72 100644
--- a/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
+++ b/app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
@@ -203,10 +203,15 @@ class UpdatePerfexCRMProcessor
                 }
 
                 // Get existing or create task
-                $taskName = $tasks[$count]['name'];;
+                $taskName = $tasks[$count]['name'];
+                $taskReference = $tasks[$count]['reference'];
+                $taskOnTaskCompletion = $tasks[$count]['on_task_completion'];
                 if($updatePerfexCRMObject->getInvoiceId() != 0){
                     $taskName = $taskName." (".$updatePerfexCRMObject->getInvoiceId().")";
+                    $taskReference = $taskReference."_".$updatePerfexCRMObject->getInvoiceId();
+                    $taskOnTaskCompletion = $taskOnTaskCompletion."_".$updatePerfexCRMObject->getInvoiceId();
                 }
+
                 $result = $this->fetchesPerfexCRMTask->execute($taskName, $milestoneId, 'project', $projectId, $updatePerfexCRMObject->getInvoiceId());
                 // Log::info("UpdatePerfexCRMProcessor task: ".json_encode($taskStatus)." , ".json_encode($result));
 
@@ -226,8 +231,8 @@ class UpdatePerfexCRMProcessor
                         "",
                         $projectId,
                         $milestoneId,
-                        $tasks[$count]['reference'],
-                        $tasks[$count]['on_task_completion'],
+                        $taskReference,
+                        $taskOnTaskCompletion,
                         $taskStatus,
                         $tasks[$count]['department'],
                         $tasks[$count]['priority'],