Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes in agent update API permission like group access and privileges #56

Open
wants to merge 4 commits into
base: 1.1
Choose a base branch
from
Open

Changes in agent update API permission like group access and privileges #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b8cb6f
Changes in agent api group team and privilegs in both create and upda…
Abhi12-gupta Jun 7, 2023
33eb1e8
Some changes in agent create and update apis
Abhi12-gupta Jun 7, 2023
f8271b2
Changes in update agent api in privileges and groups permission
Abhi12-gupta Jun 9, 2023
842d8e6
resolved conflict
Abhi12-gupta Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 130 additions & 84 deletions API/Agents.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function loadAgents(Request $request, EntityManagerInterface $entityManag
public function loadAgentDetails($id, Request $request)
{
$user = $this->getDoctrine()->getRepository(User::class)->findOneById($id);

if (empty($user)) {
return new JsonResponse([
'success' => false,
Expand All @@ -83,113 +83,138 @@ public function loadAgentDetails($id, Request $request)
]);
}

public function createAgentRecord(Request $request, EntityManagerInterface $entityManager, UserService $userService)
public function createAgentRecord(Request $request,EntityManagerInterface $entityManager, UserService $userService)
{
$params = $request->request->all();
$agentRecord = new User();
$params = $request->request->all()? : json_decode($request->getContent(),true);
$user = $entityManager->getRepository(User::class)->findOneByEmail($params['email']);
$agentInstance = !empty($user) ? $user->getAgentInstance() : null;

if (!empty($agentInstance)) {
return new JsonResponse([
'success' => false,
'message' => 'Agent with same email already exist.',
]);
}

$formDetails = $request->request->get('user_form');
$uploadedFiles = $request->files->get('user_form');

// Profile upload validation
$validMimeType = ['image/jpeg', 'image/png', 'image/jpg'];
if (empty($agentInstance)) {

$formDetails = $request->request->get('user_form');
$uploadedFiles = $request->files->get('user_form');

// Profile upload validation
$validMimeType = ['image/jpeg', 'image/png', 'image/jpg'];

if (isset( $uploadedFiles)) {
if(!in_array($uploadedFiles->getMimeType(), $validMimeType)){
return new JsonResponse([
'success' => false,
'message' => 'Profile image is not valid, please upload a valid format',
]);
}
}

if (isset( $uploadedFiles)) {
if (!in_array($uploadedFiles->getMimeType(), $validMimeType)){
$fullname = trim(implode(' ', [$params['firstName'], $params['lastName']]));
$supportRole = $entityManager->getRepository(SupportRole::class)->findOneByCode($params['role']);

if ($supportRole->getId() == 4 ){
return new JsonResponse([
'success' => false,
'message' => 'Profile image is not valid, please upload a valid format',
]);
'message' => 'Invalid agent role.',
],404);
}
}

$fullname = trim(implode(' ', [$params['firstName'], $params['lastName']]));
$supportRole = $entityManager->getRepository(SupportRole::class)->findOneByCode($params['role']);

$user = $userService->createUserInstance($request->request->get('email'), $fullname, $supportRole, [
'contact' => $params['contactNumber'],
'source' => 'website',
'active' => !empty($params['isActive']) ? true : false,
'image' => $uploadedFiles ? $uploadedFiles : null ,
'signature' => $params['signature'],
'designation' =>$params['designation']
]);
if (!empty($params['isActive'])) {
if ($params['isActive'] == '1' || $params['isActive'] == 'true') {
$params['isActive'] = true;
} elseif ($params['isActive'] == '0') {
$params['isActive'] = false;
} else {
$params['isActive'] = false;
}
} else {
$params['isActive'] = false;
}

$user = $userService->createUserInstance($params['email'], $fullname, $supportRole, [
'contact' => $params['contactNumber'],
'source' => 'website',
'active' => $params['isActive'],
'image' => $uploadedFiles ? $uploadedFiles : null ,
'signature' => $params['signature'],
'designation' =>$params['designation']
]);

if (!empty($user)) {
$user->setIsEnabled(true);
$entityManager->persist($user);
$entityManager->flush();
}
if(!empty($user)){
$user->setIsEnabled(true);
$entityManager->persist($user);
$entityManager->flush();
}

$userInstance = $user->getAgentInstance();
$userInstance = $user->getAgentInstance();

if (isset($params['ticketView'])) {
$userInstance->setTicketAccessLevel($params['ticketView']);
}
if (isset($params['ticketView'])) {
$userInstance->setTicketAccessLevel($params['ticketView']);
}

// Map support team
if (!empty($params['userSubGroup'])) {
$supportTeamRepository = $entityManager->getRepository(SupportTeam::class);
// Map support team
if (!empty($params['userSubGroup'])) {
$supportTeamRepository = $entityManager->getRepository(SupportTeam::class);

foreach ($params['userSubGroup'] as $supportTeamId) {
$supportTeam = $supportTeamRepository->findOneById($supportTeamId);
$userSubGroupIds = is_array($params['userSubGroup']) ? $params['userSubGroup'] : explode(',', $params['userSubGroup']);

foreach ($userSubGroupIds as $supportTeamId) {
$supportTeam = $supportTeamRepository->findOneById($supportTeamId);

if (!empty($supportTeam)) {
$userInstance->addSupportTeam($supportTeam);
if (!empty($supportTeam)) {
$userInstance->addSupportTeam($supportTeam);
}
}
}
}

// Map support group
if (!empty($params['groups'])) {
$supportGroupRepository = $entityManager->getRepository(SupportGroup::class);

// Map support group
if (!empty($params['groups'])) {
$supportGroupRepository = $entityManager->getRepository(SupportGroup::class);

$groupIds = is_array($params['groups']) ? $params['groups'] : explode(',', $params['groups']);

foreach ($params['groups'] as $supportGroupId) {
$supportGroup = $supportGroupRepository->findOneById($supportGroupId);
foreach ($groupIds as $supportGroupId) {
$supportGroup = $supportGroupRepository->findOneById($supportGroupId);

if (!empty($supportGroup)) {
$userInstance->addSupportGroup($supportGroup);
if (!empty($supportGroup)) {
$userInstance->addSupportGroup($supportGroup);
}
}
}
}

// Map support privileges
if (!empty($params['agentPrivilege'])) {
$supportPrivilegeRepository = $entityManager->getRepository(SupportPrivilege::class);
// Map support privileges
if (!empty($params['agentPrivilege'])) {
$supportPrivilegeRepository = $entityManager->getRepository(SupportPrivilege::class);
$priviligesId = is_array($params['agentPrivilege']) ? $params['agentPrivilege'] : explode(',', $params['agentPrivilege']);
foreach($priviligesId as $supportPrivilegeId) {
$supportPrivilege = $supportPrivilegeRepository->findOneById($supportPrivilegeId);

foreach($params['agentPrivilege'] as $supportPrivilegeId) {
$supportPrivilege = $supportPrivilegeRepository->findOneById($supportPrivilegeId);

if (!empty($supportPrivilege)) {
$userInstance->addSupportPrivilege($supportPrivilege);
if (!empty($supportPrivilege)) {
$userInstance->addSupportPrivilege($supportPrivilege);
}
}
}
}

$entityManager->persist($userInstance);
$entityManager->flush();
$entityManager->persist($userInstance);
$entityManager->flush();

return new JsonResponse([
'success' => true,
'message' => 'Agent added successfully.',
]);

return new JsonResponse([
'success' => true,
'message' => 'Agent added successfully.',
]);

} else {
return new JsonResponse([
'success' => false,
'message' => 'Agent with same email already exist.',
],404);
}
}

public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskService, UserPasswordEncoderInterface $passwordEncoder, FileSystem $fileSystem, EventDispatcherInterface $eventDispatcher)
public function updateAgentRecord(Request $request, $agentId, UVDeskService $uvdeskService, UserPasswordEncoderInterface $passwordEncoder, FileSystem $fileSystem, EventDispatcherInterface $eventDispatcher)
{
$params = $request->request->all();
$params = $request->request->all()? : json_decode($request->getContent(),true);
$dataFiles = $request->files->get('user_form');
$em = $this->getDoctrine()->getManager();
$user = $em->getRepository(User::class)->find($id);
$user = $em->getRepository(User::class)->find($agentId);
$instanceRole = $user->getAgentInstance()->getSupportRole()->getCode();

if (empty($user)) {
Expand All @@ -212,8 +237,8 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe

$checkUser = $em->getRepository(User::class)->findOneBy(array('email'=> $params['email']));
$errorFlag = 0;

if ($checkUser && $checkUser->getId() != $id) {
// dd($checkUser);
if ($checkUser && $checkUser->getId() != $agentId) {
$errorFlag = 1;
}

Expand All @@ -237,7 +262,7 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe
$user->setEmail($params['email']);
$user->setIsEnabled(true);

$userInstance = $em->getRepository(UserInstance::class)->findOneBy(array('user' => $id, 'supportRole' => array(1, 2, 3)));
$userInstance = $em->getRepository(UserInstance::class)->findOneBy(array('user' => $agentId, 'supportRole' => array(1, 2, 3)));
$oldSupportTeam = ($supportTeamList = $userInstance != null ? $userInstance->getSupportTeams() : null) ? $supportTeamList->toArray() : [];
$oldSupportGroup = ($supportGroupList = $userInstance != null ? $userInstance->getSupportGroups() : null) ? $supportGroupList->toArray() : [];
$oldSupportedPrivilege = ($supportPrivilegeList = $userInstance != null ? $userInstance->getSupportPrivileges() : null)? $supportPrivilegeList->toArray() : [];
Expand Down Expand Up @@ -267,13 +292,27 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe
$userInstance->setProfileImagePath(null);
}


if (!empty($params['isActive'])) {
if ($params['isActive'] == '1' || $params['isActive'] == 'true') {
$params['isActive'] = true;
} elseif ($params['isActive'] == '0') {
$params['isActive'] = false;
} else {
$params['isActive'] = false;
}
} else {
$params['isActive'] = false;
}

$userInstance->setSignature($params['signature']);
$userInstance->setIsActive(isset($params['isActive']) ? $params['isActive'] : 0);
$userInstance->setIsActive($params['isActive']);

//Team support to agent
if(isset($params['userSubGroup'])){
foreach ($params['userSubGroup'] as $userSubGroup) {

$userSubGroupIds = is_array($params['userSubGroup']) ? $params['userSubGroup'] : explode(',', $params['userSubGroup']);

foreach ($userSubGroupIds as $userSubGroup) {
if($userSubGrp = $uvdeskService->getEntityManagerResult(
SupportTeam::class,
'findOneBy', [
Expand All @@ -296,7 +335,10 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe

//Group support
if(isset($params['groups'])){
foreach ($params['groups'] as $userGroup) {

$groupIds = is_array($params['groups']) ? $params['groups'] : explode(',', $params['groups']);

foreach ($groupIds as $userGroup) {
if($userGrp = $uvdeskService->getEntityManagerResult(
SupportGroup::class,
'findOneBy', [
Expand All @@ -320,7 +362,10 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe

//Privilegs support
if(isset($params['agentPrivilege'])){
foreach ($params['agentPrivilege'] as $supportPrivilege) {

$priviligesId = is_array($params['agentPrivilege']) ? $params['agentPrivilege'] : explode(',', $params['agentPrivilege']);

foreach ($priviligesId as $supportPrivilege) {
if($supportPlg = $uvdeskService->getEntityManagerResult(
SupportPrivilege::class,
'findOneBy', [
Expand All @@ -334,6 +379,7 @@ public function updateAgentRecord($id, Request $request, UVDeskService $uvdeskSe
}elseif($oldSupportedPrivilege && ($key = array_search($supportPlg, $oldSupportedPrivilege)) !== false)
unset($oldSupportedPrivilege[$key]);
}

foreach ($oldSupportedPrivilege as $removeGroup) {
$userInstance->removeSupportPrivilege($removeGroup);
$em->persist($userInstance);
Expand Down
1 change: 1 addition & 0 deletions EventListeners/API/KernelException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public function __construct(FirewallMap $firewall)

public function onKernelException(ExceptionEvent $event)
{
return;
$request = $event->getRequest();
$exception = $event->getThrowable();

Expand Down
2 changes: 1 addition & 1 deletion Resources/config/routes/api/v1/agents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ uvdesk_api_bundle_v1.0.0_agents_api_create_agent:
methods: [POST]

uvdesk_api_bundle_v1.0.0_agents_api_update_agent:
path: /agents/update/{id}
path: /agents/update/{agentId}
controller: Webkul\UVDesk\ApiBundle\API\Agents::updateAgentRecord
methods: [POST]

Expand Down