Added grouping via subject categories for english subject

scripts/dev/curriculum/_commands/fixtures.ts

@@ -21,6 +21,23 @@ const fixtures = {
     });
     return output;
   },
+  "curriculumunits-english-primary": async () => {
+    const output = await sdk.curriculumUnits({
+      where: {
+        _and: [
+          {
+            _or: [
+              { subject_slug: { _eq: "english" } },
+              { subject_parent_slug: { _eq: "english" } },
+            ],
+          },
+          { phase_slug: { _eq: "primary" } },
+          { state: { _eq: "published" } },
+        ],
+      },
+    });
+    return output;
+  },
   "curriculumunits-science-secondary": async () => {
     const output = await sdk.curriculumUnits({
       where: {

src/pages-helpers/curriculum/docx/builder/10_threadsDetail.test.ts

@@ -67,4 +67,87 @@ describe("10_threadsDetail", () => {
 
     expect(await zipToSnapshotObject(zip.getJsZip())).toMatchSnapshot();
   });
+
+  it("subjectcategory grouped", async () => {
+    const zip = await generateEmptyDocx();
+    await generate(zip, {
+      data: {
+        subjectTitle: "English",
+        units: [
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "7",
+            title: "Test A",
+            threads: [{ title: "thread-one", order: 0, slug: "one" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "7",
+            title: "Test B",
+            threads: [{ title: "thread-two", order: 0, slug: "two" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "8",
+            title: "Test A",
+            threads: [{ title: "thread-one", order: 0, slug: "one" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "8",
+            title: "Test B",
+            threads: [{ title: "thread-two", order: 0, slug: "two" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "9",
+            title: "Test A",
+            threads: [{ title: "thread-one", order: 0, slug: "one" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "9",
+            title: "Test B",
+            threads: [{ title: "thread-two", order: 0, slug: "two" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "10",
+            title: "Test A",
+            threads: [{ title: "thread-one", order: 0, slug: "one" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "10",
+            title: "Test B",
+            threads: [{ title: "thread-two", order: 0, slug: "two" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "11",
+            title: "Test A",
+            threads: [{ title: "thread-one", order: 0, slug: "one" }],
+          },
+          {
+            subject_slug: "english",
+            phase_slug: "primary",
+            year: "11",
+            title: "Test B",
+            threads: [{ title: "thread-two", order: 0, slug: "two" }],
+          },
+        ],
+      } as CombinedCurriculumData,
+    });
+
+    expect(await zipToSnapshotObject(zip.getJsZip())).toMatchSnapshot();
+  });
 });