From 4b11b7e200750874551e327aa59d896c62995512 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Fri, 15 May 2020 05:08:32 +0000 Subject: [PATCH 1/3] Create new command to get warranties that need fixing. #407 --- src/Command/GetFlawedWarrantiesCommand.php | 248 +++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 src/Command/GetFlawedWarrantiesCommand.php diff --git a/src/Command/GetFlawedWarrantiesCommand.php b/src/Command/GetFlawedWarrantiesCommand.php new file mode 100644 index 00000000..5ba04981 --- /dev/null +++ b/src/Command/GetFlawedWarrantiesCommand.php @@ -0,0 +1,248 @@ +em = $em; + $this->wh = $wh; + + $this->loadSAPBatteries(); + + parent::__construct(); + } + + protected function configure() + { + $this->setName('warranty:getflawedwarranties') + ->setDescription('Get warranties that need to be fixed.') + ->setHelp('Get flawed warranties') + ->addArgument('start_date', InputArgument::REQUIRED, 'Start Date') + ->addArgument('end_date', InputArgument::REQUIRED, 'End Date'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $s_date = $input->getArgument('start_date'); + $e_date = $input->getArgument('end_date'); + + $start_date = DateTime::createFromFormat('Ymd', $s_date); + $end_date = DateTime::createFromFormat('Ymd', $e_date); + $end_date->setTime(23, 59); + + $missing_warranties = []; + $comm_private_warranties = []; + $invalid_plate_numbers = []; + $duplicate_warranties = []; + $sdate_expiry_wrong_warranties = []; + + $first_results_set = $this->getMissingWarranties($start_date, $end_date); + //$second_results_set = $this->getWarrantiesWithWrongEntries($start_date, $end_date); + //$third_results_set = $this->getDuplicateWarranties($start_date, $end_date); + + $missing_warranties = $first_results_set['missing']; + $invalid_plate_numbers = $first_results_set['invalid_plate_number']; + $comm_private_warranties = $first_results_set['commercial_private']; + + // our warranty error categories: missing, commercial_private, invalid plate number, duplicate, start date of expiry computation wrong + $this->outputResults($missing_warranties, $invalid_plate_numbers, $comm_prvate_warranties); + + return 0; + } + + protected function getMissingWarranties($start_date, $end_date) + { + $em = $this->em; + + // get all job orders with battery new service type within date range + $jo_query = $em->createQuery('select ii,i,jo,cv from App\Entity\InvoiceItem ii inner join ii.invoice i inner join i.job_order jo inner join jo.cus_vehicle cv join jo.customer c where ii.battery is not null and jo.service_type = :service_type and jo.date_schedule > :date_start and jo.date_schedule < :date_end'); + $jo_query->setParameter('service_type', ServiceType::BATTERY_REPLACEMENT_NEW) + ->setParameter('date_start', $start_date) + ->setParameter('date_end', $end_date); + + $jos = $jo_query->iterate(); + + $invalids = []; + $missings = []; + $comm_privates = []; + + foreach($jos as $row) + { + $invoice_item = $row[0]; + $invoice = $invoice_item->getInvoice(); + $jo = $invoice->getJobOrder(); + $cv = $jo->getCustomerVehicle(); + $customer = $jo->getCustomer(); + + if ($invoice_item != null) + { + if($invoice_item->getBattery() != null) + { + // manually retrieve the SAPBattery using the SAPCode + $battery_sap_code = $invoice_item->getBattery()->getSAPCode(); + $found_battery = $this->findSAPBattery($battery_sap_code); + $sap_code = '\'' . $battery_sap_code . '\''; + if (!$found_battery) + { + $sap_code = 'NULL'; + } + + // have to use this erroneous setting of the warranty period + // to be able to find those warranties that were added with this warranty period. + // warranties found with this warranty period will be marked as commercial_private + $warranty_period = 0; + if ($invoice_item->getBattery()->getWarrantyPrivate() != null) + { + $warranty_period = $invoice_item->getBattery()->getWarrantyPrivate(); + } + if ($invoice_item->getBattery()->getWarrantyCommercial() != null) + { + $warranty_period = $invoice_item->getBattery()->getWarrantyCommercial(); + } + if ($invoice_item->getBattery()->getWarrantyTnv() != null) + { + $warranty_period = $invoice_item->getBattery()->getWarrantyTnv(); + } + + if ($invoice->getDateCreate() != null) + { + // check if plate number is "clean". If not, do not insert into warranty + if (!(Warranty::cleanPlateNumber($cv->getPlateNumber()))) + { + // log with the dupes + $invalids[] = [ + 'jo_id' => $jo->getID(), + 'plate_number' => $cv->getPlateNumber(), + 'expiry_date' => '', + ]; + + continue; + } + + // check if warranty already exists + $cleaned_plate_number = Warranty::cleanPlateNumber($cv->getPlateNumber()); + + // use date_create of invoice as start date, as decided in group chat + $expiry_date_date_create = $this->computeDateExpire($jo->getInvoice()->getDateCreate(), $warranty_period); + $results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cleaned_plate_number, + 'date_expire' => $expiry_date_date_create]);; + + if (empty($results)) + { + $missings[] = [ + 'jo_id' => $jo->getID(), + 'plate_number' => $cv->getPlateNumber(), + 'expiry_date' => $expiry_date_date_create->format('Y-m-d'), + ]; + } + else + { + foreach ($results as $warranty) + { + $comm_privates[] = [ + 'warranty_id' => $warranty->getID(), + 'plate_number' => $warranty->getPlateNumber(), + 'expiry_date' => $warranty->getDateExpire()->format('Y-m-d'), + ]; + } + } + } + } + } + + $em->detach($row[0]); + $em->clear(); + } + + $res = [ + 'missing' => $missings, + 'invalid_plate_number' => $invalids, + 'commercial_private' => $comm_privates, + ]; + + return $res; + + } + + protected function getWarrantiesWithWrongEntries($start_date, $end_date) + { + $em = $this->em; + + // get all job orders with battery new service type within date range + $jo_query = $em->createQuery('select ii,i,jo,cv from App\Entity\InvoiceItem ii inner join ii.invoice i inner join i.job_order jo inner join jo.cus_vehicle cv join jo.customer c where ii.battery is not null and jo.service_type = :service_type and jo.date_schedule > :date_start and jo.date_schedule < :date_end'); + $jo_query->setParameter('service_type', ServiceType::BATTERY_REPLACEMENT_NEW) + ->setParameter('date_start', $start_date) + ->setParameter('date_end', $end_date); + + $jos = $jo_query->iterate(); + + foreach($jos as $row) + { + $invoice_item = $row[0]; + $invoice = $invoice_item->getInvoice(); + $jo = $invoice->getJobOrder(); + $cv = $jo->getCustomerVehicle(); + $customer = $jo->getCustomer(); + + $em->detach($row[0]); + $em->clear(); + } + + } + + protected function getDuplicateWarranties($start_date, $end_date) + { + } + + protected function outputResults($missing, $invalid, $commercial_private) + { + // output one file per array in csv format + } + + protected function loadSAPBatteries() + { + $this->sapbatt_hash = []; + + $sap_batteries = $this->em->getRepository(SAPBattery::class)->findAll(); + foreach($sap_batteries as $sap_batt) + { + $id = $sap_batt->getID(); + $brand_size = $sap_batt->getBrand()->getID() . " " . $sap_batt->getSize()->getID(); + $this->sapbatt_hash[$id] = $brand_size; + } + } + + protected function findSAPBattery($batt_id) + { + if (!isset($this->sapbatt_hash[$batt_id])) + { + return false; + } + + return true; + } + + + +} From ed2e54f42897007860223a6e2a25b232a2a358cf Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 18 May 2020 07:17:58 +0000 Subject: [PATCH 2/3] Add output files for missing warranties, invalid plate numbers, and commercial private warranties. #407 --- src/Command/GetFlawedWarrantiesCommand.php | 86 +++++++++++++++++++++- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/src/Command/GetFlawedWarrantiesCommand.php b/src/Command/GetFlawedWarrantiesCommand.php index 5ba04981..b93e2151 100644 --- a/src/Command/GetFlawedWarrantiesCommand.php +++ b/src/Command/GetFlawedWarrantiesCommand.php @@ -17,6 +17,8 @@ use App\Ramcar\ServiceType; use App\Service\WarrantyHandler; +use DateTime; + class GetFlawedWarrantiesCommand extends Command { protected $em; @@ -66,7 +68,7 @@ class GetFlawedWarrantiesCommand extends Command $comm_private_warranties = $first_results_set['commercial_private']; // our warranty error categories: missing, commercial_private, invalid plate number, duplicate, start date of expiry computation wrong - $this->outputResults($missing_warranties, $invalid_plate_numbers, $comm_prvate_warranties); + $this->outputResults($s_date, $e_date, $missing_warranties, $invalid_plate_numbers, $comm_private_warranties); return 0; } @@ -130,7 +132,6 @@ class GetFlawedWarrantiesCommand extends Command // check if plate number is "clean". If not, do not insert into warranty if (!(Warranty::cleanPlateNumber($cv->getPlateNumber()))) { - // log with the dupes $invalids[] = [ 'jo_id' => $jo->getID(), 'plate_number' => $cv->getPlateNumber(), @@ -144,7 +145,7 @@ class GetFlawedWarrantiesCommand extends Command $cleaned_plate_number = Warranty::cleanPlateNumber($cv->getPlateNumber()); // use date_create of invoice as start date, as decided in group chat - $expiry_date_date_create = $this->computeDateExpire($jo->getInvoice()->getDateCreate(), $warranty_period); + $expiry_date_date_create = $this->wh->computeDateExpire($jo->getInvoice()->getDateCreate(), $warranty_period); $results = $em->getRepository(Warranty::class)->findBy(['plate_number' => $cleaned_plate_number, 'date_expire' => $expiry_date_date_create]);; @@ -215,9 +216,86 @@ class GetFlawedWarrantiesCommand extends Command { } - protected function outputResults($missing, $invalid, $commercial_private) + protected function outputResults($start_date, $end_date, $missing, $invalid, $commercial_private) { + $date_range = $start_date . '-' . $end_date; // output one file per array in csv format + // missing warranties + // we output the JOs with no warranties + $missing_csv_filename = $date_range . '-' . 'missing_warranties.csv'; + try + { + $missing_fh = fopen($missing_csv_filename, 'a'); + } + catch (Exception $e) + { + throw new Exception('The file "' . $missing_csv_filename . '" could not be opened.'); + } + + if ((count($missing)) > 0) + { + fputcsv($missing_fh, [ + 'JO ID', + 'Plate Number', + 'Expiry Date', + ]); + + foreach($missing as $missing_row) + { + fputcsv($missing_fh, $missing_row); + } + } + + // invalid plate numbers + $invalid_plates_csv_filename = $date_range . '-' . 'invalid_plate_jos.csv'; + try + { + $invalid_plates_fh = fopen($invalid_plates_csv_filename, 'a'); + } + catch (Exception $e) + { + throw new Exception('The file "' . $invalid_plates_csv_filename . '" could not be opened.'); + } + + if ((count($invalid)) > 0) + { + fputcsv($invalid_plates_fh, [ + 'JO ID', + 'Plate Number', + 'Expiry Date', + ]); + + foreach($invalid as $invalid_row) + { + fputcsv($invalid_plates_fh, $invalid_row); + } + } + + // warranties whose expiration dates were set to the commercial period + // but warranty class is private + $comm_private_csv_filename = $date_range . '-' . 'comm_private_warranties.csv'; + try + { + $comm_private_fh = fopen($comm_private_csv_filename, 'a'); + } + catch (Exception $e) + { + throw new Exception('The file "' . $comm_private_csv_filename . '" could not be opened.'); + } + + if ((count($commercial_private)) > 0) + { + fputcsv($comm_private_fh, [ + 'Warranty ID', + 'Plate Number', + 'Expiry Date', + ]); + + foreach($commercial_private as $comm_private_row) + { + fputcsv($comm_private_fh, $comm_private_row); + } + } } protected function loadSAPBatteries() From 43b203aaefb1e87ef16453139e48f92fdddd3a87 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Mon, 18 May 2020 10:05:54 +0000 Subject: [PATCH 3/3] Find warranties with date fulfilled as the start date of expiration date computation. #407 --- src/Command/GetFlawedWarrantiesCommand.php | 137 ++++++++++++++++++++- 1 file changed, 131 insertions(+), 6 deletions(-) diff --git a/src/Command/GetFlawedWarrantiesCommand.php b/src/Command/GetFlawedWarrantiesCommand.php index b93e2151..6a3f4026 100644 --- a/src/Command/GetFlawedWarrantiesCommand.php +++ b/src/Command/GetFlawedWarrantiesCommand.php @@ -60,15 +60,17 @@ class GetFlawedWarrantiesCommand extends Command $sdate_expiry_wrong_warranties = []; $first_results_set = $this->getMissingWarranties($start_date, $end_date); - //$second_results_set = $this->getWarrantiesWithWrongEntries($start_date, $end_date); + $second_results_set = $this->getWarrantiesWithWrongEntries($start_date, $end_date); //$third_results_set = $this->getDuplicateWarranties($start_date, $end_date); $missing_warranties = $first_results_set['missing']; $invalid_plate_numbers = $first_results_set['invalid_plate_number']; $comm_private_warranties = $first_results_set['commercial_private']; + $sdate_expiry_wrong_warranties = $second_results_set['wrong_expiry_date']; // our warranty error categories: missing, commercial_private, invalid plate number, duplicate, start date of expiry computation wrong - $this->outputResults($s_date, $e_date, $missing_warranties, $invalid_plate_numbers, $comm_private_warranties); + $this->outputResults($s_date, $e_date, $missing_warranties, $invalid_plate_numbers, $comm_private_warranties, + $sdate_expiry_wrong_warranties, $duplicate_warranties); return 0; } @@ -151,6 +153,11 @@ class GetFlawedWarrantiesCommand extends Command if (empty($results)) { + // TODO: find warranty using expiration date with start date, date fulfilled, if date fulfilled is not null + // get warranty periods from battery, this time, check warranty class + // recompute expiration date with start date, date fulfilled + // if still no warranty, put JO in $missing + // if there is a warranty, put warranty in wrong expiry date $missings[] = [ 'jo_id' => $jo->getID(), 'plate_number' => $cv->getPlateNumber(), @@ -198,6 +205,8 @@ class GetFlawedWarrantiesCommand extends Command $jos = $jo_query->iterate(); + $expiries = []; + foreach($jos as $row) { $invoice_item = $row[0]; @@ -206,19 +215,88 @@ class GetFlawedWarrantiesCommand extends Command $cv = $jo->getCustomerVehicle(); $customer = $jo->getCustomer(); + $clean_plate_num = Warranty::cleanPlateNumber($cv->getPlateNumber()); + if (!($clean_plate_num)) + { + error_log('invalid plate'); + continue; + } + if ($invoice_item == null) + { + error_log('invoice item null'); + continue; + } + if ($invoice_item->getBattery() == null) + { + error_log('invoice item not a battery'); + continue; + } + + error_log('clean plate, invoice item not null, battery not null'); + // manually retrieve the SAPBattery using the SAPCode + $battery_sap_code = $invoice_item->getBattery()->getSAPCode(); + $found_battery = $this->findSAPBattery($battery_sap_code); + $sap_code = '\'' . $battery_sap_code . '\''; + if (!$found_battery) + { + $sap_code = 'NULL'; + } + + // check if warranty exists with plate number and date_create of invoice + $date = $jo->getInvoice()->getDateCreate(); + $date_create_invoice_str = $date->format('Y-m-d'); + $date_create_invoice = DateTime::createFromFormat('Y-m-d', $date_create_invoice_str); + + $warranties_date_create = $this->em->getRepository(Warranty::class)->findBy(['plate_number' => $clean_plate_num, 'date_purchase' => $date_create_invoice]); + if (empty($warranties_date_create)) + { + // check if warranty exists with plate number and date_fulfilled + $datetime_fulfilled = $jo->getDateFulfill(); + if ($datetime_fulfilled != null) + { + $datetime_fulfilled_str = $datetime_fulfilled->format('Y-m-d'); + $date_fulfilled = DateTime::createFromFormat('Y-m-d', $datetime_fulfilled_str); + + $warranties_date_fulfilled = $this->em->getRepository(Warranty::class)->findBy(['plate_number' => $clean_plate_num, 'date_purchase' => $date_fulfilled]); + if (!(empty($warranties_date_fulfilled))) + { + foreach ($warranties_date_fulfilled as $warranty) + { + $expiries[] = [ + 'warranty_id' => $warranty->getID(), + 'plate_number' => $warranty->getPlateNumber(), + 'expiry_date' => $warranty->getDateExpire()->format('Y-m-d'), + ]; + } + } + } + else + { + error_log('no warranty at all?'); + } + } + $em->detach($row[0]); $em->clear(); } + $res = [ + 'wrong_expiry_date' => $expiries + ]; + + return $res; + } protected function getDuplicateWarranties($start_date, $end_date) { } - protected function outputResults($start_date, $end_date, $missing, $invalid, $commercial_private) + protected function outputResults($start_date, $end_date, $missing, $invalid, $commercial_private, + $expiry_wrong, $duplicate) { $date_range = $start_date . '-' . $end_date; + // output one file per array in csv format // missing warranties // we output the JOs with no warranties @@ -296,6 +374,56 @@ class GetFlawedWarrantiesCommand extends Command fputcsv($comm_private_fh, $comm_private_row); } } + + // start of expiry date computation is not date_create of invoice + $expiry_wrong_csv_filename = $date_range . '-' . 'expiry_wrong_warranties.csv'; + try + { + $expiry_wrong_fh = fopen($expiry_wrong_csv_filename, 'a'); + } + catch (Exception $e) + { + throw new Exception('The file "' . $expiry_wrong_csv_filename . '" could not be opened.'); + } + + if ((count($expiry_wrong)) > 0) + { + fputcsv($expiry_wrong_fh, [ + 'Warranty ID', + 'Plate Number', + 'Expiry Date', + ]); + + foreach($expiry_wrong as $expiry_wrong_row) + { + fputcsv($expiry_wrong_fh, $expiry_wrong_row); + } + } + + // duplicate warranties + $duplicate_csv_filename = $date_range . '-' . 'duplicate_warranties.csv'; + try + { + $duplicate_fh = fopen($duplicate_csv_filename, 'a'); + } + catch (Exception $e) + { + throw new Exception('The file "' . $duplicate_csv_filename . '" could not be opened.'); + } + + if ((count($duplicate)) > 0) + { + fputcsv($duplicate_fh, [ + 'Warranty ID', + 'Plate Number', + 'Expiry Date', + ]); + + foreach($duplicate as $duplicate_row) + { + fputcsv($duplicate_fh, $duplicate_row); + } + } } protected function loadSAPBatteries() @@ -320,7 +448,4 @@ class GetFlawedWarrantiesCommand extends Command return true; } - - - }