Rename clinicType to LocationType and serviceType to clinicType

edwardhorsford · edwardhorsford · commit 9a41f177403a · 2024-11-18T16:10:44.000Z
diff --git a/app/data/breast-screening-units.js b/app/data/breast-screening-units.js
@@ -15,7 +15,7 @@ module.exports = [
     },
     phoneNumber: "01865235621",
     abbreviation: "WSB",
-    serviceTypes: ['screening', 'assessment'],  // Can do both
+    clinicTypes: ['screening', 'assessment'],  // Can do both
     // Default operating hours for the BSU
     sessionPatterns: [
       {
@@ -66,7 +66,7 @@ module.exports = [
         name: "Mobile Unit JA1 CP7",
         type: "mobile_unit",
         isMainSite: false,
-        serviceTypes: ['screening'],  // Can only do screening
+        clinicTypes: ['screening'],  // Can only do screening
         registration: "JA1 CP7",
         // Override BSU session patterns for this location
         sessionPatterns: [
@@ -84,7 +84,7 @@ module.exports = [
         name: "Mobile Unit WX71 HCR",
         type: "mobile_unit",
         isMainSite: false,
-        serviceTypes: ['screening'],  // Can only do screening
+        clinicTypes: ['screening'],  // Can only do screening
         registration: "WX71 HCR",
         // Override BSU session patterns for this location
         sessionPatterns: [
diff --git a/app/lib/generate-seed-data.js b/app/lib/generate-seed-data.js
@@ -57,7 +57,7 @@ const generateData = async () => {
               slot,
               participant,
               clinic,
-              outcomeWeights: config.screening.outcomes[clinic.serviceType]
+              outcomeWeights: config.screening.outcomes[clinic.clinicType]
             });
           });
 
diff --git a/app/lib/generators/clinic-generator.js b/app/lib/generators/clinic-generator.js
@@ -6,18 +6,18 @@ const dayjs = require('dayjs');
 const weighted = require('weighted');
 const config = require('../../config');
 
-const determineServiceType = (location, breastScreeningUnit) => {
+const determineclinicType = (location, breastScreeningUnit) => {
   // First check location-specific service types
-  const serviceTypes = location.serviceTypes || breastScreeningUnit.serviceTypes;
+  const clinicTypes = location.clinicTypes || breastScreeningUnit.clinicTypes;
 
   // If still no service types, default to screening
-  if (!serviceTypes) {
+  if (!clinicTypes) {
     return 'screening';
   }
 
   // If location/BSU only supports one service type, use that
-  if (serviceTypes.length === 1) {
-    return serviceTypes[0];
+  if (clinicTypes.length === 1) {
+    return clinicTypes[0];
   }
 
   // For locations that can do both, weight towards screening
@@ -27,7 +27,7 @@ const determineServiceType = (location, breastScreeningUnit) => {
   });
 };
 
-const generateTimeSlots = (date, sessionTimes, serviceType) => {
+const generateTimeSlots = (date, sessionTimes, clinicType) => {
   const { slotDurationMinutes } = config.clinics;
   
   const slots = [];
@@ -40,8 +40,8 @@ const generateTimeSlots = (date, sessionTimes, serviceType) => {
     slots.push({
       id: slotId,
       dateTime: new Date(currentTime).toISOString(),
-      type: serviceType,  // Use the clinic's service type
-      capacity: serviceType === 'assessment' ? 1 : 2, // Assessment clinics don't double book
+      type: clinicType,  // Use the clinic's service type
+      capacity: clinicType === 'assessment' ? 1 : 2, // Assessment clinics don't double book
       bookedCount: 0,
       period: `${sessionTimes.startTime}-${sessionTimes.endTime}`
     });
@@ -87,15 +87,15 @@ const determineSessionType = (sessionTimes) => {
 };
 
 const generateClinic = (date, location, breastScreeningUnit, sessionTimes) => {
-  const serviceType = determineServiceType(location, breastScreeningUnit);
-  const slots = generateTimeSlots(date, sessionTimes, serviceType);
+  const clinicType = determineclinicType(location, breastScreeningUnit);
+  const slots = generateTimeSlots(date, sessionTimes, clinicType);
   
   return {
     id: generateId(),
     date: date.toISOString().split('T')[0],
     breastScreeningUnitId: breastScreeningUnit.id,
-    clinicType: location.type,
-    serviceType,
+    locationType: location.type,
+    clinicType,
     locationId: location.id,
     siteName: location.type === 'mobile_unit' ? generateMobileSiteName() : null,
     slots,
@@ -106,9 +106,9 @@ const generateClinic = (date, location, breastScreeningUnit, sessionTimes) => {
       support: []
     },
     targetCapacity: {
-      bookingPercent: serviceType === 'assessment' ? 100 : config.clinics.targetBookingPercent,
-      attendancePercent: serviceType === 'assessment' ? 95 : config.clinics.targetAttendancePercent,
-      totalSlots: slots.length * (serviceType === 'assessment' ? 1 : 2)
+      bookingPercent: clinicType === 'assessment' ? 100 : config.clinics.targetBookingPercent,
+      attendancePercent: clinicType === 'assessment' ? 95 : config.clinics.targetAttendancePercent,
+      totalSlots: slots.length * (clinicType === 'assessment' ? 1 : 2)
     },
     notes: null,
     sessionTimes,
diff --git a/app/lib/generators/event-generator.js b/app/lib/generators/event-generator.js
@@ -68,15 +68,15 @@ const generateEvent = ({ slot, participant, clinic, outcomeWeights }) => {
   const isTodayBeforeCurrentTime = eventDate.isBefore(currentDateTime)
 
  // If it's an assessment clinic, override the outcome weights to reflect higher probability of findings
- const eventWeights = clinic.serviceType === 'assessment' ? 
+ const eventWeights = clinic.clinicType === 'assessment' ? 
    {
      'clear': 0.4,                  // Lower chance of clear results
      'needs_further_tests': 0.45,   // Higher chance of needing more tests
      'cancer_detected': 0.15        // Higher cancer detection rate
    } : outcomeWeights;
 
  // Adjust attendance probability for assessment clinics
- const attendanceWeights = clinic.serviceType === 'assessment' ? 
+ const attendanceWeights = clinic.clinicType === 'assessment' ? 
    [0.9, 0.08, 0.02] :  // [attended, dna, attended_not_screened]
    [0.65, 0.25, 0.1];   // Original weights for screening
 
@@ -87,7 +87,7 @@ const generateEvent = ({ slot, participant, clinic, outcomeWeights }) => {
      participantId: participant.id,
      clinicId: clinic.id,
      slotId: slot.id,
-     type: clinic.serviceType,
+     type: clinic.clinicType,
      status: 'scheduled',
      details: {
        screeningType: 'mammogram',
@@ -110,7 +110,7 @@ const generateEvent = ({ slot, participant, clinic, outcomeWeights }) => {
    participantId: participant.id,
    clinicId: clinic.id,
    slotId: slot.id,
-   type: clinic.serviceType,
+   type: clinic.clinicType,
    status,
    details: {
      screeningType: 'mammogram',
diff --git a/app/lib/utils/strings.js b/app/lib/utils/strings.js
@@ -203,10 +203,32 @@ const formatPhoneNumber = (phoneNumber) => {
   return `${phoneNumber.slice(0, 4)} ${phoneNumber.slice(4, 7)} ${phoneNumber.slice(7)}`;
 };
 
+/**
+ * Format NHS number with spaces (3-3-4 format)
+ * @param {string|number} input - NHS number to format
+ * @returns {string} Formatted NHS number or original input if invalid
+ */
+const formatNhsNumber = (input) => {
+  if (!input) return '';
+  const nhsStr = input.toString().replace(/\s/g, '');
+  
+  if (!/^\d{10}$/.test(nhsStr)) {
+    return input;
+  }
+
+  return `${nhsStr.slice(0,3)} ${nhsStr.slice(3,6)} ${nhsStr.slice(6)}`;
+};
+
+// Example usage:
+// formatNhsNumber('4857773456') // returns '485 777 3456'
+// formatNhsNumber(4857773456)   // returns '485 777 3456'
+// formatNhsNumber('485 777 3456') // returns '485 777 3456'
+
 module.exports = {
   addIndefiniteArticle,
   formatCurrency,
   formatCurrencyForCsv,
+  formatNhsNumber,
   formatWords,
   isString,
   kebabCase,
diff --git a/app/views/clinics/index.html b/app/views/clinics/index.html
@@ -57,7 +57,7 @@ <h1>{{pageHeading}}</h1>
         <tr>
           <th scope="col">Location</th>
           <th scope="col">Date</th>
-          <th scope="col">Service type</th>
+          <th scope="col">Clinic type</th>
           <th scope="col">Status</th>
           <th scope="col" class="nhsuk-table__cell--numeric">Participants</th>
         </tr>
@@ -79,7 +79,7 @@ <h1>{{pageHeading}}</h1>
               </a>
             </td>
             <td>{{ clinic.date | formatDate |  noWrap }}</td>
-            <td>{{ clinic.serviceType | sentenceCase }}</td>
+            <td>{{ clinic.clinicType | sentenceCase }}</td>
             <td class="nhsuk-table__cell--numeric">
               {{ tag({
                 text: clinic.status | formatWords | sentenceCase,
diff --git a/app/views/clinics/show.html b/app/views/clinics/show.html
@@ -15,7 +15,7 @@
 
   <h1 class="nhsuk-heading-l">
     <span class="nhsuk-caption-l">{{ unit.name }}</span>
-    {{ clinic.serviceType | sentenceCase }} clinic on {{ clinic.date | formatDate }}
+    {{ clinic.clinicType | sentenceCase }} clinic on {{ clinic.date | formatDate }}
   </h1>
 
   {% set secondaryNavItems = [] %}
@@ -69,7 +69,7 @@ <h1 class="nhsuk-heading-l">
               </a>
             </td>
             {# <td class="nhsuk-table__cell">{{ participant.demographicInformation.address.postcode | noWrap }}</td> #}
-            <td class="nhsuk-table__cell">{{ participant.medicalInformation.nhsNumber }}</td>
+            <td class="nhsuk-table__cell">{{ participant.medicalInformation.nhsNumber | formatNhsNumber}}</td>
             <td class="nhsuk-table__cell">
               {{ tag({
                 text: event.status | formatWords | sentenceCase,
@@ -113,13 +113,13 @@ <h2 class="nhsuk-heading-m">Details</h2>
     </div>
     
     <div class="nhsuk-summary-list__row">
-      <dt class="nhsuk-summary-list__key">Type</dt>
-      <dd class="nhsuk-summary-list__value">{{ clinic.clinicType | replace("_", " ") | capitalize }}</dd>
+      <dt class="nhsuk-summary-list__key">Location</dt>
+      <dd class="nhsuk-summary-list__value">{{ clinic.locationType | formatWords | sentenceCase }}</dd>
     </div>
 
     <div class="nhsuk-summary-list__row">
-      <dt class="nhsuk-summary-list__key">Service</dt>
-      <dd class="nhsuk-summary-list__value">{{ clinic.serviceType | sentenceCase }}</dd>
+      <dt class="nhsuk-summary-list__key">Type</dt>
+      <dd class="nhsuk-summary-list__value">{{ clinic.clinicType | sentenceCase }}</dd>
     </div>
   </dl>
 
diff --git a/app/views/participants/show.html b/app/views/participants/show.html
@@ -26,8 +26,8 @@ <h2 class="nhsuk-heading-m">Current appointment</h2>
 
   <dl class="nhsuk-summary-list">
     <div class="nhsuk-summary-list__row">
-      <dt class="nhsuk-summary-list__key">Service</dt>
-      <dd class="nhsuk-summary-list__value">{{ clinic.serviceType | replace("_", " ") | capitalize }}</dd>
+      <dt class="nhsuk-summary-list__key">Clinic type</dt>
+      <dd class="nhsuk-summary-list__value">{{ clinic.clinicType | replace("_", " ") | capitalize }}</dd>
     </div>
     <div class="nhsuk-summary-list__row">
       <dt class="nhsuk-summary-list__key">Time</dt>
@@ -64,7 +64,7 @@ <h2 class="nhsuk-heading-m">Personal details</h2>
     <div class="nhsuk-summary-list__row">
       <dt class="nhsuk-summary-list__key">NHS number</dt>
       <dd class="nhsuk-summary-list__value">
-        {{ participant.medicalInformation.nhsNumber }}
+        {{ participant.medicalInformation.nhsNumber | formatNhsNumber }}
       </dd>
     </div>
     <div class="nhsuk-summary-list__row">
