From 8544ce2ee05113248347f4a29df5cabc97ef6010 Mon Sep 17 00:00:00 2001
From: Jez Barnsley <jbarnsley.github@gmail.com>
Date: Wed, 22 Jul 2026 09:14:23 +0100
Subject: [PATCH] Removes no-longer-needed coercing

---
 src/server/plugins/FeedbackPageController.ts  |  5 +---
 ...maryPageWithConfirmationEmailController.ts | 28 ++++---------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/server/plugins/FeedbackPageController.ts b/src/server/plugins/FeedbackPageController.ts
index 0fa2ef12e..b8bfddb36 100644
--- a/src/server/plugins/FeedbackPageController.ts
+++ b/src/server/plugins/FeedbackPageController.ts
@@ -1,4 +1,3 @@
-import { type PageController } from '@defra/forms-engine-plugin/controllers/PageController.js'
 import { QuestionPageController } from '@defra/forms-engine-plugin/controllers/QuestionPageController.js'
 import { SummaryPageController } from '@defra/forms-engine-plugin/controllers/SummaryPageController.js'
 import {
@@ -43,9 +42,7 @@ export class FeedbackPageController extends QuestionPageController {
       context: FormContext,
       h: FormResponseToolkit
     ) => {
-      // Should not have to coerce the type - ticket to resolve later https://eaflood.atlassian.net/browse/DF-555
-      const { viewName, model } = this as unknown as PageController
-      const { collection } = this
+      const { collection, viewName, model } = this
       const { isForceAccess, state, evaluationState } = context
 
       /**
diff --git a/src/server/plugins/SummaryPageWithConfirmationEmailController.ts b/src/server/plugins/SummaryPageWithConfirmationEmailController.ts
index cf29ceabc..20e079f17 100644
--- a/src/server/plugins/SummaryPageWithConfirmationEmailController.ts
+++ b/src/server/plugins/SummaryPageWithConfirmationEmailController.ts
@@ -1,5 +1,3 @@
-import { type PageController } from '@defra/forms-engine-plugin/controllers/PageController.js'
-import { type QuestionPageController } from '@defra/forms-engine-plugin/controllers/QuestionPageController.js'
 import { SummaryPageController } from '@defra/forms-engine-plugin/controllers/SummaryPageController.js'
 import { type Translator } from '@defra/forms-engine-plugin/engine/i18n/types.js'
 import {
@@ -77,19 +75,13 @@ export class SummaryPageWithConfirmationEmailController extends SummaryPageContr
       context: FormContext,
       h: FormResponseToolkit
     ) => {
-      // Should not have to coerce the type - ticket to resolve later https://eaflood.atlassian.net/browse/DF-555
-      const viewName = (this as unknown as PageController).viewName
+      const viewName = this.viewName
       const { isForceAccess } = context
 
       // Check if this is a save-and-exit action
       const { action } = request.payload
       if (action === FormAction.SaveAndExit) {
-        // Should not have to coerce the type - ticket to resolve later https://eaflood.atlassian.net/browse/DF-555
-        return (this as unknown as QuestionPageController).handleSaveAndExit(
-          request,
-          context,
-          h
-        )
+        return this.handleSaveAndExit(request, context, h)
       }
 
       /**
@@ -98,10 +90,7 @@ export class SummaryPageWithConfirmationEmailController extends SummaryPageContr
        */
       const { error } = schema.validate(request.payload, { abortEarly: false })
       if (error || isForceAccess) {
-        // Should not have to coerce the type - ticket to resolve later https://eaflood.atlassian.net/browse/DF-555
-        context.errors = (this as unknown as QuestionPageController).getErrors(
-          error?.details
-        )
+        context.errors = this.getErrors(error?.details)
         const translator = this.getTranslator(request)
         const viewModel = this.getSummaryViewModel(request, context, translator)
         return h.view(viewName, viewModel)
@@ -113,19 +102,12 @@ export class SummaryPageWithConfirmationEmailController extends SummaryPageContr
         typeof userConfirmationEmailAddress === 'string' &&
         userConfirmationEmailAddress
       ) {
-        context.state = await (
-          this as unknown as QuestionPageController
-        ).mergeState(request, context.state, {
+        context.state = await this.mergeState(request, context.state, {
           [CONFIRMATION_EMAIL_FIELD_NAME]: userConfirmationEmailAddress
         })
       }
 
-      // Should not have to coerce the type - ticket to resolve later https://eaflood.atlassian.net/browse/DF-555
-      return (this as unknown as SummaryPageController).handleFormSubmit(
-        request,
-        context,
-        h
-      )
+      return this.handleFormSubmit(request, context, h)
     }
   }
 }