More progress towards Canvas Assignments

Author: csev

src/Util/CC.php

@@ -331,6 +331,8 @@ public function add_lti_link($module, $title=null, $url=null, $resourceLinkId=nu
 
     /**
      * Add a resource to the manifest.
+     * 
+     * @return \DOMNode The created item node
      */
     public function add_resource_item($module, $title, $type, $identifier, $file) {
         $this->last_file = $file;
@@ -351,7 +353,7 @@ public function add_resource_item($module, $title, $type, $identifier, $file) {
             array('identifier' => $this->last_identifierref, "type" => $type));
         $new_file = $this->add_child_ns(CC::CC_1_1_CP, $new_resource, 'file', null, array("href" => $file));
 
-        return $file;
+        return $new_item;
     }
 
     /**
@@ -524,7 +526,15 @@ function zip_add_lti_outcome_to_module($zip, $module, $title, $url, $custom=null
         $assignment_file = 'assignments/ASSIGNMENT_'.$assignment_fileHash.'.xml';
 
         // Create assignment resource and module item
-        $assignment_resource_id = $this->add_resource_item($module, $title, 'associatedcontent/imscc_xmlv1p1/learning-application-resource', $assignment_identifier, $assignment_file);
+        $assignment_item = $this->add_resource_item($module, $title, 'associatedcontent/imscc_xmlv1p1/learning-application-resource', $assignment_identifier, $assignment_file);
+        $assignment_resource_id = $assignment_identifier . "_R";
+        
+        // Canvas requires LTI resources to be referenced in the organizations tree or they get discarded
+        // Add a nested item under the assignment item that references the LTI resource
+        // This ensures Canvas keeps the LTI resource when importing
+        $lti_item = $this->add_child_ns(CC::CC_1_1_CP, $assignment_item, 'item', null,
+            array('identifier' => $lti_identifier, "identifierref" => $lti_resource_id));
+        $hidden_title = $this->add_child_ns(CC::CC_1_1_CP, $lti_item, 'title', '(hidden)');
 
         // Generate and save Canvas assignment XML (references the LTI resource identifier)
         // Canvas expects resource_link_id to match the LTI resource identifier in the manifest

tests/Util/CCTest.php

@@ -134,6 +134,32 @@ public function testZip() {
         $this->assertStringContainsString('<title>Week 2</title>', $save);
         $this->assertStringContainsString('<item identifier="' . $assignmentId . '" identifierref="' . $assignmentIdRef . '">', $save);
         $this->assertStringContainsString('<title>Quiz: Single Table SQL</title>', $save);
+        
+        // Canvas requires LTI resources to be referenced in the organizations tree
+        // Verify that a nested item referencing the LTI resource exists under the assignment item
+        // The nested item should have identifierref matching an LTI resource (LT_*_R pattern)
+        // and title "(hidden)"
+        $this->assertStringContainsString('(hidden)', $save, 'Should contain hidden LTI item title');
+        
+        // Verify the LTI resource exists in the manifest (created by zip_add_lti_outcome_to_module)
+        // The LTI resource should have type "imsbasiclti_xmlv1p0" and identifier matching LT_*_R pattern
+        $this->assertMatchesRegularExpression(
+            '/<resource identifier="LT_[^"]+_R" type="imsbasiclti_xmlv1p0">/',
+            $save,
+            'Should contain LTI resource for the assignment'
+        );
+        
+        // Verify nested item structure: assignment item should contain a nested item
+        // The nested item should reference the LTI resource via identifierref
+        // Pattern: <item identifier="ASSIGNMENT_ID" identifierref="ASSIGNMENT_ID_R">...<item identifier="LT_..." identifierref="LT_..._R">
+        $assignmentItemPattern = '<item identifier="' . preg_quote($assignmentId, '/') . '"';
+        $nestedLtiItemPattern = '<item[^>]*identifierref="LT_[^"]+_R"';
+        $this->assertMatchesRegularExpression(
+            '/' . preg_quote($assignmentItemPattern, '/') . '[^>]*>.*?' . $nestedLtiItemPattern . '/s',
+            $save,
+            'Assignment item should contain nested LTI item with identifierref pointing to LTI resource'
+        );
+        
         $this->assertStringContainsString('<item identifier="' . $topicId . '" identifierref="' . $topicIdRef . '">', $save);
         $this->assertStringContainsString('<title>Discuss: Single Table SQL</title>', $save);
         $this->assertStringContainsString('<resource identifier="' . $webLinkIdRef . '" type="imswl_xmlv1p1">', $save);
@@ -162,8 +188,8 @@ public function testZip() {
         $this->assertStringContainsString('<item identifier="' . $assignmentId . '">', $meta);
         $this->assertStringContainsString('<content_type>Assignment</content_type>', $meta);
         $this->assertStringContainsString('<title>Quiz: Single Table SQL</title>', $meta);
-        // Canvas assignments use the file path as identifierref, not the _R format
-        $this->assertStringContainsString('<identifierref>' . $assignmentFile . '</identifierref>', $meta);
+        // Canvas assignments use the assignment resource identifier (_R format)
+        $this->assertStringContainsString('<identifierref>' . $assignmentIdRef . '</identifierref>', $meta);
         $this->assertStringContainsString('<item identifier="' . $topicId . '">', $meta);
         $this->assertStringContainsString('<content_type>DiscussionTopic</content_type>', $meta);
         $this->assertStringContainsString('<title>Discuss: Single Table SQL</title>', $meta);