From 64bf68e445c3ae5bd4118c6faefd37eede89a5f3 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Wed, 21 Jul 2021 06:36:47 +0000
Subject: [PATCH] Fix bugs during testing customer tag removal. #591

---
 src/Controller/ResqAPI/JobOrderController.php       | 4 ++--
 src/Service/JobOrderHandler/ResqJobOrderHandler.php | 2 +-
 src/Service/JobOrderManager.php                     | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/Controller/ResqAPI/JobOrderController.php b/src/Controller/ResqAPI/JobOrderController.php
index 355274fa..bad7799c 100644
--- a/src/Controller/ResqAPI/JobOrderController.php
+++ b/src/Controller/ResqAPI/JobOrderController.php
@@ -158,7 +158,7 @@ class JobOrderController extends APIController
         if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
         {
             $customer_tags = $cust->getCustomerTagObjects();
-            $jo_manager->removeCustomerTag($jo, $customer_tags, $mobile_user->getID());
+            $jo_manager->removeCustomerTag($jo, $cust, $customer_tags, $mobile_user->getID());
         }
 
         return new APIResponse(true, 'Job order created', $data);
@@ -290,7 +290,7 @@ class JobOrderController extends APIController
         if ($jo->getServiceType() == ServiceType::BATTERY_REPLACEMENT_NEW)
         {
             $customer_tags = $cust->getCustomerTagObjects();
-            $jo_manager->removeCustomerTag($jo, $customer_tags, $mobile_user->getID());
+            $jo_manager->removeCustomerTag($jo, $cust, $customer_tags, $mobile_user->getID());
         }
 
         return new APIResponse(true, 'Job order created', $data);
diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index f425241c..259c01d4 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -408,7 +408,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
                     if (!empty($customer_tags))
                     {
                         $username = $jo->getCreatedBy()->getUsername();
-                        $this->jo_manager->removeCustomerTag($jo, $customer_tags, $username);
+                        $this->jo_manager->removeCustomerTag($jo, $customer, $customer_tags, $username);
                     }
                 }
             }
diff --git a/src/Service/JobOrderManager.php b/src/Service/JobOrderManager.php
index 27b32b6c..8e9d2db7 100644
--- a/src/Service/JobOrderManager.php
+++ b/src/Service/JobOrderManager.php
@@ -9,6 +9,7 @@ use Symfony\Component\Security\Core\Security;
 use App\Entity\JobOrder;
 use App\Entity\JOEvent;
 use App\Entity\User;
+use App\Entity\Customer;
 
 use App\Ramcar\ServiceType;
 use App\Ramcar\JOStatus;
@@ -22,14 +23,17 @@ class JobOrderManager
     protected $security;
     protected $rah;
     protected $mclient;
+    protected $promo_logger;
 
     public function __construct(EntityManagerInterface $em, Security $security,
-                                RiderAssignmentHandlerInterface $rah, MQTTClient $mclient)
+                                RiderAssignmentHandlerInterface $rah, MQTTClient $mclient,
+                                PromoLogger $promo_logger)
     {
         $this->em = $em;
         $this->security = $security;
         $this->rah = $rah;
         $this->mclient = $mclient;
+        $this->promo_logger = $promo_logger;
     }
 
     public function fulfillJobOrder($jo_id)
@@ -136,7 +140,7 @@ class JobOrderManager
         }
     }
 
-    public function removeCustomerTag(JobOrder $jo, $customer_tags, $username)
+    public function removeCustomerTag(JobOrder $jo, Customer $customer, $customer_tags, $username)
     {
         foreach ($customer_tags as $customer_tag)
         {