Add assessment clinic type, clean up code

Author: edwardhorsford

app/config.js

@@ -38,15 +38,18 @@ module.exports = {
   },
 
   screening: {
-    // Outcomes and their probabilities
     outcomes: {
-      clear: 0.95,
-      needs_further_tests: 0.04,
-      cancer_detected: 0.01
-    },
-    
-    // Standard images taken during screening
-    standardImages: ['RCC', 'LCC', 'RMLO', 'LMLO']
+      screening: {
+        'clear': 0.95,
+        'needs_further_tests': 0.04,
+        'cancer_detected': 0.01
+      },
+      assessment: {
+        'clear': 0.4,
+        'needs_further_tests': 0.45,
+        'cancer_detected': 0.15
+      }
+    }
   },
 
   // Data generation settings

app/data/breast-screening-units.js

@@ -15,6 +15,7 @@ module.exports = [
     },
     phoneNumber: "01865235621",
     abbreviation: "OXF",
+    serviceTypes: ['screening', 'assessment'],  // Can do both
     // Default operating hours for the BSU
     sessionPatterns: [
       {
@@ -62,10 +63,11 @@ module.exports = [
       // },
       {
         id: "2yt5dukk", // Must be hardcoded so it matches generated data
-        name: "Mobile Unit WX71 HCP",
+        name: "Mobile Unit JA1 CP7",
         type: "mobile_unit",
         isMainSite: false,
-        registration: "WX71 HCP",
+        serviceTypes: ['screening'],  // Can only do screening
+        registration: "JA1 CP7",
         // Override BSU session patterns for this location
         sessionPatterns: [
           {
@@ -82,6 +84,7 @@ module.exports = [
         name: "Mobile Unit WX71 HCR",
         type: "mobile_unit",
         isMainSite: false,
+        serviceTypes: ['screening'],  // Can only do screening
         registration: "WX71 HCR",
         // Override BSU session patterns for this location
         sessionPatterns: [

app/lib/generate-seed-data.js

@@ -57,7 +57,7 @@ const generateData = async () => {
               slot,
               participant,
               clinic,
-              outcomeWeights: config.screening.outcomes
+              outcomeWeights: config.screening.outcomes[clinic.serviceType]
             });
           });
 

app/lib/generators/clinic-generator.js

@@ -3,10 +3,31 @@
 const { faker } = require('@faker-js/faker');
 const generateId = require('../utils/id-generator');
 const dayjs = require('dayjs');
+const weighted = require('weighted');
 const config = require('../../config');
 
+const determineServiceType = (location, breastScreeningUnit) => {
+  // First check location-specific service types
+  const serviceTypes = location.serviceTypes || breastScreeningUnit.serviceTypes;
 
-const generateTimeSlots = (date, sessionTimes) => {
+  // If still no service types, default to screening
+  if (!serviceTypes) {
+    return 'screening';
+  }
+
+  // If location/BSU only supports one service type, use that
+  if (serviceTypes.length === 1) {
+    return serviceTypes[0];
+  }
+
+  // For locations that can do both, weight towards screening
+  return weighted.select({
+    'screening': 0.8,
+    'assessment': 0.2
+  });
+};
+
+const generateTimeSlots = (date, sessionTimes, serviceType) => {
   const { slotDurationMinutes } = config.clinics;
 
   const slots = [];
@@ -19,8 +40,8 @@ const generateTimeSlots = (date, sessionTimes) => {
     slots.push({
       id: slotId,
       dateTime: new Date(currentTime).toISOString(),
-      type: 'screening',
-      capacity: 2,
+      type: serviceType,  // Use the clinic's service type
+      capacity: serviceType === 'assessment' ? 1 : 2, // Assessment clinics don't double book
       bookedCount: 0,
       period: `${sessionTimes.startTime}-${sessionTimes.endTime}`
     });
@@ -66,13 +87,15 @@ const determineSessionType = (sessionTimes) => {
 };
 
 const generateClinic = (date, location, breastScreeningUnit, sessionTimes) => {
-  const slots = generateTimeSlots(date, sessionTimes);
+  const serviceType = determineServiceType(location, breastScreeningUnit);
+  const slots = generateTimeSlots(date, sessionTimes, serviceType);
 
   return {
     id: generateId(),
     date: date.toISOString().split('T')[0],
     breastScreeningUnitId: breastScreeningUnit.id,
     clinicType: location.type,
+    serviceType,
     locationId: location.id,
     siteName: location.type === 'mobile_unit' ? generateMobileSiteName() : null,
     slots,
@@ -83,9 +106,9 @@ const generateClinic = (date, location, breastScreeningUnit, sessionTimes) => {
       support: []
     },
     targetCapacity: {
-      bookingPercent: config.clinics.targetBookingPercent,
-      attendancePercent: config.clinics.targetAttendancePercent,
-      totalSlots: slots.length * 2
+      bookingPercent: serviceType === 'assessment' ? 100 : config.clinics.targetBookingPercent,
+      attendancePercent: serviceType === 'assessment' ? 95 : config.clinics.targetAttendancePercent,
+      totalSlots: slots.length * (serviceType === 'assessment' ? 1 : 2)
     },
     notes: null,
     sessionTimes,