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

Feature/cur 4002 publish activity to canvas #1288

Merged
merged 15 commits into from
Sep 26, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
some code changes asked by a PR reviewer
  • Loading branch information
AqibYounasAtTkxel committed Sep 23, 2022
commit c738863d80b5c0fbea580bc7bbb353d23fb55e25
54 changes: 0 additions & 54 deletions app/CurrikiGo/Canvas/Activity.php

This file was deleted.

4 changes: 2 additions & 2 deletions app/CurrikiGo/Canvas/Commands/CreateAssignmentCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ public function execute()
* @param array $data
* @return array
*/
public function prepareCourseData($assignmentGroupId, $AssignmentGroupName, $currikiActivityId)
public function prepareCourseData($assignmentGroupId, $assignmentGroupName, $currikiActivityId)
{
$assignment = [];
$assignment["name"] = $AssignmentGroupName;
$assignment["name"] = $assignmentGroupName;
$assignment['assignment_group_id'] = $assignmentGroupId;
$assignment['self_signup'] = 'enabled';
$assignment['position'] = 1;
Expand Down
10 changes: 5 additions & 5 deletions app/CurrikiGo/Canvas/Commands/CreateAssignmentGroupsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class CreateAssignmentGroupsCommand implements Command
*
* @var array
*/
private $AssignmentGroupName;
private $assignmentGroupName;

/**
* Creates an instance of the command class
Expand All @@ -47,11 +47,11 @@ class CreateAssignmentGroupsCommand implements Command
* @param string $queryString
* @return void
*/
public function __construct($courseId, $AssignmentGroupName)
public function __construct($courseId, $assignmentGroupName)
{
$this->courseId = $courseId;
$this->endpoint = config('constants.canvas_api_endpoints.assignment_groups');
$this->courseData = $this->prepareCourseData($AssignmentGroupName);
$this->courseData = $this->prepareCourseData($assignmentGroupName);
}

/**
Expand Down Expand Up @@ -80,8 +80,8 @@ public function execute()
* @param array $data
* @return array
*/
public function prepareCourseData($AssignmentGroupName)
public function prepareCourseData($assignmentGroupName)
{
return ["name" => $AssignmentGroupName];
return ["name" => $assignmentGroupName];
}
}
2 changes: 1 addition & 1 deletion app/CurrikiGo/Canvas/Commands/CreateCourseCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class CreateCourseCommand implements Command
* @param array $sisId
* @return void
*/
public function __construct($accountId, $courseName)
public function __construct($courseName, $accountId)
{
$this->accountId = $accountId;
$this->courseData = $this->prepareCourseData($courseName);
Expand Down
9 changes: 5 additions & 4 deletions app/CurrikiGo/Canvas/Course.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public function fetch(Project $project)
*/
public function fetchAllCourses()
{
$moduleItems = [];
$courses = $this->canvasClient->run(new GetAllCoursesCommand());
if ($courses) {
foreach ($courses as $key => $item) {
Expand Down Expand Up @@ -119,12 +120,12 @@ public function fetchAssignmentGroups($courseId)
* Create assignmet groups in Canvas LMS course
*
* @param $courseId
* @param $AssignmentGroupName
* @param $assignmentGroupName
* @return array
*/
public function CreateAssignmentGroups($courseId, $AssignmentGroupName)
public function CreateAssignmentGroups($courseId, $assignmentGroupName)
{
return $this->canvasClient->run(new CreateAssignmentGroupsCommand($courseId, $AssignmentGroupName));
return $this->canvasClient->run(new CreateAssignmentGroupsCommand($courseId, $assignmentGroupName));
}

/**
Expand All @@ -135,7 +136,7 @@ public function CreateAssignmentGroups($courseId, $AssignmentGroupName)
*/
public function createNewCourse($courseName)
{
return $this->canvasClient->run(new CreateCourseCommand($accountId = 'self', $courseName));
return $this->canvasClient->run(new CreateCourseCommand($courseName, $accountId = 'self'));
}

/**
Expand Down
6 changes: 5 additions & 1 deletion app/CurrikiGo/Canvas/Playlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ public function send(PlaylistModel $playlist, $data, $createAssignment, $canvasC
$accountId = "self";

if ($createAssignment == config('constants.canvas_creation_type.create_modules')) {
$module = $this->canvasClient->run(new CreateModuleCommand($canvasCourseId, ["name" => $moduleName]));
$modules = $this->canvasClient->run(new GetModulesCommand($canvasCourseId, $moduleName));
$module = CourseHelper::getModuleByName($modules, $moduleName);
if (!$module) {
$module = $this->canvasClient->run(new CreateModuleCommand($canvasCourseId, ["name" => $moduleName]));
}
$moduleItem['title'] = $playlist->title . ($data['counter'] > 0 ? ' (' . $data['counter'] . ')' : '');
$moduleItem['content_id'] = $playlist->id;
$moduleItem['external_url'] = config('constants.curriki-tsugi-host') . "?playlist=" . $playlist->id;
Expand Down
7 changes: 4 additions & 3 deletions app/Http/Controllers/Api/V1/CurrikiGo/PublishController.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,13 @@ public function playlistToCanvas(Project $project, Playlist $playlist, PublishPl
return response([
'playlist' => $outcome,
], 200);
}
elseif($outcome == false){
}
elseif ($outcome == false) {
return response([
'errors' => ['Something went wrong while publishing.'],
], 400);
} else {
}
else {
return response([
'errors' => ['Failed to send playlist to canvas.'],
], 500);
Expand Down