Add cleaning and checking of plate number when adding or updating a customer vehicle in admin panel and mobile app. #691

src/Controller/APIController.php

@@ -591,7 +591,15 @@ class APIController extends Controller implements LoggedController
         if ($res->isError())
             return $res;
 
-        // TODO: check valid plate number
+        // clean plate number
+        $clean_plate = $this->cleanPlateNumber($req->request->get('plate_num'));
+        if (!($clean_plate))
+        {
+            $res->setError(true)
+                ->setErrorMessage('Invalid plate number. Plate number should be alphanumeric.');
+            return $res;
+        }
+
         // TODO: check valid fuel type (gas / diesel)
         // TODO: check current battery id
         // TODO: check condition (brand new / second-hand)
@@ -4700,4 +4708,14 @@ class APIController extends Controller implements LoggedController
     {
         return trim(strtolower($string));
     }
+
+    protected function cleanPlateNumber($plate)
+    {
+        // trim plate number down to 20 characters
+        $trim_plate = str_replace(' ','', $plate);
+
+        $clean_plate = Warranty::cleanPlateNumber($trim_plate);
+
+        return $clean_plate;
+    }
 }

src/Service/CustomerHandler/ResqCustomerHandler.php

@@ -24,6 +24,7 @@ use App\Entity\Battery;
 use App\Entity\VehicleManufacturer;
 use App\Entity\BatteryManufacturer;
 use App\Entity\CustomerTag;
+use App\Entity\Warranty;
 
 use DateTime;
 
@@ -208,11 +209,19 @@ class ResqCustomerHandler implements CustomerHandlerInterface
                     $verror_array[$vehicle->index]['vehicle'] = 'Invalid vehicle specified.';
                 } 
                 else 
+                {
+                    // clean and validate plate number
+                    $clean_plate = $this->cleanPlateNumber($vehicle->plate_number);
+                    if (!($clean_plate))
+                    {
+                        $verror_array[$vehicle->index]['plate_number'] = 'Invalid plate number.';
+                    }
+                    else
                     {
                         $cust_vehicle = new CustomerVehicle();
                         $cust_vehicle->setName($vehicle->name)
                             ->setVehicle($vobj)
-                        ->setPlateNumber($vehicle->plate_number)
+                            ->setPlateNumber($clean_plate)
                             ->setModelYear($vehicle->model_year)
                             ->setColor($vehicle->color)
                             ->setStatusCondition($vehicle->status_condition)
@@ -267,6 +276,7 @@ class ResqCustomerHandler implements CustomerHandlerInterface
                     }
                 }
             }
+        }
 
         // validate
         $errors = $this->validator->validate($row);
@@ -697,10 +707,14 @@ class ResqCustomerHandler implements CustomerHandlerInterface
                 throw new CrudException("Could not find vehicle.");
 
             // TODO: validate details
+            // clean and validate plate number
+            $clean_plate = $this->cleanPlateNumber($vehicle->plate_number);
+            if (!($clean_plate))
+                throw new CrudException("Invalid plate number.");
 
             $cust_vehicle->setName($vehicle->name)
                 ->setVehicle($vobj)
-                ->setPlateNumber($vehicle->plate_number)
+                ->setPlateNumber($clean_plate)
                 ->setModelYear($vehicle->model_year)
                 ->setColor($vehicle->color)
                 ->setStatusCondition($vehicle->status_condition)
@@ -759,4 +773,13 @@ class ResqCustomerHandler implements CustomerHandlerInterface
         }
     }
 
+    protected function cleanPlateNumber($plate)
+    {
+        // trim plate number down to 20 characters
+        $trim_plate = str_replace(' ','', $plate);
+
+        $clean_plate = Warranty::cleanPlateNumber($trim_plate);
+
+        return $clean_plate;
+    }
 }