feat: add age-specific mitigation

schemas/MitigationAgeSpecificDatum.yml

@@ -0,0 +1,22 @@
+$schema: http://json-schema.org/draft-07/schema
+$id: MitigationAgeSpecificDatum
+title: MitigationAgeSpecificDatum
+
+type: object
+
+additionalProperties: false
+
+required:
+  - ageGroup
+  - enabled
+  - transmissionReduction
+
+properties:
+  ageGroup:
+    $ref: 'AgeGroup#'
+
+  enabled:
+    type: boolean
+
+  transmissionReduction:
+    $ref: 'PercentageRange#'

schemas/MitigationInterval.yml

@@ -11,6 +11,7 @@ required:
   - color
   - timeRange
   - transmissionReduction
+  - mitigationAgeSpecificData
 
 properties:
   name:
@@ -25,3 +26,8 @@ properties:
 
   transmissionReduction:
     $ref: 'PercentageRange#'
+
+  mitigationAgeSpecificData:
+    type: array
+    items:
+      $ref: 'MitigationAgeSpecificDatum#'

schemas/_SchemaVer.yml

@@ -3,4 +3,4 @@ $id: _SchemaVer
 title: _SchemaVer
 
 type: string
-const: 2.0.0
+const: 2.1.0

src/algorithms/run.ts

@@ -34,6 +34,10 @@ function simulate(
 }
 
 export async function run({ params, severity, ageDistribution }: RunParams): Promise<AlgorithmResult> {
+  console.log(
+    JSON.stringify({ 'params.mitigationIntervals.mitigationAgeSpecificData': params.mitigationIntervals }, null, 2),
+  )
+
   const tMin: number = new Date(params.simulationTimeRange.begin).getTime()
   const tMax: number = new Date(params.simulationTimeRange.end).getTime()
   const ageGroups = ageDistribution.map((d) => d.ageGroup)

src/algorithms/types/Param.types.ts

@@ -6,6 +6,7 @@ import type {
   ScenarioDatum as ScenarioDatumExternal,
   ScenarioDatumMitigation as ScenarioDatumMitigationExternal,
   MitigationInterval as MitigationIntervalExternal,
+  MitigationAgeSpecificDatum as MitigationAgeSpecificDatumExternal,
   ScenarioDatumEpidemiological,
   ScenarioDatumPopulation,
   ScenarioDatumSimulation,
@@ -18,6 +19,7 @@ import type {
   ScenarioDatum,
   MitigationInterval,
   ScenarioDatumMitigation,
+  MitigationAgeSpecificDatum,
 } from './restricted/ScenarioDatum'
 
 export type {
@@ -37,7 +39,7 @@ export type { DateRange, NumericRangeNonNegative, PercentageRange } from '../../
 
 export { Convert, AgeGroup } from '../../.generated/latest/types'
 
-export type { ScenarioData, ScenarioDatum, MitigationInterval, ScenarioDatumMitigation }
+export type { ScenarioData, ScenarioDatum, MitigationInterval, ScenarioDatumMitigation, MitigationAgeSpecificDatum }
 
 export type { ScenarioDatumEpidemiological, ScenarioDatumPopulation, ScenarioDatumSimulation }
 
@@ -47,6 +49,7 @@ export type {
   ScenarioDatumExternal,
   ScenarioDatumMitigationExternal,
   MitigationIntervalExternal,
+  MitigationAgeSpecificDatumExternal,
 }
 
 export interface ScenarioParameters {

src/algorithms/types/convert.ts

@@ -2,14 +2,27 @@ import { omit } from 'lodash'
 
 import { uuidv4 } from '../../helpers/uuid'
 
-import { MitigationInterval, MitigationIntervalExternal, ScenarioDatum, ScenarioDatumExternal } from './Param.types'
+import {
+  MitigationAgeSpecificDatum,
+  MitigationAgeSpecificDatumExternal,
+  MitigationInterval,
+  MitigationIntervalExternal,
+  ScenarioDatum,
+  ScenarioDatumExternal,
+} from './Param.types'
 
-export function addId(interval: MitigationIntervalExternal): MitigationInterval {
-  return { ...interval, id: uuidv4() }
+export function mitigtaionIntervalAgeSpecificToInternal(
+  mitigationAgeSpecificData: MitigationAgeSpecificDatumExternal[],
+): MitigationAgeSpecificDatum[] {
+  return mitigationAgeSpecificData.map((datum) => ({ ...datum, id: uuidv4() } as MitigationAgeSpecificDatum))
 }
 
-export function removeId(interval: MitigationInterval): MitigationIntervalExternal {
-  return omit(interval, 'id')
+export function mitigtaionIntervalToInternal(interval: MitigationIntervalExternal): MitigationInterval {
+  return {
+    ...interval,
+    id: uuidv4(),
+    mitigationAgeSpecificData: mitigtaionIntervalAgeSpecificToInternal(interval.mitigationAgeSpecificData),
+  }
 }
 
 export function toInternal(scenario: ScenarioDatumExternal): ScenarioDatum {
@@ -18,18 +31,32 @@ export function toInternal(scenario: ScenarioDatumExternal): ScenarioDatum {
     ...scenario,
     mitigation: {
       ...scenario.mitigation,
-      mitigationIntervals: mitigationIntervals.map(addId),
+      mitigationIntervals: mitigationIntervals.map(mitigtaionIntervalToInternal),
     },
   }
 }
 
+export function mitigtaionIntervalAgeSpecificToExternal(
+  mitigationAgeSpecificData: MitigationAgeSpecificDatum[],
+): MitigationAgeSpecificDatumExternal[] {
+  return mitigationAgeSpecificData.map((datum) => omit(datum, 'id'))
+}
+
+export function mitigationIntervalToExternal(interval: MitigationInterval): MitigationIntervalExternal {
+  const intervalWithoutId = omit(interval, 'id')
+  return {
+    ...intervalWithoutId,
+    mitigationAgeSpecificData: mitigtaionIntervalAgeSpecificToExternal(intervalWithoutId.mitigationAgeSpecificData),
+  }
+}
+
 export function toExternal(scenario: ScenarioDatum): ScenarioDatumExternal {
   const { mitigationIntervals } = scenario.mitigation
   return {
     ...scenario,
     mitigation: {
       ...scenario.mitigation,
-      mitigationIntervals: mitigationIntervals.map(removeId),
+      mitigationIntervals: mitigationIntervals.map(mitigationIntervalToExternal),
     },
   }
 }

src/algorithms/types/restricted/ScenarioDatum.ts

@@ -7,10 +7,16 @@
 
 import type { Merge, StrictOmit } from 'ts-essentials'
 import type { UUIDv4 } from '../../../helpers/uuid'
+import { MitigationAgeSpecificDatumExternal } from '../Param.types'
 import type { MitigationIntervalExternal, ScenarioDatumExternal, ScenarioDatumMitigationExternal } from '../Param.types'
 
+export interface MitigationAgeSpecificDatum extends MitigationAgeSpecificDatumExternal {
+  id: UUIDv4
+}
+
 export interface MitigationInterval extends MitigationIntervalExternal {
   id: UUIDv4
+  mitigationAgeSpecificData: MitigationAgeSpecificDatum[]
 }
 
 export interface ScenarioDatumMitigationInternalMutable extends ScenarioDatumMitigationExternal {

src/algorithms/utils/suggestNextMitigationInterval.ts

@@ -17,6 +17,7 @@ export function suggestNextMitigationInterval(): MitigationInterval {
     name: `Intervention from ${tMinMoment.format('D MMM YYYY')}`,
     timeRange,
     transmissionReduction: { begin: 10, end: 30 },
+    mitigationAgeSpecificData: [],
   }
 
   const color = createColor(interval)