From ac2138c1b1fa0ae6dda595c76f6acc074a04d592 Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Fri, 27 Nov 2020 10:27:01 +0000
Subject: [PATCH] Fix error validation for SAP battery. #524

---
 src/Controller/SAPBatteryController.php | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Controller/SAPBatteryController.php b/src/Controller/SAPBatteryController.php
index 19a547bc..b947834b 100644
--- a/src/Controller/SAPBatteryController.php
+++ b/src/Controller/SAPBatteryController.php
@@ -152,19 +152,26 @@ class SAPBatteryController extends Controller
     {
         $this->denyAccessUnlessGranted('sap_battery.add', null, 'No access.');
 
+        // initialize error list
+        $error_array = [];
+
         // create new row
         $em = $this->getDoctrine()->getManager();
         $row = new SAPBattery();
 
+        $id = trim($req->request->get('id'));
+        if (empty($id))
+            $error_array['id'] = 'SAP code is required.';
+
         // set and save values
-        $row->setID($req->request->get('id'));
+        $row->setID($id);
 
         // custom validation for battery brand
         $brand = $em->getRepository(SAPBatteryBrand::class)
             ->find($req->request->get('brand'));
 
         if (empty($brand))
-            $error_array['brannd'] = 'Invalid brand selected.';
+            $error_array['brand'] = 'Invalid brand selected.';
         else
             $row->setBrand($brand);
 
@@ -180,9 +187,6 @@ class SAPBatteryController extends Controller
         // validate
         $errors = $validator->validate($row);
 
-        // initialize error list
-        $error_array = [];
-
         // add errors to list
         foreach ($errors as $error) {
             $error_array[$error->getPropertyPath()] = $error->getMessage();
@@ -247,8 +251,15 @@ class SAPBatteryController extends Controller
         if (empty($row))
             throw $this->createNotFoundException('The item does not exist');
 
+        // initialize error list
+        $error_array = [];
+
+        $id = trim($req->request->get('id'));
+        if (empty($id))
+            $error_array['id'] = 'SAP code is required.';
+
         // set and save values
-        $row->setID($req->request->get('id'));
+        $row->setID($id);
 
         // custom validation for battery brand
         $brand = $em->getRepository(SAPBatteryBrand::class)
@@ -271,9 +282,6 @@ class SAPBatteryController extends Controller
         // validate
         $errors = $validator->validate($row);
 
-        // initialize error list
-        $error_array = [];
-
         // add errors to list
         foreach ($errors as $error) {
             $error_array[$error->getPropertyPath()] = $error->getMessage();