Feature/cur 4158 develop pull to resolve conflict

.env.example

@@ -152,6 +152,11 @@ MSTEAMS_TENANT_ID=
 MSTEAMS_OAUTH_URL=
 MSTEAMS_LANDING_URL=
 MSTEAMS_REDIRECT_URL=
+ASSIGNMENT_DUE_DATE_DAYS=
 
 #true for only vivensity
 GCR_ENV_PERMISSION_VIV=true
+
+#Smithsonian Open Access API
+SMITHSONIAN_API_BASE_URL=
+SMITHSONIAN_API_KEY=

H5P/laravel-h5p/src/LaravelH5p/Http/Controllers/AjaxController.php

@@ -363,7 +363,6 @@ private function findLibraryDependencies($machineName, $library, $core, $paramet
             }
         }
 
-
         // Order dependencies by weight
         $orderedDependencies = array();
         for ($i = 1, $s = count($dependencies); $i <= $s; $i++) {

app/CurrikiGo/Canvas/Commands/CreateAssignmentCommand.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace App\CurrikiGo\Canvas\Commands;
+
+use App\CurrikiGo\Canvas\Contracts\Command;
+
+/**
+ * This class handles fetching Course details in Canvas LMS
+ */
+class CreateAssignmentCommand implements Command
+{
+    /**
+     * API URL
+     *
+     * @var string
+     */
+    public $apiURL;
+    /**
+     * Access Token for api requests
+     *
+     * @var string
+     */
+    public $accessToken;
+    /**
+     * HTTP Client instance
+     *
+     * @var \GuzzleHttp\Client
+     */
+    public $httpClient;
+    /**
+     * Course Id
+     *
+     * @var int
+     */
+    private $courseId;
+    /**
+     * Request Assignment Group Id
+     *
+     * @var array
+     */
+    private $assignmentGroupId;
+    /**
+     * Request new assignment name
+     *
+     * @var array
+     */
+    private $assignmentName;
+    /**
+     * Id of activity in curriki
+     *
+     * @var array
+     */
+    private $currikiActivityId;
+
+    /**
+     * Creates an instance of the command class
+     *
+     * @param int $courseId
+     * @param string $queryString
+     * @return void
+     */
+    public function __construct($courseId, $assignmentGroupId, $assignmentName, $currikiActivityId)
+    {
+        $this->courseId = $courseId;
+        $this->assignmentGroupId = $assignmentGroupId;
+        $this->assignmentName = $assignmentName;
+        $this->currikiActivityId = $currikiActivityId;
+        $this->endpoint = config('constants.canvas_api_endpoints.create_assignment');
+        $this->courseData = $this->prepareCourseData($assignmentGroupId, $assignmentName, $this->currikiActivityId);
+    }
+
+    /**
+     * Execute an API request for fetching course details
+     *
+     * @return string|null
+     */
+    public function execute()
+    {
+        $assignment = $this->courseData;
+        $response = null;
+        try {
+            $response = $this->httpClient->request('POST', $this->apiURL . '/courses/' . $this->courseId . '/' . $this->endpoint, [
+                'headers' => ['Authorization' => "Bearer {$this->accessToken}"],
+                'json' => ['assignment' => $assignment]
+            ])->getBody()->getContents();
+            $response = json_decode($response);
+        } catch (Exception $ex) {
+        }
+
+        return $response;
+    }
+
+    /**
+     * Prepare course data for API payload
+     * 
+     * @param array $data
+     * @return array
+     */
+    public function prepareCourseData($assignmentGroupId, $assignmentGroupName, $currikiActivityId)
+    {
+        $assignment = [];
+        $assignment["name"] = $assignmentGroupName;
+        $assignment['assignment_group_id'] = $assignmentGroupId;
+        $assignment['self_signup'] = 'enabled';
+        $assignment['position'] = 1;
+        $assignment['submission_types'][] = 'external_tool';
+        $assignment['return_type'] = 'lti_launch_url';
+        $assignment['workflow_state'] = 'published';
+        $assignment['points_possible'] = 100;
+        $assignment['published'] = true;
+        $assignment['external_tool_tag_attributes']['url'] = config('constants.curriki-tsugi-host') . "?activity=" . $currikiActivityId;
+        return $assignment;
+    }
+}

app/CurrikiGo/Canvas/Commands/CreateAssignmentGroupsCommand.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\CurrikiGo\Canvas\Commands;
+
+use App\CurrikiGo\Canvas\Contracts\Command;
+
+/**
+ * This class handles fetching Course details in Canvas LMS
+ */
+class CreateAssignmentGroupsCommand implements Command
+{
+    /**
+     * API URL
+     *
+     * @var string
+     */
+    public $apiURL;
+    /**
+     * Access Token for api requests
+     *
+     * @var string
+     */
+    public $accessToken;
+    /**
+     * HTTP Client instance
+     *
+     * @var \GuzzleHttp\Client
+     */
+    public $httpClient;
+    /**
+     * Course Id
+     *
+     * @var int
+     */
+    private $courseId;
+    /**
+     * Request queryString
+     *
+     * @var array
+     */
+    private $assignmentGroupName;
+
+    /**
+     * Creates an instance of the command class
+     *
+     * @param int $courseId
+     * @param string $queryString
+     * @return void
+     */
+    public function __construct($courseId, $assignmentGroupName)
+    {
+        $this->courseId = $courseId;
+        $this->endpoint = config('constants.canvas_api_endpoints.assignment_groups');
+        $this->courseData = $this->prepareCourseData($assignmentGroupName);
+    }
+
+    /**
+     * Execute an API request for fetching course details
+     *
+     * @return string|null
+     */
+    public function execute()
+    {
+        $response = null;
+        try {
+            $response = $this->httpClient->request('POST', $this->apiURL . '/courses/' . $this->courseId . '/' . $this->endpoint, [
+                'headers' => ['Authorization' => "Bearer {$this->accessToken}"],
+                'json' => $this->courseData
+            ])->getBody()->getContents();
+            $response = json_decode($response);
+        } catch (Exception $ex) {
+        }
+
+        return $response;
+    }
+
+    /**
+     * Prepare course data for API payload
+     * 
+     * @param array $data
+     * @return array
+     */
+    public function prepareCourseData($assignmentGroupName)
+    {
+        return ["name" => $assignmentGroupName];
+    }
+}

app/CurrikiGo/Canvas/Commands/CreateCourseCommand.php

@@ -48,10 +48,10 @@ class CreateCourseCommand implements Command
      * @param array $sisId
      * @return void
      */
-    public function __construct($accountId, $courseData, $sisId)
+    public function __construct($courseName, $accountId)
     {
         $this->accountId = $accountId;
-        $this->courseData = $this->prepareCourseData($courseData, $sisId);
+        $this->courseData = $this->prepareCourseData($courseName);
     }
 
     /**
@@ -62,14 +62,16 @@ public function __construct($accountId, $courseData, $sisId)
     public function execute()
     {
         $response = null;
-        try {            
+        try {
             $response = $this->httpClient->request('POST', $this->apiURL . '/accounts/' . $this->accountId . '/courses', [
-                    'headers' => ['Authorization' => "Bearer {$this->accessToken}", 'Accept' => 'application/json'],
-                    'json' => $this->courseData
-                ])->getBody()->getContents();
+                'headers' => ['Authorization' => "Bearer {$this->accessToken}", 'Accept' => 'application/json'],
+                'json' => $this->courseData
+            ])->getBody()->getContents();
             $response = json_decode($response);
-        } catch (Exception $ex) {}
-
+        } 
+        catch (Exception $ex) {
+        }
+
         return $response;
     }
 
@@ -79,12 +81,11 @@ public function execute()
      * @param array $data
      * @return array
      */
-    public function prepareCourseData($data, $sisId)
+    public function prepareCourseData($courseName)
     {
-        $course["name"] = $data['name'];
-        $short_name = strtolower(implode('-', explode(' ', $data['name'])));
+        $course["name"] = $courseName;
+        $short_name = strtolower(implode('-', explode(' ', $courseName)));
         $course["course_code"] = $short_name;
-        $course["sis_course_id"] = $sisId;
         $course["license"] = "public_domain";
         $course["public_syllabus_to_auth"] = true;
         $course["public_description"] = $course["name"] . " by CurrikiStudio";

app/CurrikiGo/Canvas/Commands/GetAllCoursesCommand.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\CurrikiGo\Canvas\Commands;
+
+use App\CurrikiGo\Canvas\Contracts\Command;
+
+/**
+ * This class handles fetching courses in Canvas LMS
+ */
+class GetAllCoursesCommand implements Command
+{
+    /**
+     * API URL
+     *
+     * @var string
+     */
+    public $apiURL;
+    /**
+     * Access Token for api requests
+     *
+     * @var string
+     */
+    public $accessToken;
+    /**
+     * HTTP Client instance
+     *
+     * @var \GuzzleHttp\Client
+     */
+    public $httpClient;
+
+    /**
+     * Creates an instance of the command class
+     *
+     * @param int $accountId
+     * @param string $programName
+     * @return void
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Execute an API request for getting courses
+     *
+     * @return string|null
+     */
+    public function execute()
+    {
+        $response = null;
+        try {
+            $url = $this->apiURL . '/courses' . '?per_page=1000';
+            $response = $this->httpClient->request('GET', $url, [
+                'headers' => ['Authorization' => "Bearer {$this->accessToken}", 'Accept' => 'application/json']
+            ])->getBody()->getContents();
+            $response = json_decode($response);
+        } catch (Exception $ex) {
+        }
+
+        return $response;
+    }
+}