rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Move warranty creation out of the RiderAPIHandler. #331

Browse source
This commit is contained in:
Korina Cordero 2020-02-21 02:29:39 +00:00
parent 8a328bf441
commit 7dd9911e22
4 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -24,7 +24,6 @@ use App\Entity\Hub;
use App\Entity\Promo;
use App\Entity\Rider;
use App\Entity\JORejection;
use App\Entity\Warranty;
use App\Entity\Customer;
use App\Entity\ServiceCharge;
@ -44,7 +43,6 @@ use App\Service\InvoiceGeneratorInterface;
use App\Service\JobOrderHandlerInterface;
use App\Service\RiderAssignmentHandlerInterface;
use App\Service\CustomerHandlerInterface;
use App\Service\WarrantyHandler;
use App\Service\MQTTClient;
use App\Service\APNSClient;
use App\Service\MapTools;
@ -67,7 +65,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
protected $translator;
protected $rah;
protected $country_code;
protected $wh;
protected $cust_handler;
protected $template_hash;
@ -75,8 +72,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
public function __construct(Security $security, EntityManagerInterface $em,
InvoiceGeneratorInterface $ic, ValidatorInterface $validator,
TranslatorInterface $translator, RiderAssignmentHandlerInterface $rah,
string $country_code, WarrantyHandler $wh,
CustomerHandlerInterface $cust_handler)
string $country_code, CustomerHandlerInterface $cust_handler)
{
$this->em = $em;
$this->ic = $ic;
@ -85,7 +81,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$this->translator = $translator;
$this->rah = $rah;
$this->country_code = $country_code;
$this->wh = $wh;
$this->cust_handler = $cust_handler;
$this->loadTemplates();

6
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -23,7 +23,6 @@ use App\Entity\Hub;
use App\Entity\Promo;
use App\Entity\Rider;
use App\Entity\JORejection;
use App\Entity\Warranty;
use App\Entity\Customer;
use App\Ramcar\InvoiceCriteria;
@ -41,7 +40,6 @@ use App\Ramcar\JORejectionReason;
use App\Service\InvoiceGeneratorInterface;
use App\Service\JobOrderHandlerInterface;
use App\Service\RiderAssignmentHandlerInterface;
use App\Service\WarrantyHandler;
use App\Service\MQTTClient;
use App\Service\APNSClient;
use App\Service\MapTools;
@ -64,14 +62,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
protected $translator;
protected $rah;
protected $country_code;
protected $wh;
protected $template_hash;
public function __construct(Security $security, EntityManagerInterface $em,
InvoiceGeneratorInterface $ic, ValidatorInterface $validator,
TranslatorInterface $translator, RiderAssignmentHandlerInterface $rah,
string $country_code, WarrantyHandler $wh)
string $country_code)
{
$this->em = $em;
$this->ic = $ic;
@ -80,7 +77,6 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
$this->translator = $translator;
$this->rah = $rah;
$this->country_code = $country_code;
$this->wh = $wh;
$this->loadTemplates();
}

10
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -18,7 +18,6 @@ use App\Service\RiderAPIHandlerInterface;
use App\Service\RedisClientProvider;
use App\Service\RiderCache;
use App\Service\MQTTClient;
use App\Service\WarrantyHandler;
use App\Service\JobOrderHandlerInterface;
use App\Service\InvoiceGeneratorInterface;
@ -30,7 +29,6 @@ use App\Entity\Promo;
use App\Entity\Battery;
use App\Entity\BatteryModel;
use App\Entity\BatterySize;
use App\Entity\Warranty;
use DateTime;
@ -42,7 +40,6 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
protected $rcache;
protected $country_code;
protected $mclient;
protected $wh;
protected $jo_handler;
protected $ic;
protected $session;
@ -50,8 +47,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
public function __construct(EntityManagerInterface $em, RedisClientProvider $redis,
EncoderFactoryInterface $ef, RiderCache $rcache,
string $country_code, MQTTClient $mclient,
WarrantyHandler $wh, JobOrderHandlerInterface $jo_handler,
InvoiceGeneratorInterface $ic)
JobOrderHandlerInterface $jo_handler, InvoiceGeneratorInterface $ic)
{
$this->em = $em;
$this->redis = $redis;
@ -59,7 +55,6 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->rcache = $rcache;
$this->country_code = $country_code;
$this->mclient = $mclient;
$this->wh = $wh;
$this->jo_handler = $jo_handler;
$this->ic = $ic;
@ -523,6 +518,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->em->flush();
/*
// create warranty
if($this->jo_handler->checkIfNewBattery($jo))
{
@ -561,7 +557,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
}
}
} */
// send mqtt event (fulfilled)
$rider = $this->session->getRider();

9
src/Service/RiderAPIHandler/ResqRiderAPIHandler.php
View file

@ -18,7 +18,6 @@ use App\Service\RiderAPIHandlerInterface;
use App\Service\RedisClientProvider;
use App\Service\RiderCache;
use App\Service\MQTTClient;
use App\Service\WarrantyHandler;
use App\Service\JobOrderHandlerInterface;
use App\Service\InvoiceGeneratorInterface;
@ -41,7 +40,6 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
protected $rcache;
protected $country_code;
protected $mclient;
protected $wh;
protected $jo_handler;
protected $ic;
protected $session;
@ -49,8 +47,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
public function __construct(EntityManagerInterface $em, RedisClientProvider $redis,
EncoderFactoryInterface $ef, RiderCache $rcache,
string $country_code, MQTTClient $mclient,
WarrantyHandler $wh, JobOrderHandlerInterface $jo_handler,
InvoiceGeneratorInterface $ic)
JobOrderHandlerInterface $jo_handler, InvoiceGeneratorInterface $ic)
{
$this->em = $em;
$this->redis = $redis;
@ -58,7 +55,6 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
$this->rcache = $rcache;
$this->country_code = $country_code;
$this->mclient = $mclient;
$this->wh = $wh;
$this->jo_handler = $jo_handler;
$this->ic = $ic;
@ -522,6 +518,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
$this->em->flush();
/*
// create warranty
if($this->jo_handler->checkIfNewBattery($jo))
{
@ -556,7 +553,7 @@ class ResqRiderAPIHandler implements RiderAPIHandlerInterface
}
$this->wh->createWarranty($serial, $plate_number, $first_name, $last_name, $mobile_number, $batt_list, $date_purchase, $warranty_class);
}
} */
// send mqtt event (fulfilled)
$rider = $this->session->getRider();