diff --git a/config/services.yaml b/config/services.yaml index 9d1ee14e..72817508 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -306,3 +306,13 @@ services: App\Service\WarrantyBulkUploader: arguments: $em: "@doctrine.orm.entity_manager" + + # warranty serial file logger + App\Service\WarrantySerialUploadLogger: + arguments: + $em: "@doctrine.orm.entity_manager" + + # warranty serial load logger + App\Service\WarrantySerialLoadLogger: + arguments: + $em: "@doctrine.orm.entity_manager" diff --git a/src/Controller/CAPI/WarrantySerialController.php b/src/Controller/CAPI/WarrantySerialController.php index c5e27f33..61f030d7 100644 --- a/src/Controller/CAPI/WarrantySerialController.php +++ b/src/Controller/CAPI/WarrantySerialController.php @@ -32,7 +32,7 @@ class WarrantySerialController extends APIController $this->acl_gen = $acl_gen; } - public function upload(Request $req, EntityManagerInterface $em, WarrantySerialUploadLogger $upload_logger + public function upload(Request $req, EntityManagerInterface $em, WarrantySerialUploadLogger $upload_logger, WarrantySerialLoadLogger $load_logger) { $this->denyAccessUnlessGranted('warrantyserial.upload', null, 'No access.'); @@ -69,7 +69,7 @@ class WarrantySerialController extends APIController $log_data = [ 'user_id' => $user_id, 'is_uploaded' => false, - 'error' => $error; + 'error' => $error, ]; $this->upload_logger->logWarrantySerialUploadInfo($log_data); return new APIResponse(false, $error); @@ -108,7 +108,7 @@ class WarrantySerialController extends APIController 'user_id' => $user_id, 'is_loaded' => true, 'serial' => $serial, - 'error' => ''; + 'error' => '', ]; $this->upload_logger->logWarrantySeriaLoadInfo($log_data); @@ -152,7 +152,7 @@ class WarrantySerialController extends APIController 'user_id' => $user_id, 'is_loaded' => false, 'serial' => '', - 'error' => $error; + 'error' => $error, ]; $this->upload_logger->logWarrantySeriaLoadInfo($log_data); @@ -162,7 +162,7 @@ class WarrantySerialController extends APIController // validate the date created $str_date_create = trim($row[3]); - $date_create = $this->convertDateCreate($str_date_create) + $date_create = $this->convertDateCreate($str_date_create); if ($date_create == null) { // log @@ -172,7 +172,7 @@ class WarrantySerialController extends APIController 'user_id' => $user_id, 'is_loaded' => false, 'serial' => $serial, - 'error' => $error; + 'error' => $error, ]; $this->upload_logger->logWarrantySeriaLoadInfo($log_data); @@ -180,11 +180,13 @@ class WarrantySerialController extends APIController return false; } + // check if serial is a dupe + // valid entry return true; } - protected convertDateCreate($str_date_create) + protected function convertDateCreate($str_date_create) { // since some people cannot follow simple instructions... // check the date format on the string diff --git a/src/Entity/WarrantySerialQueue.php b/src/Entity/WarrantySerialQueue.php new file mode 100644 index 00000000..cc67f46d --- /dev/null +++ b/src/Entity/WarrantySerialQueue.php @@ -0,0 +1,75 @@ +date_create = new DateTime(); + $this->file_serial = null; + $this->status = ''; + } + + public function getID() + { + return $this->id; + } + + public function setFileSerial($file = null) + { + $this->file_serial = $file; + return $this; + } + + public function getFileSerial() + { + return $this->file_serial; + } + + public function setStatus($status) + { + $this->status = $status; + return $this; + } + + public function getStatus() + { + return $this->status; + } +} diff --git a/src/Entity/WarrantySerialUploadLog.php b/src/Entity/WarrantySerialUploadLog.php index e9e916b3..77792bfe 100644 --- a/src/Entity/WarrantySerialUploadLog.php +++ b/src/Entity/WarrantySerialUploadLog.php @@ -99,3 +99,4 @@ class WarrantySerialUploadLog { return $this->error; } +}