Merge pull request #8833 from michaelchadwick/frontend-4535-fix-insts-by-lm-subj-report

Subject Reports->Instructors by Learning Material now actually runs

Author: dartajax

packages/frontend/app/components/reports/subject/instructor.gjs

@@ -156,11 +156,40 @@ export default class ReportsSubjectInstructorComponent extends Component {
     return uniqueById(users);
   }
 
+  async getResultsForLearningMaterial(learningMaterialId, school) {
+    let filters = [];
+    if (school) {
+      filters.push(`schools: [${school.id}]`);
+    }
+    filters.push(`learningMaterials: [${learningMaterialId}]`);
+
+    const attributes = ['id', 'school { title }'];
+    const results = await this.graphql.find('courses', filters, attributes.join(', '));
+
+    if (!results.data.courses.length) {
+      return [];
+    }
+
+    const ids = results.data.courses.map(({ id }) => id);
+
+    //fetch courses 5 at a time for performance on the API
+    //but send all the requests at once
+    const promises = chunk(ids, 5).map((chunk) => this.getResultsForCourses(chunk));
+
+    const users = await (await Promise.all(promises)).flat();
+
+    return uniqueById(users);
+  }
+
   async getReportResults(subject, prepositionalObject, prepositionalObjectTableRowId, school) {
     if (subject !== 'instructor') {
       throw new Error(`Report for ${subject} sent to ReportsSubjectInstructorComponent`);
     }
 
+    if (prepositionalObject === 'learning material') {
+      return this.getResultsForLearningMaterial(prepositionalObjectTableRowId, school);
+    }
+
     if (prepositionalObject === 'course') {
       return this.getResultsForCourses([prepositionalObjectTableRowId]);
     }

packages/frontend/tests/integration/components/reports/subject/instructor-test.gjs

@@ -318,4 +318,72 @@ module('Integration | Component | reports/subject/instructor', function (hooks)
       </template>,
     );
   });
+
+  test('filter by learning material', async function (assert) {
+    assert.expect(7);
+    let counter = 0;
+    this.server.post('api/graphql', function (schema, { requestBody }) {
+      const { query } = JSON.parse(requestBody);
+      counter++;
+      const { users } = responseData.data;
+      switch (counter) {
+        case 1:
+          assert.strictEqual(
+            query,
+            'query { courses(learningMaterials: [1]) { id, school { title } } }',
+            'correct first query is run',
+          );
+          return {
+            data: {
+              courses: [
+                {
+                  id: 1,
+                },
+              ],
+            },
+          };
+        case 2:
+          assert.ok(query.includes('query { courses(ids: [1])'), 'correct second query is run');
+          return {
+            data: {
+              courses: [
+                { sessions: [{ offerings: [{ instructors: [users[1]], instructorGroups: [] }] }] },
+                {
+                  sessions: [
+                    {
+                      ilmSession: { instructors: [users[0]], instructorGroups: [] },
+                      offerings: [],
+                      instructorGroups: [],
+                    },
+                  ],
+                },
+              ],
+            },
+          };
+        default:
+          assert.ok(false, 'too many queries');
+      }
+    });
+    const { id } = this.server.create('report', {
+      subject: 'instructor',
+      prepositionalObject: 'learning material',
+      prepositionalObjectTableRowId: 1,
+    });
+    this.set('report', await this.owner.lookup('service:store').findRecord('report', id));
+    await render(
+      <template>
+        <Instructor
+          @subject={{this.report.subject}}
+          @prepositionalObject={{this.report.prepositionalObject}}
+          @prepositionalObjectTableRowId={{this.report.prepositionalObjectTableRowId}}
+        />
+      </template>,
+    );
+
+    assert.strictEqual(component.results.length, 2, 'result count is correct');
+    assert.strictEqual(component.results[0].school, 'School 1:', 'result row school is correct');
+    assert.strictEqual(component.results[0].name, 'First M. Last', 'result row name is correct');
+    assert.strictEqual(component.results[1].school, 'School 2:', 'result row school is correct');
+    assert.strictEqual(component.results[1].name, 'abc', 'result row name is correct');
+  });
 });