Rename createInContext to match repo conventions

Also fix errors from suggested changes commited in PR #223

Author: malross

app/controllers/book-into-a-clinic.js

@@ -69,7 +69,7 @@ export const bookIntoClinicController = {
     const { sessionPreset } = response.locals
 
     // Create a new clinic booking in the wizard context
-    const booking = ClinicBooking.createInContext(
+    const booking = ClinicBooking.create(
       {
         sessionPreset
       },
@@ -308,17 +308,17 @@ export const bookIntoClinicController = {
       const childrenToAdd = Math.max(0, desiredCount - existingCount)
       const childrenToRemove = Math.max(0, existingCount - desiredCount)
       Array.from({ length: childrenToAdd }).forEach(() => {
-        const appointment = ClinicAppointment.createInContext(
+        const appointment = ClinicAppointment.create(
           { primary_programme_ids: booking.primaryProgrammeIDs },
           data.wizard
         )
 
         booking.addAppointment(appointment)
-      }
+      })
       Array.from({ length: childrenToRemove }).forEach(() => {
         const appointment_uuid = booking.removeLastAppointment()
         ClinicAppointment.delete(appointment_uuid, data.wizard)
-      }
+      })
 
       // Start the appointment journey for the first child
       const firstAppointment = booking.appointments[0]

app/models/clinic-appointment.js

@@ -65,23 +65,6 @@ export class ClinicAppointment {
     this.healthAnswers = options?.healthAnswers || {}
   }
 
-  /**
-   * Create a new clinic appointment, adding it to the context
-   *
-   * @param {object} appointment - an appointment to copy or an object with any subset of its properties
-   * @param {object} context - the context into which we'll add the new appointment
-   * @returns {ClinicAppointment} A new clinic booking, added to the context, and possibly with a new UUID
-   */
-  static createInContext(appointment, context) {
-    const createdAppointment = new ClinicAppointment(appointment)
-
-    // Update context
-    context.clinicAppointments = context.clinicAppointments || {}
-    context.clinicAppointments[createdAppointment.uuid] = createdAppointment
-
-    return createdAppointment
-  }
-
   /**
    * Get URI of the booking journey
    *
@@ -341,6 +324,23 @@ export class ClinicAppointment {
     }
   }
 
+  /**
+   * Create a new clinic appointment, adding it to the context
+   *
+   * @param {object} appointment - an appointment to copy or an object with any subset of its properties
+   * @param {object} context - the context into which we'll add the new appointment
+   * @returns {ClinicAppointment} A new clinic booking, added to the context, and possibly with a new UUID
+   */
+  static create(appointment, context) {
+    const createdAppointment = new ClinicAppointment(appointment)
+
+    // Update context
+    context.clinicAppointments = context.clinicAppointments || {}
+    context.clinicAppointments[createdAppointment.uuid] = createdAppointment
+
+    return createdAppointment
+  }
+
   /**
    * Update
    *

app/models/clinic-booking.js

@@ -30,23 +30,6 @@ export class ClinicBooking {
     this.appointments_ids = options?.appointments_ids ?? []
   }
 
-  /**
-   * Create a new clinic booking, adding it to the context
-   *
-   * @param {object} booking
-   * @param {object} context
-   * @returns {ClinicBooking} A new clinic booking, added to the context, and possibly with a new UUID
-   */
-  static createInContext(booking, context) {
-    const createdBooking = new ClinicBooking(booking)
-
-    // Update context
-    context.clinicBookings = context.clinicBookings || {}
-    context.clinicBookings[createdBooking.uuid] = createdBooking
-
-    return createdBooking
-  }
-
   /**
    *
    * @returns {string} Generate a new, random booking reference
@@ -173,6 +156,23 @@ export class ClinicBooking {
     }
   }
 
+  /**
+   * Create a new clinic booking, adding it to the context
+   *
+   * @param {object} booking
+   * @param {object} context
+   * @returns {ClinicBooking} A new clinic booking, added to the context, and possibly with a new UUID
+   */
+  static create(booking, context) {
+    const createdBooking = new ClinicBooking(booking)
+
+    // Update context
+    context.clinicBookings = context.clinicBookings || {}
+    context.clinicBookings[createdBooking.uuid] = createdBooking
+
+    return createdBooking
+  }
+
   /**
    * Update
    *