View rescheduled appointment

server/routes/appointments/appointmentsController.ts

@@ -900,7 +900,8 @@ export default class AppointmentsController {
   async viewSupplierAssessmentFeedback(
     req: Request,
     res: Response,
-    userType: 'service-provider' | 'probation-practitioner'
+    userType: 'service-provider' | 'probation-practitioner',
+    rescheduled: boolean
   ): Promise<void> {
     const { user } = res.locals
     const { accessToken } = user.token
@@ -939,7 +940,8 @@ export default class AppointmentsController {
       serviceUser,
       userType,
       referralId,
-      true
+      true,
+      rescheduled
     )
     const view = new SubmittedFeedbackView(presenter)
 
@@ -1456,7 +1458,8 @@ export default class AppointmentsController {
   async viewSubmittedActionPlanSessionFeedback(
     req: Request,
     res: Response,
-    userType: 'service-provider' | 'probation-practitioner'
+    userType: 'service-provider' | 'probation-practitioner',
+    rescheduled: boolean
   ): Promise<void> {
     const { accessToken } = res.locals.user.token
     const { sessionNumber, actionPlanId, appointmentId } = req.params
@@ -1498,7 +1501,8 @@ export default class AppointmentsController {
       serviceUser,
       userType,
       referral.id,
-      false
+      false,
+      rescheduled
     )
     const view = new SubmittedFeedbackView(presenter)
 
@@ -1532,6 +1536,7 @@ export default class AppointmentsController {
       'probation-practitioner',
       referral.id,
       false,
+      false,
       null
     )
     const view = new SubmittedFeedbackView(presenter)

server/routes/probationPractitionerRoutes.ts

@@ -158,7 +158,11 @@ export default function probationPractitionerRoutes(router: Router, services: Se
   get(
     router,
     '/referrals/:referralId/session/:sessionNumber/appointment/:appointmentId/post-session-feedback',
-    (req, res) => appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'probation-practitioner')
+    (req, res) =>
+      appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'probation-practitioner', false)
+  )
+  get(router, '/referrals/:referralId/session/:sessionNumber/appointment/:appointmentId/rescheduled', (req, res) =>
+    appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'probation-practitioner', true)
   )
   get(router, '/action-plan/:actionPlanId', (req, res) =>
     probationPractitionerReferralsController.viewActionPlanById(req, res)
@@ -229,10 +233,13 @@ export default function probationPractitionerRoutes(router: Router, services: Se
     appointmentsController.showSupplierAssessmentAppointment(req, res, 'probation-practitioner')
   )
   get(router, '/referrals/:referralId/supplier-assessment/post-assessment-feedback', (req, res) =>
-    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'probation-practitioner')
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'probation-practitioner', false)
   )
   get(router, '/referrals/:referralId/supplier-assessment/post-assessment-feedback/:appointmentId', (req, res) =>
-    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'probation-practitioner')
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'probation-practitioner', false)
+  )
+  get(router, '/referrals/:referralId/supplier-assessment/rescheduled/appointment/:appointmentId', (req, res) =>
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider', true)
   )
   get(router, '/referrals/:id/action-plan', (req, res) =>
     probationPractitionerReferralsController.viewLatestActionPlan(req, res)

server/routes/serviceProviderReferrals/interventionProgressPresenter.ts

@@ -190,6 +190,9 @@ export default class InterventionProgressPresenter {
     const viewHref = `/service-provider/action-plan/${this.actionPlan!.id}/session/${
       appointment.sessionNumber
     }/appointment/${appointment.appointmentId}/post-session-feedback`
+    const viewRescheduledHref = `/service-provider/action-plan/${this.actionPlan!.id}/session/${
+      appointment.sessionNumber
+    }/appointment/${appointment.appointmentId}/rescheduled`
     const editHref = `/service-provider/action-plan/${this.actionPlan!.id}/sessions/${
       appointment.sessionNumber
     }/edit/start`
@@ -261,7 +264,7 @@ export default class InterventionProgressPresenter {
         links = [
           {
             text: 'View appointment details',
-            href: viewHref,
+            href: viewRescheduledHref,
           },
         ]
         break
@@ -381,7 +384,9 @@ export default class InterventionProgressPresenter {
         return [
           {
             text: 'View appointment details',
-            href: `/service-provider/referrals/${this.referral.id}/supplier-assessment/appointment/${appointment!.id}`,
+            href: `/service-provider/referrals/${this.referral.id}/supplier-assessment/rescheduled/appointment/${
+              appointment!.id
+            }`,
           },
         ]
       case SessionStatus.awaitingFeedback:

server/routes/serviceProviderRoutes.ts

@@ -222,7 +222,10 @@ export default function serviceProviderRoutes(
   get(
     router,
     '/action-plan/:actionPlanId/session/:sessionNumber/appointment/:appointmentId/post-session-feedback',
-    (req, res) => appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'service-provider')
+    (req, res) => appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'service-provider', false)
+  )
+  get(router, '/action-plan/:actionPlanId/session/:sessionNumber/appointment/:appointmentId/rescheduled', (req, res) =>
+    appointmentsController.viewSubmittedActionPlanSessionFeedback(req, res, 'service-provider', true)
   )
   get(router, '/end-of-service-report/:id', (req, res) =>
     serviceProviderReferralsController.viewEndOfServiceReport(req, res)
@@ -341,11 +344,14 @@ export default function serviceProviderRoutes(
     appointmentsController.submitSupplierAssessmentFeedback(req, res)
   )
   get(router, '/referrals/:referralId/supplier-assessment/post-assessment-feedback', (req, res) =>
-    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider')
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider', false)
   )
   // This needs to go last in the `/post-assessment-feedback` urls to prevent clashes between the :appointmentId and other suffixes.
   get(router, '/referrals/:referralId/supplier-assessment/post-assessment-feedback/:appointmentId', (req, res) =>
-    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider')
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider', false)
+  )
+  get(router, '/referrals/:referralId/supplier-assessment/rescheduled/appointment/:appointmentId', (req, res) =>
+    appointmentsController.viewSupplierAssessmentFeedback(req, res, 'service-provider', true)
   )
 
   get(router, '/referrals/:id/action-plan', (req, res) => serviceProviderReferralsController.viewActionPlan(req, res))

server/routes/shared/appointment/feedback/submittedFeedbackPresenter.test.ts

@@ -18,6 +18,7 @@ describe(SubmittedFeedbackPresenter, () => {
         serviceUser,
         userType,
         referralId,
+        false,
         false
       )
       expect(presenter.text).toMatchObject({
@@ -30,6 +31,7 @@ describe(SubmittedFeedbackPresenter, () => {
         serviceUser,
         userType,
         referralId,
+        false,
         false
       )
       expect(presenter.text).toMatchObject({
@@ -48,6 +50,7 @@ describe(SubmittedFeedbackPresenter, () => {
         serviceUser,
         'probation-practitioner',
         'test-referral-id',
+        false,
         false
       )
 

server/routes/shared/appointment/feedback/submittedFeedbackPresenter.ts

@@ -14,6 +14,7 @@ export default class SubmittedFeedbackPresenter {
     private readonly userType: 'probation-practitioner' | 'service-provider',
     private readonly referralId: string,
     private readonly isSupplierAssessmentAppointment: boolean,
+    private readonly isRescheduledAppointment: boolean,
     private readonly actionPlanId: string | null = null
   ) {
     this.feedbackAnswersPresenter = new FeedbackAnswersPresenter(

server/views/shared/viewSubmittedPostSessionFeedback.njk

@@ -8,5 +8,7 @@
 {% block formSection %}
   {{ govukSummaryList(sessionDetailsSummaryListArgs) }}
   <br>
-  {% include "../partials/postSessionFeedbackResponses.njk" %}
+  {% if not presenter.isRescheduledAppointment %}
+    {% include "../partials/postSessionFeedbackResponses.njk" %}
+  {% endif %}
 {% endblock %}