Sept 30 bugfixes (#170)

* Reduce number of checked-in participants
* Improve generation to prefer existing people for prior snapshots

Author: edwardhorsford

app/data/test-scenarios.js

@@ -77,7 +77,7 @@ module.exports = [
         missingViews: ['RMLO', 'RCC'], // ensure all views are present
         scheduling: {
           whenRelativeToToday: 0,
-          status: 'event_checked_in',
+          status: 'event_scheduled',
           approximateTime: '11:30'
           // slotIndex: 20,
         }

app/lib/generate-seed-data.js

@@ -103,7 +103,9 @@ const generateClinicsForDay = (
   allParticipants,
   unit,
   usedParticipantsInSnapshot,
-  indices
+  indices,
+  testScenarioParticipantIds = new Set(),
+  unitEvents = []
 ) => {
   const clinics = []
   const events = []
@@ -112,6 +114,12 @@ const generateClinicsForDay = (
   // Check if this snapshot date is for the recent period (not historical)
   const isRecentSnapshot = dayjs(date).isAfter(dayjs().subtract(1, 'month'))
 
+  // For historical snapshots, extract participants who have events in the current period
+  const participantsWithExistingEvents =
+    !isRecentSnapshot && unitEvents.length > 0
+      ? new Set(unitEvents.map((event) => event.participantId))
+      : new Set()
+
   // Check if this is today - we want one in-progress event for today only
   const isToday = dayjs(date).isSame(dayjs(), 'day')
 
@@ -199,9 +207,26 @@ const generateClinicsForDay = (
       )
 
       // Get available participants of selected risk level
-      const availableParticipants = indices.riskLevelIndex[
+      // EXCLUDE test scenario participants from random selection
+      let availableParticipants = indices.riskLevelIndex[
         selectedRiskLevel
-      ].filter((p) => !usedParticipantsInSnapshot.has(p.id))
+      ].filter(
+        (p) =>
+          !usedParticipantsInSnapshot.has(p.id) &&
+          !testScenarioParticipantIds.has(p.id)
+      )
+
+      // For historical snapshots, prefer participants with existing events
+      if (!isRecentSnapshot && participantsWithExistingEvents.size > 0) {
+        const preferred = availableParticipants.filter((p) =>
+          participantsWithExistingEvents.has(p.id)
+        )
+
+        // Use preferred participants if available, otherwise fall back to all available
+        if (preferred.length > 0) {
+          availableParticipants = preferred
+        }
+      }
 
       if (availableParticipants.length === 0) {
         const newParticipant = generateParticipant({
@@ -276,6 +301,11 @@ const generateData = async () => {
     })
   })
 
+  // Create set of test scenario participant IDs
+  const testScenarioParticipantIds = new Set(
+    testScenarios.map((s) => s.participant.id)
+  )
+
   console.log('Generating random participants...')
   const randomParticipants = Array.from(
     { length: config.generation.numberOfParticipants },
@@ -351,7 +381,9 @@ const generateData = async () => {
           participants,
           unit,
           usedParticipantsInSnapshot,
-          indices
+          indices,
+          testScenarioParticipantIds,
+          unitEvents
         )
       )
 

app/lib/generators/event-generator.js

@@ -52,10 +52,10 @@ const determineEventStatus = (
   if (minutesPassed <= 60) {
     // Within 30 mins of appointment
     return weighted.select({
-      event_checked_in: 0.6,
-      event_complete: 0.1,
+      event_checked_in: 0.3,
+      event_complete: 0.2,
       event_attended_not_screened: 0.1,
-      event_scheduled: 0.2
+      event_scheduled: 0.4
     })
   } else {
     // More than 30 mins after appointment
@@ -82,6 +82,8 @@ const generateEvent = ({
   const simulatedDateTime = dayjs()
     .hour(parseInt(hours))
     .minute(parseInt(minutes))
+    .second(0)
+    .millisecond(0)
   const slotDateTime = dayjs(slot.dateTime)
   const isPast = slotDateTime.isBefore(simulatedDateTime)
 

app/views/_includes/summary-lists/rows/last-known-mammogram.njk

@@ -7,10 +7,10 @@
       <span class="nhsuk-u-font-weight-bold">At this BSU</span><br>
     {% endif %}
     {# Temporarily hardcode until we can investigate bug with date #}
-    {{ "2022-03-23" | formatDate }}
+    {# {{ "2022-03-23" | formatDate }}
     ({{ "2022-03-23" | formatDate | formatRelativeDate | asHint }})</br>
-    West of London BSU
-    {# {% set mostRecentClinic = data | getParticipantMostRecentClinic(participant.id) %}
+    West of London BSU #}
+    {% set mostRecentClinic = data | getParticipantMostRecentClinic(participant.id) %}
     {% if mostRecentClinic %}
       {{ mostRecentClinic | log }}
       {{ mostRecentClinic.event.timing.startTime | formatDate }} ({{ mostRecentClinic.event.timing.startTime | formatDate | formatRelativeDate | asHint }})</br>
@@ -19,7 +19,7 @@
 
     {% else %}
         {{ "Not known" | asHint }}
-    {% endif %} #}
+    {% endif %}
   </p>
 
   {% if hasAdditionalMammograms %}

gulpfile.js

@@ -97,7 +97,7 @@ async function startNodemon(done) {
     stdout: true,
     ext: 'js json',
     watch: ['.env', 'app.js', 'app', 'lib'],
-    ignore: ['app/assets', '**.test.*'],
+    ignore: ['app/assets', 'app/data/generated', '**.test.*'],
     quiet: false
   })