From c2017a0399e3a1feb00d991ed375d981b972980f Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 26 Jan 2012 16:23:09 +0100 Subject: [PATCH] Fix usrlist unit tests --- .../Phrasea/Controller/Prod/UsrLists.php | 646 +++++++++--------- .../Phrasea/Controller/Prod/WorkZone.php | 7 +- .../Repositories/UsrListOwnerRepository.php | 33 + 3 files changed, 365 insertions(+), 321 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php index cf0e5c5c3a..23c7abb4ba 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php @@ -37,261 +37,261 @@ class UsrLists implements ControllerProviderInterface * Get all lists */ $controllers->get('/list/all/', function(Application $app) - { - $em = $app['Core']->getEntityManager(); + { + $em = $app['Core']->getEntityManager(); - $repository = $em->getRepository('\Entities\UsrList'); + $repository = $em->getRepository('\Entities\UsrList'); - $lists = $repository->findUserLists($app['Core']->getAuthenticatedUser()); + $lists = $repository->findUserLists($app['Core']->getAuthenticatedUser()); - $datas = array('lists' => array()); + $datas = array('lists' => array()); - foreach ($lists as $list) - { - $owners = $entries = array(); + foreach ($lists as $list) + { + $owners = $entries = array(); - foreach ($list->getOwners() as $owner) - { - $owners[] = array( - 'usr_id' => $owner->getUser()->get_id(), - 'display_name' => $owner->getUser()->get_display_name(), - 'position' => $owner->getUser()->get_position(), - 'job' => $owner->getUser()->get_job(), - 'company' => $owner->getUser()->get_company(), - 'email' => $owner->getUser()->get_email(), - 'role' => $owner->getRole() - ); - } + foreach ($list->getOwners() as $owner) + { + $owners[] = array( + 'usr_id' => $owner->getUser()->get_id(), + 'display_name' => $owner->getUser()->get_display_name(), + 'position' => $owner->getUser()->get_position(), + 'job' => $owner->getUser()->get_job(), + 'company' => $owner->getUser()->get_company(), + 'email' => $owner->getUser()->get_email(), + 'role' => $owner->getRole() + ); + } - foreach ($list->getEntries() as $entry) - { - $entries[] = array( - 'usr_id' => $owner->getUser()->get_id(), - 'display_name' => $owner->getUser()->get_display_name(), - 'position' => $owner->getUser()->get_position(), - 'job' => $owner->getUser()->get_job(), - 'company' => $owner->getUser()->get_company(), - 'email' => $owner->getUser()->get_email(), - ); - } + foreach ($list->getEntries() as $entry) + { + $entries[] = array( + 'usr_id' => $owner->getUser()->get_id(), + 'display_name' => $owner->getUser()->get_display_name(), + 'position' => $owner->getUser()->get_position(), + 'job' => $owner->getUser()->get_job(), + 'company' => $owner->getUser()->get_company(), + 'email' => $owner->getUser()->get_email(), + ); + } - /* @var $list \Entities\UsrList */ - $datas['lists'][] = array( - 'name' => $list->getName(), - 'created' => $list->getCreated()->format(DATE_ATOM), - 'updated' => $list->getUpdated()->format(DATE_ATOM), - 'owners' => $owners, - 'users' => $entries - ); - } + /* @var $list \Entities\UsrList */ + $datas['lists'][] = array( + 'name' => $list->getName(), + 'created' => $list->getCreated()->format(DATE_ATOM), + 'updated' => $list->getUpdated()->format(DATE_ATOM), + 'owners' => $owners, + 'users' => $entries + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Creates a list */ $controllers->post('/list/', function(Application $app) - { - $request = $app['request']; + { + $request = $app['request']; - $list_name = $request->get('name'); + $list_name = $request->get('name'); - $datas = array( - 'success' => false - , 'message' => sprintf(_('Unable to create list %s'), $list_name) - ); + $datas = array( + 'success' => false + , 'message' => sprintf(_('Unable to create list %s'), $list_name) + ); - try - { - if(!$list_name) - { - throw new ControllerException(_('List name is required')); - } + try + { + if (!$list_name) + { + throw new ControllerException(_('List name is required')); + } - $em = $app['Core']->getEntityManager(); + $em = $app['Core']->getEntityManager(); - $List = new \Entities\UsrList(); + $List = new \Entities\UsrList(); - $Owner = new \Entities\UsrListOwner(); - $Owner->setRole(\Entities\UsrListOwner::ROLE_ADMIN); - $Owner->setUser($app['Core']->getAuthenticatedUser()); - $Owner->setList($List); + $Owner = new \Entities\UsrListOwner(); + $Owner->setRole(\Entities\UsrListOwner::ROLE_ADMIN); + $Owner->setUser($app['Core']->getAuthenticatedUser()); + $Owner->setList($List); - $List->setName($list_name); - $List->addUsrListOwner($Owner); + $List->setName($list_name); + $List->addUsrListOwner($Owner); - $em->persist($Owner); - $em->persist($List); - $em->flush(); + $em->persist($Owner); + $em->persist($List); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => sprintf(_('List %s has been created'), $list_name) - ); - } - catch (ControllerException $e) - { - $datas = array( - 'success' => false - , 'message' => $e->getMessage() - ); - } + $datas = array( + 'success' => true + , 'message' => sprintf(_('List %s has been created'), $list_name) + ); + } + catch (ControllerException $e) + { + $datas = array( + 'success' => false + , 'message' => $e->getMessage() + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Gets a list */ $controllers->get('/list/{list_id}/', function(Application $app, $list_id) - { - $user = $app['Core']->getAuthenticatedUser(); - $em = $app['Core']->getEntityManager(); + { + $user = $app['Core']->getAuthenticatedUser(); + $em = $app['Core']->getEntityManager(); - $repository = $em->getRepository('\Entities\UsrList'); + $repository = $em->getRepository('\Entities\UsrList'); - $list = $repository->findUserListByUserAndId($user, $list_id); + $list = $repository->findUserListByUserAndId($user, $list_id); - $owners = $entries = $lists = array(); + $owners = $entries = $lists = array(); - foreach ($list->getOwners() as $owner) - { - $owners[] = array( - 'usr_id' => $owner->getUser()->get_id(), - 'display_name' => $owner->getUser()->get_display_name(), - 'position' => $owner->getUser()->get_position(), - 'job' => $owner->getUser()->get_job(), - 'company' => $owner->getUser()->get_company(), - 'email' => $owner->getUser()->get_email(), - 'role' => $owner->getRole() - ); - } + foreach ($list->getOwners() as $owner) + { + $owners[] = array( + 'usr_id' => $owner->getUser()->get_id(), + 'display_name' => $owner->getUser()->get_display_name(), + 'position' => $owner->getUser()->get_position(), + 'job' => $owner->getUser()->get_job(), + 'company' => $owner->getUser()->get_company(), + 'email' => $owner->getUser()->get_email(), + 'role' => $owner->getRole() + ); + } - foreach ($list->getEntries() as $entry) - { - $entries[] = array( - 'usr_id' => $owner->getUser()->get_id(), - 'display_name' => $owner->getUser()->get_display_name(), - 'position' => $owner->getUser()->get_position(), - 'job' => $owner->getUser()->get_job(), - 'company' => $owner->getUser()->get_company(), - 'email' => $owner->getUser()->get_email(), - ); - } + foreach ($list->getEntries() as $entry) + { + $entries[] = array( + 'usr_id' => $owner->getUser()->get_id(), + 'display_name' => $owner->getUser()->get_display_name(), + 'position' => $owner->getUser()->get_position(), + 'job' => $owner->getUser()->get_job(), + 'company' => $owner->getUser()->get_company(), + 'email' => $owner->getUser()->get_email(), + ); + } - /* @var $list \Entities\UsrList */ - $datas = array('list' => array( - 'name' => $list->getName(), - 'created' => $list->getCreated()->format(DATE_ATOM), - 'updated' => $list->getUpdated()->format(DATE_ATOM), - 'owners' => $owners, - 'users' => $entries - ) - ); + /* @var $list \Entities\UsrList */ + $datas = array('list' => array( + 'name' => $list->getName(), + 'created' => $list->getCreated()->format(DATE_ATOM), + 'updated' => $list->getUpdated()->format(DATE_ATOM), + 'owners' => $owners, + 'users' => $entries + ) + ); - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Update a list */ $controllers->post('/list/{list_id}/update/', function(Application $app, $list_id) - { - $request = $app['request']; + { + $request = $app['request']; - $datas = array( - 'success' => false - , 'message' => _('Unable to update list') - ); + $datas = array( + 'success' => false + , 'message' => _('Unable to update list') + ); - try - { - $list_name = $request->get('name'); + try + { + $list_name = $request->get('name'); - if(!$list_name) - { - throw new ControllerException(_('List name is required')); - } + if (!$list_name) + { + throw new ControllerException(_('List name is required')); + } - $user = $app['Core']->getAuthenticatedUser(); - $em = $app['Core']->getEntityManager(); + $user = $app['Core']->getAuthenticatedUser(); + $em = $app['Core']->getEntityManager(); - $repository = $em->getRepository('\Entities\UsrList'); + $repository = $em->getRepository('\Entities\UsrList'); - $list = $repository->findUserListByUserAndId($user, $list_id); + $list = $repository->findUserListByUserAndId($user, $list_id); - $list->setName($list_name); + $list->setName($list_name); - $em->merge($list); - $em->flush(); + $em->merge($list); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => _('List has been updated') - ); - } - catch (ControllerException $e) - { - $datas = array( - 'success' => false - , 'message' => $e->getMessage() - ); - } + $datas = array( + 'success' => true + , 'message' => _('List has been updated') + ); + } + catch (ControllerException $e) + { + $datas = array( + 'success' => false + , 'message' => $e->getMessage() + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Delete a list */ $controllers->post('/list/{list_id}/delete/', function(Application $app, $list_id) - { - $em = $app['Core']->getEntityManager(); + { + $em = $app['Core']->getEntityManager(); - try - { - $repository = $em->getRepository('\Entities\UsrList'); + try + { + $repository = $em->getRepository('\Entities\UsrList'); - $user = $app['Core']->getAuthenticatedUser(); + $user = $app['Core']->getAuthenticatedUser(); - $list = $repository->findUserListByUserAndId($user, $list_id); + $list = $repository->findUserListByUserAndId($user, $list_id); - $em->remove($list); - $em->flush(); + $em->remove($list); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => sprintf(_('List has been deleted')) - ); - } - catch (\Exception $e) - { + $datas = array( + 'success' => true + , 'message' => sprintf(_('List has been deleted')) + ); + } + catch (\Exception $e) + { - $datas = array( - 'success' => false - , 'message' => sprintf(_('Unable to delete list')) - ); - } + $datas = array( + 'success' => false + , 'message' => sprintf(_('Unable to delete list')) + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); @@ -299,201 +299,211 @@ class UsrLists implements ControllerProviderInterface * Remove a usr_id from a list */ $controllers->post('/list/{list_id}/remove/{entry_id}/', function(Application $app, $list_id, $entry_id) - { - $em = $app['Core']->getEntityManager(); + { + $em = $app['Core']->getEntityManager(); - try - { - $repository = $em->getRepository('\Entities\UsrList'); + try + { + $repository = $em->getRepository('\Entities\UsrList'); - $user = $app['Core']->getAuthenticatedUser(); + $user = $app['Core']->getAuthenticatedUser(); - $list = $repository->findUserListByUserAndId($user, $list_id); - /* @var $list \Entities\UsrList */ + $list = $repository->findUserListByUserAndId($user, $list_id); + /* @var $list \Entities\UsrList */ - $entry_repository = $em->getRepository('\Entities\UsrListEntry'); + $entry_repository = $em->getRepository('\Entities\UsrListEntry'); - $user_entry = $entry_repository->findEntryByListAndEntryId($list, $entry_id); + $user_entry = $entry_repository->findEntryByListAndEntryId($list, $entry_id); - $em->remove($user_entry); - $em->flush(); + $em->remove($user_entry); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => _('Entry removed from list') - ); - } - catch (\Exception $e) - { + $datas = array( + 'success' => true + , 'message' => _('Entry removed from list') + ); + } + catch (\Exception $e) + { - $datas = array( - 'success' => false - , 'message' => _('Unable to remove entry from list') - ); - } + $datas = array( + 'success' => false + , 'message' => _('Unable to remove entry from list') + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Adds a usr_id to a list */ $controllers->post('/list/{list_id}/add/{usr_id}/', function(Application $app, $list_id, $usr_id) - { - $em = $app['Core']->getEntityManager(); - $user = $app['Core']->getAuthenticatedUser(); + { + $em = $app['Core']->getEntityManager(); + $user = $app['Core']->getAuthenticatedUser(); - try - { - $repository = $em->getRepository('\Entities\UsrList'); + try + { + $repository = $em->getRepository('\Entities\UsrList'); - $list = $repository->findUserListByUserAndId($user, $list_id); - /* @var $list \Entities\UsrList */ - $user_entry = \User_Adapter::getInstance($usr_id, \appbox::get_instance()); + $list = $repository->findUserListByUserAndId($user, $list_id); + /* @var $list \Entities\UsrList */ + $user_entry = \User_Adapter::getInstance($usr_id, \appbox::get_instance()); - $entry = new \Entities\UsrListEntry(); - $entry->setUser($user_entry); - $entry->setList($list); + $entry = new \Entities\UsrListEntry(); + $entry->setUser($user_entry); + $entry->setList($list); - $list->addUsrListEntry($entry); + $list->addUsrListEntry($entry); - $em->persist($entry); - $em->merge($list); + $em->persist($entry); + $em->merge($list); - $em->flush(); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => _('Usr added to list') - ); - } - catch (\Exception $e) - { + $datas = array( + 'success' => true + , 'message' => _('Usr added to list') + ); + } + catch (\Exception $e) + { - $datas = array( - 'success' => false - , 'message' => _('Unable to add usr to list') - ); - } + $datas = array( + 'success' => false + , 'message' => _('Unable to add usr to list') + ); + } - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * Share a list to a user with an optionnal role */ $controllers->post('/list/{list_id}/share/{usr_id}/', function(Application $app, $list_id, $usr_id) - { - $em = $app['Core']->getEntityManager(); - $user = $app['Core']->getAuthenticatedUser(); + { + $em = $app['Core']->getEntityManager(); + $user = $app['Core']->getAuthenticatedUser(); - try - { - $repository = $em->getRepository('\Entities\UsrList'); + $availableRoles = array( + \Entities\UsrListOwner::ROLE_USER, + \Entities\UsrListOwner::ROLE_EDITOR, + \Entities\UsrListOwner::ROLE_ADMIN, + ); - $list = $repository->findUserListByUserAndId($user, $list_id); - /* @var $list \Entities\UsrList */ + if (!$app['request']->get('role')) + throw new \Exception_BadRequest('Missing role parameter'); + elseif (!in_array($app['request']->get('role'), $availableRoles)) + throw new \Exception_BadRequest('Role is invalid'); - if($list->getOwner($user)->getRole() < \Entities\UsrListOwner::ROLE_EDITOR) - { - throw new \Exception('You are not authorized to do this'); - } + try + { + $repository = $em->getRepository('\Entities\UsrList'); - $new_owner = \User_Adapter::getInstance($usr_id, \appbox::get_instance()); + $list = $repository->findUserListByUserAndId($user, $list_id); + /* @var $list \Entities\UsrList */ - if($list->hasAccess($new_owner)) - { - $owner = $list->getOwner($new_owner); - } - else - { - $owner = new \Entities\UsrListOwner(); - $owner->setList($list); - $owner->setUser($new_owner); + if ($list->getOwner($user)->getRole() < \Entities\UsrListOwner::ROLE_EDITOR) + { + throw new \Exception('You are not authorized to do this'); + } - $list->addUsrListOwner($owner); + $new_owner = \User_Adapter::getInstance($usr_id, \appbox::get_instance()); - $em->persist($owner); - $em->merge($list); - } + if ($list->hasAccess($new_owner)) + { + $owner = $list->getOwner($new_owner); + } + else + { + $owner = new \Entities\UsrListOwner(); + $owner->setList($list); + $owner->setUser($new_owner); - $role = $app['request']->get('role', \Entities\UsrListOwner::ROLE_USER); + $list->addUsrListOwner($owner); - $owner->setRole($role); + $em->persist($owner); + $em->merge($list); + } - $em->merge($owner); - $em->flush(); + $role = $app['request']->get('role'); - $datas = array( - 'success' => true - , 'message' => _('List shared to user') - ); - } - catch (\Exception $e) - { + $owner->setRole($role); - $datas = array( - 'success' => false - , 'message' => _('Unable to share the list with the usr') - ); - } + $em->merge($owner); + $em->flush(); - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + $datas = array( + 'success' => true + , 'message' => _('List shared to user') + ); + } + catch (\Exception $e) + { - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + $datas = array( + 'success' => false + , 'message' => _('Unable to share the list with the usr') + ); + } + + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); + + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); /** * UnShare a list to a user */ - $controllers->post('/list/{list_id}/unshare/{owner_id}/', function(Application $app, $list_id, $owner_id) - { - $em = $app['Core']->getEntityManager(); - $user = $app['Core']->getAuthenticatedUser(); + $controllers->post('/list/{list_id}/unshare/{usr_id}/', function(Application $app, $list_id, $usr_id) + { + $em = $app['Core']->getEntityManager(); + $user = $app['Core']->getAuthenticatedUser(); - try - { - $repository = $em->getRepository('\Entities\UsrList'); + try + { + $repository = $em->getRepository('\Entities\UsrList'); - $list = $repository->findUserListByUserAndId($user, $list_id); - /* @var $list \Entities\UsrList */ + $list = $repository->findUserListByUserAndId($user, $list_id); + /* @var $list \Entities\UsrList */ - if($list->getOwner($user)->getList() < \Entities\UsrListOwner::ROLE_ADMIN) - { - throw new \Exception('You are not authorized to do this'); - } + if ($list->getOwner($user)->getRole() < \Entities\UsrListOwner::ROLE_ADMIN) + { + throw new \Exception('You are not authorized to do this'); + } - $owners_repository = $em->getRepository('\Entities\UsrListOwner'); + $owners_repository = $em->getRepository('\Entities\UsrListOwner'); - $owner = $owners_repository->findByListAndOwner($list, $owner_id); + $owner = $owners_repository->findByListAndUsrId($list, $usr_id); - $em->remove($owner); - $em->flush(); + $em->remove($owner); + $em->flush(); - $datas = array( - 'success' => true - , 'message' => _('Owner removed from list') - ); - } - catch (\Exception $e) - { + $datas = array( + 'success' => true + , 'message' => _('Owner removed from list') + ); + } + catch (\Exception $e) + { + $datas = array( + 'success' => false + , 'message' => _('Unable to remove usr from list') + ); + } - $datas = array( - 'success' => false - , 'message' => _('Unable to add usr to list') - ); - } + $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - $Json = $app['Core']['Serializer']->serialize($datas, 'json'); - - return new Response($Json, 200, array('Content-Type' => 'application/json')); - } + return new Response($Json, 200, array('Content-Type' => 'application/json')); + } ); diff --git a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php index b0a65beaf9..8725e72198 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php @@ -127,7 +127,8 @@ class WorkZone implements ControllerProviderInterface '/attachStories/' , function(Application $app, Request $request) { - + if(!$request->get('stories')) + throw new \Exception_BadRequest(); $user = $app['Core']->getAuthenticatedUser(); @@ -137,7 +138,7 @@ class WorkZone implements ControllerProviderInterface $StoryWZRepo = $em->getRepository('\Entities\StoryWZ'); $alreadyFixed = $done = 0; - + foreach (explode(';', $request->get('stories')) as $element) { $element = explode('_', $element); @@ -196,7 +197,7 @@ class WorkZone implements ControllerProviderInterface else { $message = sprintf( - _('%1$d Story attached to the WorkZone, %2$d already attached') + _('%1$d Stories attached to the WorkZone, %2$d already attached') , $done , $alreadyFixed ); diff --git a/lib/Doctrine/Repositories/UsrListOwnerRepository.php b/lib/Doctrine/Repositories/UsrListOwnerRepository.php index c1fb66d3e1..ec44b0a464 100644 --- a/lib/Doctrine/Repositories/UsrListOwnerRepository.php +++ b/lib/Doctrine/Repositories/UsrListOwnerRepository.php @@ -12,6 +12,7 @@ use Doctrine\ORM\EntityRepository; */ class UsrListOwnerRepository extends EntityRepository { + /** * * @@ -37,4 +38,36 @@ class UsrListOwnerRepository extends EntityRepository return $owner; } + /** + * + * + * @param \Entities\UsrList $list + * @param type $usr_id + * @return \Entities\UsrList + */ + public function findByListAndUsrId(\Entities\UsrList $list, $usr_id) + { + $dql = 'SELECT o FROM Entities\UsrListOwner o + JOIN o.list l + WHERE l.id = :list_id AND o.usr_id = :usr_id'; + + $params = array( + 'usr_id' => $usr_id, + 'list_id' => $list->getId() + ); + + $query = $this->_em->createQuery($dql); + $query->setParameters($params); + + $owner = $query->getSingleResult(); + + /* @var $owner \Entities\UsrListOwner */ + if (null === $owner) + { + throw new \Exception_NotFound(_('Owner is not found')); + } + + return $owner; + } + }