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.

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

Update/cur 3969 update lti tool settings clone api #1248

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public function clone(Request $request, Organization $suborganization, LtiToolSe
'user_id' => 'required|exists:users,id',
'organization_id' => 'required|exists:organizations,id'
]);
CloneLtiToolSetting::dispatch($ltiToolSetting, $suborganization, $request->bearerToken())->delay(now()->addSecond());
CloneLtiToolSetting::dispatch($ltiToolSetting, $suborganization, $requestData['user_id'], $request->bearerToken())->delay(now()->addSecond());
return response([
"message" => "Your request to clone Lti Tool Setting [$ltiToolSetting->tool_name] has been received and is being processed. <br>
You will be alerted in the notification section in the title bar when complete.",
Expand Down
20 changes: 14 additions & 6 deletions app/Jobs/CloneLtiToolSetting.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Log;

class CloneLtiToolSetting implements ShouldQueue
{
Expand All @@ -33,18 +34,25 @@ class CloneLtiToolSetting implements ShouldQueue
*/
protected $token;

/**
* @var userId
*/
protected $userId;

/**
* Create a new job instance.
* @param LtiToolSetting $ltiToolSetting
* @param Organization $suborganization
* @param $userId
* @param $token
* @return void
*/
public function __construct(LtiToolSetting $ltiToolSetting, Organization $suborganization, $token)
public function __construct(LtiToolSetting $ltiToolSetting, Organization $suborganization, $userId, $token)
{
//
$this->ltiToolSetting = $ltiToolSetting;
$this->subOrganization = $suborganization;
$this->userId = $userId;
$this->token = $token;
}

Expand All @@ -57,12 +65,12 @@ public function __construct(LtiToolSetting $ltiToolSetting, Organization $suborg
public function handle(LtiToolSettingInterface $ltiToolSettingRepository, UserRepositoryInterface $userRepository)
{
try {
$ltiToolSettingRepository->clone($this->ltiToolSetting, $this->subOrganization, $this->token);
$ltiToolSettingRepository->clone($this->ltiToolSetting, $this->subOrganization, $this->userId);
$message = "Your request to clone Lti Tool Setting [" . $this->ltiToolSetting->tool_name . "] has been completed and available";
$user_id = $userRepository->parseToken($this->token);
$user = User::find($user_id);
$userName = rtrim($user->first_name . ' ' . $user->last_name, ' ');
$user->notify(new CloneNotification($message, 'Clone', $userName));
$loggedUserId = $userRepository->parseToken($this->token);
$loggedUser = User::find($loggedUserId);
$loggedUserName = rtrim($loggedUser->first_name . ' ' . $loggedUser->last_name, ' ');
$loggedUser->notify(new CloneNotification($message, 'Clone', $loggedUserName));
} catch (\Exception $e) {
Log::error($e->getMessage());
}
Expand Down
4 changes: 2 additions & 2 deletions app/Repositories/LtiTool/LtiToolSettingInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ interface LtiToolSettingInterface extends EloquentRepositoryInterface
* To clone Lti Tool Setting
* @param LtiToolSetting $ltiToolSetting
* @param Organization $subOrganization
* @param $token
* @param $userId
*/
public function clone(LtiToolSetting $ltiToolSetting, Organization $subOrganization, $token);
public function clone(LtiToolSetting $ltiToolSetting, Organization $subOrganization, $userId);
/**
* @param $userId integer, $orgId integer $mediaSourceId int
* @return mixed
Expand Down
10 changes: 5 additions & 5 deletions app/Repositories/LtiTool/LtiToolSettingRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,13 @@ public function destroy($id)
* To clone Lti Tool Setting
* @param LtiToolSetting $ltiToolSetting
* @param Organization $subOrganization
* @param string $token
* @param int $userId
* @return int id
*/
public function clone(LtiToolSetting $ltiToolSetting, Organization $subOrganization, $token)
public function clone(LtiToolSetting $ltiToolSetting, Organization $subOrganization, $userId)
{
$ltiToolSettingData = [
"user_id" => request('user_id'),
"user_id" => $userId,
"organization_id" => $subOrganization->id,
"tool_name" => $ltiToolSetting->tool_name,
"tool_url" => $ltiToolSetting->tool_url,
Expand All @@ -142,8 +142,8 @@ public function clone(LtiToolSetting $ltiToolSetting, Organization $subOrganizat
"tool_custom_parameter" => $ltiToolSetting->tool_custom_parameter,
"tool_content_selection_url" => $ltiToolSetting->tool_content_selection_url
];
$cloned_setting = $this->create($ltiToolSettingData);
return $cloned_setting['id'];
$clonedSetting = $this->create($ltiToolSettingData);
return $clonedSetting['id'];
}

/**
Expand Down