Changes per feedback

Author: aksinha-nerdapplabs

src/ApiBundle/Controller/Admin/UserController.php

@@ -56,39 +56,17 @@ public function newAction(Request $request)
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-          try {
-              $userManager = $this->container->get('fos_user.user_manager');
-              $user = $userManager->createUser();
-
-              $user->setFirstname($form['firstname']->getData());
-              $user->setLastname($form['lastname']->getData());
-              $user->setDob($form['dob']->getData());
-              $user->setEmail($form['email']->getData());
-              $user->setUsername($form['username']->getData());
-              $user->setPlainPassword($form['password']->getData());
-              $user->setRoles($form['roles']->getData());
-              $user->setConfirmationToken(null);
-              $user->setEnabled(true);
-              $user->setLastLogin(new \DateTime());
-
-              $userManager->updateUser($user);
-              $flashMsg = $this->get('translator')->trans('flash.user_created_successfully');
-              $this->addFlash('success', $flashMsg);
-
-            } catch(HttpException $e) {
-              return $this->redirectToRoute('admin_user_new');
-
-            // Always catch exact exception for which flash message or logger is needed,
-            // otherwise catch block will not get executed on higher or lower ranked exceptions.
-            } catch(\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) {
-              $flashMsg = $this->get('translator')->trans('flash.user_already_exists');
-              $this->logMessage(400, 'danger', $e->getMessage());
-              $this->addFlash('danger', $flashMsg);
-              return $this->redirectToRoute('admin_user_new');
-            }
+            $userManager = $this->container->get('fos_user.user_manager');
+            $user = $userManager->createUser();
+
+            $this->setUserColumns($user, $form);
+
+            $userManager->updateUser($user);
+
+            $this->logMessageAndFlash(200, 'success', 'User successfully created: ', $this->get('translator')->trans('flash.user_creatd_successfully'), $request->getLocale() );
 
             return $this->redirectToRoute('admin_user_index');
-        } // if form is valid
+        }
 
         return $this->render('@ApiBundle/Resources/views/admin/user/new.html.twig', [
             'form' => $form->createView(),
@@ -119,41 +97,19 @@ public function showAction(User $user)
      */
     public function editAction(User $user, Request $request)
     {
-        $entityManager = $this->getDoctrine()->getManager();
-
         $editForm = $this->createForm(UserType::class, $user);
         $deleteForm = $this->createDeleteForm($user);
         $locale = $request->getLocale();
 
         $editForm->handleRequest($request);
 
         if ($editForm->isSubmitted() && $editForm->isValid()) {
-          try {
-                $user->setFirstname($editForm['firstname']->getData());
-                $user->setLastname($editForm['lastname']->getData());
-                $user->setDob($editForm['dob']->getData());
-                $user->setEmail($editForm['email']->getData());
-                $user->setUsername($editForm['username']->getData());
-                $user->setPlainPassword($editForm['password']->getData());
-                $user->setRoles($editForm['roles']->getData());
-                $user->setConfirmationToken(null);
-                $user->setEnabled(true);
-                $user->setLastLogin(new \DateTime());
-
-                $entityManager->flush();
-                $flashMsg = $this->get('translator')->trans('flash.user_updated_successfully');
-                $this->addFlash('success', $flashMsg);
-
-            // Always catch exact exception for which flash message or logger is needed,
-            // otherwise catch block will not get executed on higher or lower ranked exceptions.
-            } catch(HttpException $e) {
-                return $this->redirectToRoute('admin_user_edit', ['id' => $user->getId()]);
-            } catch(\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) {
-                $flashMsg = $this->get('translator')->trans('flash.user_already_exists');
-                $this->logMessage(400, 'danger', $e->getMessage());
-                $this->addFlash('danger', $flashMsg);
-                return $this->redirectToRoute('admin_user_edit', ['id' => $user->getId()]);
-            }
+            $this->setUserColumns($user, $editForm);
+
+            $entityManager = $this->getDoctrine()->getManager();
+            $entityManager->flush();
+
+            $this->logMessageAndFlash(200, 'success', 'User successfully updated: ', $this->get('translator')->trans('flash.user_updated_successfully'), $request->getLocale() );
 
             return $this->redirectToRoute('admin_user_index');
         }
@@ -179,9 +135,7 @@ public function deleteAction(Request $request, User $user)
 
         $entityManager->flush();
 
-        $flashMsg = $this->get('translator')->trans('flash.user_deleted_successfully');
-        $this->logMessage(200, 'success', 'User successfully deleted: ');
-        $this->addFlash('success', $flashMsg);
+        $this->logMessageAndFlash(200, 'success', 'User successfully deleted: ', $this->get('translator')->trans('flash.user_deleted_successfully'), $request->getLocale() );
 
         return $this->redirectToRoute('admin_user_index');
     }
@@ -202,11 +156,24 @@ private function createDeleteForm(User $user)
         ;
     }
 
+    private function setUserColumns(User $user, \Symfony\Component\Form\Form $form)
+    {
+      $user->setFirstname($form['firstname']->getData());
+      $user->setLastname($form['lastname']->getData());
+      $user->setDob($form['dob']->getData());
+      $user->setEmail($form['email']->getData());
+      $user->setUsername($form['username']->getData());
+      $user->setPlainPassword($form['password']->getData());
+      $user->setRoles($form['roles']->getData());
+      $user->setConfirmationToken(null);
+      $user->setEnabled(true);
+      $user->setLastLogin(new \DateTime());
+    }
+
     private function logMessageAndFlash($code = 200, $type = 'success', $logMsg = '', $flashMsg = '', $locale = 'en')
     {
         $this->logMessage($code, $type, $logMsg);
         $this->addFlash($type, $flashMsg);
-        throw new HttpException($code, $logMsg);
     }
 
     private function logMessage($code = 200, $type='success', $logMsg = '') {

src/ApiBundle/Form/UserType.php

@@ -24,14 +24,15 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
             ->add('firstname',TextType::class)
-            ->add('lastname',TextType::class)
+            ->add('lastname',TextType::class, array('required' => false))
             ->add('email', EmailType::class)
-            ->add('dob', DateType::class)
+            ->add('dob', DateType::class, array('widget' => 'single_text', 'format' => 'M/d/y'))
             ->add('username', TextType::class)
-            ->add('password', TextType::class, array('data' => ''))
+            ->add('password', PasswordType::class, array('data' => ''))
             ->add('roles', CollectionType::class, array(
                   'entry_type'   => ChoiceType::class,
                   'entry_options'  => array(
+                      'label' => false,
                       'choices'  => array(
                           'ROLE_USER' => 'ROLE_USER',
                           'ROLE_API'  => 'ROLE_API',