Feature/434 Add CIC, SEND and AST tribunal hearing lists

apps/web/package.json

@@ -24,8 +24,10 @@
     "@hmcts-cft/simple-router": "workspace:*",
     "@hmcts/admin-pages": "workspace:*",
     "@hmcts/administrative-court-daily-cause-list": "workspace:*",
+    "@hmcts/ast-daily-hearing-list": "workspace:*",
     "@hmcts/auth": "workspace:*",
     "@hmcts/care-standards-tribunal-weekly-hearing-list": "workspace:*",
+    "@hmcts/cic-weekly-hearing-list": "workspace:*",
     "@hmcts/civil-and-family-daily-cause-list": "workspace:*",
     "@hmcts/civil-daily-cause-list": "workspace:*",
     "@hmcts/cookie-manager": "1.1.0",
@@ -36,6 +38,7 @@
     "@hmcts/london-administrative-court-daily-cause-list": "workspace:*",
     "@hmcts/public-pages": "workspace:*",
     "@hmcts/rcj-standard-daily-cause-list": "workspace:*",
+    "@hmcts/send-daily-hearing-list": "workspace:*",
     "@hmcts/sjp-press-list": "workspace:*",
     "@hmcts/sjp-public-list": "workspace:*",
     "@hmcts/subscriptions": "workspace:*",

apps/web/src/pages/(admin)/manual-upload-summary/index.test.ts

@@ -77,15 +77,15 @@ vi.mock("@hmcts/admin-pages", async () => {
   };
 });
 
-vi.mock("@hmcts/publication", async () => {
-  const actual = await vi.importActual("@hmcts/publication");
-  return {
-    ...actual,
-    createArtefact: vi.fn(),
-    processPublication: vi.fn(),
-    updateArtefactFileExtension: vi.fn()
-  };
-});
+vi.mock("@hmcts/publication", () => ({
+  createArtefact: vi.fn(),
+  processPublication: vi.fn(),
+  updateArtefactFileExtension: vi.fn(),
+  extractAndStoreArtefactSearch: vi.fn(),
+  Provenance: { MANUAL_UPLOAD: "MANUAL_UPLOAD" },
+  Sensitivity: { PUBLIC: "PUBLIC", PRIVATE: "PRIVATE", CLASSIFIED: "CLASSIFIED" },
+  Language: { ENGLISH: "ENGLISH", WELSH: "WELSH", BILINGUAL: "BILINGUAL" }
+}));
 
 vi.mock("@hmcts/notifications", () => ({
   sendLocationAndCaseSubscriptionNotifications: vi.fn(),
@@ -106,7 +106,7 @@ vi.mock("@hmcts/postgres-prisma", () => ({
 import { getManualUpload, saveUploadedFile } from "@hmcts/admin-pages";
 import { getLocationById } from "@hmcts/location";
 import { sendListTypePublicationNotifications } from "@hmcts/notifications";
-import { createArtefact, processPublication } from "@hmcts/publication";
+import { createArtefact, extractAndStoreArtefactSearch, processPublication } from "@hmcts/publication";
 
 describe("manual-upload-summary page", () => {
   beforeEach(() => {
@@ -893,6 +893,53 @@ describe("manual-upload-summary page", () => {
       );
     });
 
+    it("should call extractAndStoreArtefactSearch when a JSON file is uploaded", async () => {
+      const jsonContent = JSON.stringify({ data: "test" });
+      const jsonUploadData = {
+        ...mockUploadData,
+        fileName: "test-hearing-list.json",
+        file: Buffer.from(jsonContent)
+      };
+
+      vi.mocked(getManualUpload).mockResolvedValue(jsonUploadData);
+      vi.mocked(saveUploadedFile).mockResolvedValue(".json");
+      vi.mocked(processPublication).mockResolvedValue({});
+      vi.mocked(createArtefact).mockResolvedValue({ artefactId: "test-artefact-id-123", isUpdate: false });
+      vi.mocked(extractAndStoreArtefactSearch).mockResolvedValue(undefined);
+
+      const session = { save: vi.fn((callback) => callback()) };
+      const req = { query: { uploadId: "test-upload-id" }, session } as unknown as Request;
+      const res = { redirect: vi.fn(), render: vi.fn() } as unknown as Response;
+
+      await callHandler(POST, req, res);
+
+      expect(extractAndStoreArtefactSearch).toHaveBeenCalledWith("test-artefact-id-123", 6, { data: "test" });
+      expect(res.redirect).toHaveBeenCalledWith("/manual-upload-success");
+    });
+
+    it("should continue upload when extractAndStoreArtefactSearch throws", async () => {
+      const jsonContent = JSON.stringify({ data: "test" });
+      const jsonUploadData = {
+        ...mockUploadData,
+        fileName: "test-hearing-list.json",
+        file: Buffer.from(jsonContent)
+      };
+
+      vi.mocked(getManualUpload).mockResolvedValue(jsonUploadData);
+      vi.mocked(saveUploadedFile).mockResolvedValue(".json");
+      vi.mocked(processPublication).mockResolvedValue({});
+      vi.mocked(createArtefact).mockResolvedValue({ artefactId: "test-artefact-id-123", isUpdate: false });
+      vi.mocked(extractAndStoreArtefactSearch).mockRejectedValue(new Error("Search extraction failed"));
+
+      const session = { save: vi.fn((callback) => callback()) };
+      const req = { query: { uploadId: "test-upload-id" }, session } as unknown as Request;
+      const res = { redirect: vi.fn(), render: vi.fn() } as unknown as Response;
+
+      await callHandler(POST, req, res);
+
+      expect(res.redirect).toHaveBeenCalledWith("/manual-upload-success");
+    });
+
     it("should handle missing fileName gracefully when determining isFlatFile", async () => {
       const noFileNameUploadData = {
         ...mockUploadData,

apps/web/src/pages/(admin)/manual-upload-summary/index.ts

@@ -15,7 +15,9 @@
 
   const listTypeId = uploadData.listType ? Number.parseInt(uploadData.listType, 10) : null;
   const listType = listTypeId ? await findListTypeById(listTypeId) : null;
-  const listTypeName = listType ? (locale === "cy" ? listType.welshFriendlyName : listType.friendlyName) || uploadData.listType : uploadData.listType;
+  const listTypeName = listType
+    ? (locale === "cy" ? listType.welshFriendlyName : listType.shortenedFriendlyName || listType.friendlyName) || listType.name || uploadData.listType
+    : uploadData.listType;
 
   return { courtName, listTypeName };
 }

apps/web/src/pages/(admin)/non-strategic-upload-summary/index.test.ts

@@ -47,13 +47,32 @@ vi.mock("@hmcts/system-admin-pages", () => ({
     if (id === 1) return Promise.resolve({ id: 1, friendlyName: "Test List Type", welshFriendlyName: "Test List Type CY" });
     if (id === 5) return Promise.resolve({ id: 5, friendlyName: "Magistrates Public List", welshFriendlyName: "Rhestr Gyhoeddus Ynadon" });
     if (id === 6) return Promise.resolve({ id: 6, friendlyName: "Crown Daily List", welshFriendlyName: "Rhestr Ddyddiol y Goron" });
+    if (id === 7)
+      return Promise.resolve({
+        id: 7,
+        name: "CIC_WEEKLY_HEARING_LIST",
+        friendlyName: "CIC Weekly Hearing List",
+        welshFriendlyName: "Rhestr Wythnosol CIC",
+        isNonStrategic: true
+      });
     return Promise.resolve(null);
   }),
   AuditLogAction: {
     NON_STRATEGIC_UPLOAD: "Non strategic upload"
   }
 }));
 
+vi.mock("@hmcts/list-types-common", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@hmcts/list-types-common")>();
+  return {
+    ...actual,
+    hasConverterForListType: vi.fn(() => true),
+    convertExcelForListType: vi.fn(() => Promise.resolve({ cases: [] })),
+    hasConverterForListTypeName: vi.fn(() => false),
+    convertExcelForListTypeName: vi.fn()
+  };
+});
+
 vi.mock("@hmcts/web-core", async () => {
   const actual = await vi.importActual("@hmcts/web-core");
   return {
@@ -73,18 +92,18 @@ vi.mock("@hmcts/admin-pages", async () => {
   };
 });
 
-vi.mock("@hmcts/publication", async () => {
-  const actual = await vi.importActual("@hmcts/publication");
-  return {
-    ...actual,
-    createArtefact: vi.fn(() => Promise.resolve({ artefactId: "artefact-id-123", isUpdate: false })),
-    processPublication: vi.fn(() => Promise.resolve({})),
-    updateArtefactFileExtension: vi.fn(() => Promise.resolve())
-  };
-});
+vi.mock("@hmcts/publication", () => ({
+  createArtefact: vi.fn(() => Promise.resolve({ artefactId: "artefact-id-123", isUpdate: false })),
+  processPublication: vi.fn(() => Promise.resolve({})),
+  updateArtefactFileExtension: vi.fn(() => Promise.resolve()),
+  extractAndStoreArtefactSearch: vi.fn(() => Promise.resolve()),
+  Provenance: { MANUAL_UPLOAD: "MANUAL_UPLOAD" },
+  Sensitivity: { PUBLIC: "PUBLIC", PRIVATE: "PRIVATE", CLASSIFIED: "CLASSIFIED" },
+  Language: { ENGLISH: "ENGLISH", WELSH: "WELSH", BILINGUAL: "BILINGUAL" }
+}));
 
 import { getNonStrategicUpload, saveUploadedFile } from "@hmcts/admin-pages";
-import { createArtefact, processPublication } from "@hmcts/publication";
+import { createArtefact, extractAndStoreArtefactSearch, processPublication } from "@hmcts/publication";
 
 describe("non-strategic-upload-summary page", () => {
   beforeEach(() => {
@@ -399,6 +418,69 @@ describe("non-strategic-upload-summary page", () => {
       );
     });
 
+    it("should convert Excel file and call extractAndStoreArtefactSearch for non-strategic list type", async () => {
+      const { hasConverterForListType, convertExcelForListType } = await import("@hmcts/list-types-common");
+
+      const mockUploadData = {
+        file: Buffer.from("excel content"),
+        fileName: "test.xlsx",
+        fileType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        locationId: "123",
+        listType: "7",
+        hearingStartDate: { day: "23", month: "10", year: "2025" },
+        sensitivity: "PUBLIC",
+        language: "ENGLISH",
+        displayFrom: { day: "20", month: "10", year: "2025" },
+        displayTo: { day: "30", month: "10", year: "2025" }
+      };
+
+      vi.mocked(getNonStrategicUpload).mockResolvedValue(mockUploadData);
+      vi.mocked(createArtefact).mockResolvedValue({ artefactId: "artefact-id-123", isUpdate: false });
+      vi.mocked(hasConverterForListType).mockReturnValue(true);
+      vi.mocked(convertExcelForListType).mockResolvedValue({ cases: [] });
+      vi.mocked(extractAndStoreArtefactSearch).mockResolvedValue(undefined);
+
+      const session = { save: (callback: (err?: any) => void) => callback() };
+      const req = { query: { uploadId: "test-upload-id" }, session } as unknown as Request;
+      const res = { redirect: vi.fn(), render: vi.fn() } as unknown as Response;
+
+      await callHandler(POST, req, res);
+
+      expect(extractAndStoreArtefactSearch).toHaveBeenCalledWith("artefact-id-123", 7, { cases: [] });
+      expect(res.redirect).toHaveBeenCalledWith("/non-strategic-upload-success");
+    });
+
+    it("should continue upload when extractAndStoreArtefactSearch throws after Excel conversion", async () => {
+      const { hasConverterForListType, convertExcelForListType } = await import("@hmcts/list-types-common");
+
+      const mockUploadData = {
+        file: Buffer.from("excel content"),
+        fileName: "test.xlsx",
+        fileType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        locationId: "123",
+        listType: "7",
+        hearingStartDate: { day: "23", month: "10", year: "2025" },
+        sensitivity: "PUBLIC",
+        language: "ENGLISH",
+        displayFrom: { day: "20", month: "10", year: "2025" },
+        displayTo: { day: "30", month: "10", year: "2025" }
+      };
+
+      vi.mocked(getNonStrategicUpload).mockResolvedValue(mockUploadData);
+      vi.mocked(createArtefact).mockResolvedValue({ artefactId: "artefact-id-123", isUpdate: false });
+      vi.mocked(hasConverterForListType).mockReturnValue(true);
+      vi.mocked(convertExcelForListType).mockResolvedValue({ cases: [] });
+      vi.mocked(extractAndStoreArtefactSearch).mockRejectedValue(new Error("Search extraction failed"));
+
+      const session = { save: (callback: (err?: any) => void) => callback() };
+      const req = { query: { uploadId: "test-upload-id" }, session } as unknown as Request;
+      const res = { redirect: vi.fn(), render: vi.fn() } as unknown as Response;
+
+      await callHandler(POST, req, res);
+
+      expect(res.redirect).toHaveBeenCalledWith("/non-strategic-upload-success");
+    });
+
     it("should redirect with language parameter when lng=cy", async () => {
       const mockUploadData = {
         file: Buffer.from("test"),

apps/web/src/pages/(admin)/non-strategic-upload-summary/index.ts

@@ -20,7 +20,9 @@
 
   const listTypeId = uploadData.listType ? Number.parseInt(uploadData.listType, 10) : null;
   const listType = listTypeId ? await findListTypeById(listTypeId) : null;
-  const listTypeName = listType ? (locale === "cy" ? listType.welshFriendlyName : listType.friendlyName) || uploadData.listType : uploadData.listType;
+  const listTypeName = listType
+    ? (locale === "cy" ? listType.welshFriendlyName : listType.shortenedFriendlyName || listType.friendlyName) || listType.name || uploadData.listType
+    : uploadData.listType;
 
   return { courtName, listTypeName };
 }

apps/web/src/pages/(admin)/non-strategic-upload/index.ts

@@ -1,4 +1,7 @@
+import "@hmcts/ast-daily-hearing-list"; // Register AST converter
 import "@hmcts/care-standards-tribunal-weekly-hearing-list"; // Register CST converter
+import "@hmcts/cic-weekly-hearing-list"; // Register CIC converter
+import "@hmcts/send-daily-hearing-list"; // Register SEND converter
 import { LANGUAGE_LABELS, SENSITIVITY_LABELS, storeNonStrategicUpload, type UploadFormData, validateNonStrategicUploadForm } from "@hmcts/admin-pages";
 import { requireRole, USER_ROLES } from "@hmcts/auth";
 import { getAllLocations, getLocationById } from "@hmcts/location";

apps/web/src/pages/(list-types)/ast-daily-hearing-list/ast-daily-hearing-list.njk

@@ -0,0 +1,91 @@
+{% extends "layouts/base-template.njk" %}
+{% from "govuk/components/table/macro.njk" import govukTable %}
+
+{% block head %}
+  {{ super() }}
+  <style>
+    .back-to-top {
+      margin-top: 40px;
+    }
+  </style>
+{% endblock %}
+
+{% block page_content %}
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-full">
+
+    <h1 class="govuk-heading-l" id="top">{{ header.listTitle }}</h1>
+
+    <p class="govuk-body">
+      <a href="{{ t.factLinkUrl }}" class="govuk-link">{{ t.factLinkText }}</a> {{ t.factAdditionalText }}
+    </p>
+
+    <p class="govuk-body">
+      {% for line in t.venueAddressLines %}{{ line }}{% if not loop.last %}<br>{% endif %}{% endfor %}
+    </p>
+
+    <p class="govuk-body govuk-!-margin-bottom-1"><strong>{{ t.listForDate }} {{ header.listForDate }}</strong></p>
+
+    <p class="govuk-body">{{ t.lastUpdated }} {{ header.lastUpdatedDate }} {{ t.at }} {{ header.lastUpdatedTime }}</p>
+
+    <details class="govuk-details govuk-!-margin-top-6" data-module="govuk-details" open>
+      <summary class="govuk-details__summary">
+        <span class="govuk-details__summary-text">
+          {{ t.importantInformationTitle }}
+        </span>
+      </summary>
+      <div class="govuk-details__text">
+        {% for paragraph in t.importantInformationParagraphs %}
+          <p class="govuk-body">{{ paragraph }}</p>
+        {% endfor %}
+        <p class="govuk-body">
+          {{ t.importantInformationLinkPrefix }}
+          <a href="{{ t.importantInformationLinkUrl }}" class="govuk-link">{{ t.importantInformationLinkText }}</a>.
+        </p>
+      </div>
+    </details>
+
+    <div class="govuk-form-group govuk-!-margin-top-6">
+      <h2 class="govuk-heading-s">{{ t.searchCasesTitle }}</h2>
+      <label class="govuk-label govuk-visually-hidden" for="case-search-input">
+        {{ t.searchCasesLabel }}
+      </label>
+      <input class="govuk-input govuk-!-width-one-half" id="case-search-input" name="search" type="text" aria-label="{{ t.searchCasesLabel }}">
+    </div>
+
+    <div id="hearings-table-container">
+      <table class="govuk-table" id="hearings-table" role="table" aria-label="{{ t.pageTitle }}">
+        <thead class="govuk-table__head">
+          <tr class="govuk-table__row">
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.appellant }}</th>
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.appealReferenceNumber }}</th>
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.caseType }}</th>
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.hearingType }}</th>
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.hearingTime }}</th>
+            <th scope="col" class="govuk-table__header">{{ t.tableHeaders.additionalInformation }}</th>
+          </tr>
+        </thead>
+        <tbody class="govuk-table__body">
+          {% for hearing in hearings %}
+            <tr class="govuk-table__row">
+              <td class="govuk-table__cell">{{ hearing.appellant }}</td>
+              <td class="govuk-table__cell">{{ hearing.appealReferenceNumber }}</td>
+              <td class="govuk-table__cell">{{ hearing.caseType }}</td>
+              <td class="govuk-table__cell">{{ hearing.hearingType }}</td>
+              <td class="govuk-table__cell">{{ hearing.hearingTime }}</td>
+              <td class="govuk-table__cell">{{ hearing.additionalInformation }}</td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+
+    <p class="govuk-body-s govuk-!-margin-top-6">{{ t.dataSource }}: {{ dataSource }}</p>
+
+    <div class="back-to-top">
+      <a href="#top" class="govuk-link">{{ t.backToTop }}</a>
+    </div>
+
+  </div>
+</div>
+{% endblock %}