Merge pull request #9 from maartenJacobs/profile-routes-with-numeric-usernames

Fix for #8: removing the generic find-method

Author: reecefowell

Component/Dashboard/DashboardIntegrator.php

@@ -83,9 +83,9 @@ public function build(BuilderInterface $builder)
                     ->end()
                 ->end()
                 ->addLinks()
-                    ->addLink('ccdn_user_profile_show')
+                    ->addLink('ccdn_user_profile_show_by_id')
                         ->setAuthRole('ROLE_USER')
-                        ->setRoute('ccdn_user_profile_show')
+                        ->setRoute('ccdn_user_profile_show_by_id')
                         ->setIcon('/bundles/ccdncomponentcommon/images/icons/Black/32x32/32x32_user.png')
                         ->setLabel('dashboard.links.show_profile', array(), 'CCDNUserProfileBundle')
                     ->end()

Controller/ProfileController.php

@@ -47,7 +47,7 @@ public function showOverviewAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         return $this->renderResponse('CCDNUserProfileBundle:User:Profile/show_overview.html.', array(
             'crumbs' => $this->getCrumbs()->addProfileOverviewShow($user),
@@ -73,7 +73,7 @@ public function showBioAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         return $this->renderResponse('CCDNUserProfileBundle:User:Profile/show_bio.html.', array(
             'crumbs' => $this->getCrumbs()->addProfileBioShow($user),
@@ -96,7 +96,7 @@ public function editPersonalAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {
@@ -135,7 +135,7 @@ public function editInfoAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {
@@ -174,7 +174,7 @@ public function editContactAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {
@@ -213,7 +213,7 @@ public function editAvatarAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {
@@ -252,7 +252,7 @@ public function editBioAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {
@@ -291,7 +291,7 @@ public function editSignatureAction($userId)
             $userId = $this->getUser()->getId();
         }
 
-        $user = $this->getUserModel()->findOneUserWithProfile($userId);
+        $user = $this->getUserModel()->findOneUserWithProfileById($userId);
 
         // Does the requested $user match our session user id? Or, are we an admin?
         if ($user->getId() != $this->getUser()->getId()) {

Model/FrontModel/UserModel.php

@@ -69,23 +69,6 @@ public function findAllUsersWithProfileFilteredAtoZPaginated($alpha, $page = 1,
         return $pager;
     }
 
-    /**
-     *
-     * @access public
-     * @param  int                                                 $userId
-     * @return \Symfony\Component\Security\Core\User\UserInterface
-     */
-    public function findOneUserWithProfile($userId)
-    {
-        if (is_numeric($userId)) {
-            $user = $this->findOneUserWithProfileById($userId);
-        } else {
-            $user = $this->findOneUserWithProfileByUsername($userId);
-        }
-
-        return $user;
-    }
-
     /**
      *
      * @access public

Resources/config/routing/user-profile.yml

@@ -1,11 +1,6 @@
 #
 # Profile.
 #
-ccdn_user_profile_show:
-    pattern:  /
-    defaults: { _controller: CCDNUserProfileBundle:Profile:showOverview, userId: 0, _locale: en }
-
-
 ccdn_user_profile_show_by_id:
     pattern:  /{userId}
     defaults: { _controller: CCDNUserProfileBundle:Profile:showOverview, userId: 0, _locale: en }

Resources/views/Common/Layout/Sidebar/profile_sidebar.html.twig

@@ -3,8 +3,7 @@
 
 	<ul class="nav nav-pills nav-stacked">
 
-		{%- if route == 'ccdn_user_profile_show'
-		    or route == 'ccdn_user_profile_show_by_id'
+		{%- if route == 'ccdn_user_profile_show_by_id'
 		    or route == 'ccdn_user_profile_personal_edit'
 		    or route == 'ccdn_user_profile_info_edit'
 		    or route == 'ccdn_user_profile_contact_edit'