Added new DTOs, calculation for 6 to 17 years, not tested,

New DTOs for passage of extra data to use in calculations, changes to calculation controller and service to use new data received from frontend.

src/Controllers/CalculatorController.ts

@@ -5,13 +5,16 @@ import AgeGroupJSON from '../DTOs/AgeGroupJSON';
 import CalculatorService from '../Services/CalculatorService';
 import CalculatorResponse from '../DTOs/CalculatorResponseDTO';
 import logger from '../Logger/logger';
+import ExtraData from '../DTOs/ExtraDataDTO';
 
 const router = Router();
 
 const getREP: Handler = async (req: Request, res: Response) => {
-  const groups: AgeGroupJSON[] = req.body;
+  const { groups } = req.body;
+  const { extraData } = req.body;
   try {
-    const EnergyReq: CalculatorResponse = CalculatorService.calculateEnergeticRequirement(groups);
+    const EnergyReq:
+    CalculatorResponse = CalculatorService.calculateEnergeticRequirement(groups, extraData);
     return res.status(200).send(EnergyReq);
   } catch (error) {
     const e = error as Error;

src/DTOs/AdultPALDTO.ts

+type AdultPAL = {
+  porcentajeUrbano: number;
+  NAFActivosUrbano: number;
+  NAFLivianaUrbano: number;
+  porcentajeRural: number;
+  NAFActivosRural: number;
+  NAFLivianaRural: number;
+};
+
+export default AdultPAL;

src/DTOs/ExtraDataDTO.ts

+import AdultPAL from './AdultPALDTO';
+import IndividualMaternity from './IndividualMaternityDTO';
+import MinorPAL from './MinorPALDTO';
+import PopulationMaternity from './PopulationMaternityDTO';
+
+type ExtraData = {
+  prevalenciaAFMenores: MinorPAL | undefined;
+  prevalenciaAFAdultos: AdultPAL | undefined;
+  datosEmbarazoLactancia: IndividualMaternity | PopulationMaternity | undefined;
+};
+
+export default ExtraData;

src/DTOs/IndividualMaternityDTO.ts

+type IndividualMaternity = {
+  mujeresEmbarazadas: number;
+  mujeresLactando: number;
+  mujeresEmbarazadasLactando: number;
+};
+
+export default IndividualMaternity;

src/DTOs/MinorPALDTO.ts

+type MinorPAL = {
+  NAFLiviano: number;
+  NAFModerado: number;
+  NAFIntenso: number;
+};
+
+export default MinorPAL;

src/DTOs/PopulationMaternityDTO.ts

+type PopulationMaternity = {
+  tasaNatalidadPais: number;
+  poblacionPais: number;
+};
+
+export default PopulationMaternity;

src/Services/CalculatorService.ts

@@ -4,15 +4,17 @@ import ParserService from './ParserService';
 import AgeGroup from '../DTOs/AgeGroupDTO';
 import CalculatorResponse from '../DTOs/CalculatorResponseDTO';
 import AgeGroupJSON from '../DTOs/AgeGroupJSON';
+import extraData from '../DTOs/ExtraDataDTO';
 
-const calculateEnergeticRequirement = (data: AgeGroupJSON[]): CalculatorResponse => {
+// eslint-disable-next-line max-len
+const calculateEnergeticRequirement = (groups: AgeGroupJSON[], data: extraData): CalculatorResponse => {
   const parametros = new Map<number[], AgeGroup>();
-  const ageGroups = ParserService.parseGroups(data);
+  const ageGroups = ParserService.parseGroups(groups);
   ageGroups.forEach((group: AgeGroup) => {
     parametros.set(ParameterService.getEquationValues(group.edad, group.sexo), group);
   });
 
-  const res: CalculatorResponse = ERCalculator.calculateER(parametros);
+  const res: CalculatorResponse = ERCalculator.calculateER(parametros, data);
 
   return res;
 };

src/Services/ERCalculator.ts

@@ -2,9 +2,26 @@ import AgeGroup from '../DTOs/AgeGroupDTO';
 import EnergeticRequirement from '../DTOs/EnergeticRequirementDTO';
 import CalculatorResponse from '../DTOs/CalculatorResponseDTO';
 import GroupEnergeticRequirement from '../DTOs/GroupEnergeticRequirementDTO';
+import extraData from '../DTOs/ExtraDataDTO';
+import prevalenciaAFMenores from '../DTOs/MinorPALDTO';
 import ParserService from './ParserService';
 import AgeBracket from '../Enum/AgeBracket';
 
+const calculateGET = (group: AgeGroup, params: number[], preval: prevalenciaAFMenores): number => {
+  const getModerado: number = params[0]
+  + (params[1] * group.pesoMediano)
+  - params[2] * (group.pesoMediano * group.pesoMediano);
+
+  const getLiviano: number = getModerado - (getModerado * params[4]) / 100;
+  const getIntenso: number = getModerado + (getModerado * params[5]) / 100;
+
+  const ret: number = (getLiviano * preval.NAFLiviano) / 100
+  + (getModerado * preval.NAFModerado) / 100
+  + (getIntenso * preval.NAFIntenso) / 100;
+
+  return ret;
+};
+
 const calculateLessThanAYear = (group: AgeGroup, params: number[]): GroupEnergeticRequirement => {
   const requirement = params[0] + (params[1] * group.pesoMediano) + params[2];
 
@@ -32,7 +49,28 @@ const calculateOneToFiveYears = (group: AgeGroup, params: number[]): GroupEnerge
   return groupRequirement;
 };
 
-const calculateER = (groupParameters: Map<number[], AgeGroup>): CalculatorResponse => {
+// eslint-disable-next-line max-len
+const calculateSixToSeventeenYears = (group: AgeGroup, params: number[], data: extraData): GroupEnergeticRequirement => {
+  let get: number;
+  if (typeof (data.prevalenciaAFMenores) === 'undefined') {
+    throw new Error('Data missing');
+  } else {
+    get = calculateGET(group, params, data.prevalenciaAFMenores);
+  }
+
+  const requirement = get + params[3];
+
+  const groupRequirement: GroupEnergeticRequirement = {
+    grupoEtario: ParserService.unparseGroup(group),
+    requerimientoEnergeticoPerCapita: requirement,
+    requerimientoEnergeticoTotal: requirement * group.cantidad,
+  };
+
+  return groupRequirement;
+};
+
+// eslint-disable-next-line max-len
+const calculateER = (groupParameters: Map<number[], AgeGroup>, data: extraData): CalculatorResponse => {
   let totalOfPeople = 0;
   let totalRequirement = 0;
 
@@ -65,6 +103,21 @@ const calculateER = (groupParameters: Map<number[], AgeGroup>): CalculatorRespon
         groupRequirement = calculateOneToFiveYears(group, params);
         break;
       }
+      case AgeBracket.a6:
+      case AgeBracket.a7:
+      case AgeBracket.a8:
+      case AgeBracket.a9:
+      case AgeBracket.a10:
+      case AgeBracket.a11:
+      case AgeBracket.a12:
+      case AgeBracket.a13:
+      case AgeBracket.a14:
+      case AgeBracket.a15:
+      case AgeBracket.a16:
+      case AgeBracket.a17: {
+        groupRequirement = calculateSixToSeventeenYears(group, params, data);
+        break;
+      }
       default: {
         throw new Error('Parsing error, attribute edad does not respect format');
       }

src/Services/ParameterService.ts

@@ -178,121 +178,121 @@ const getEquationValues = (ageBracket: AgeBracket, sex: Sex): number[] => {
     }
     case (AgeBracket.a6): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 11
-        res = [310.2, 63.3, -0.263, 12];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 11, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 12, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 10
-        res = [263.4, 65.3, -0.454, 13];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 10, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 13, 15, 15];
       }
       break;
     }
     case (AgeBracket.a7): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 14
-        res = [310.2, 63.3, -0.263, 14];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 14, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 14, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 17
-        res = [263.4, 65.3, -0.454, 17];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 17, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 17, 15, 15];
       }
       break;
     }
     case (AgeBracket.a8): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 16
-        res = [310.2, 63.3, -0.263, 16];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 16, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 16, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 20
-        res = [263.4, 65.3, -0.454, 20];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 20, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 20, 15, 15];
       }
       break;
     }
     case (AgeBracket.a9): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 19
-        res = [310.2, 63.3, -0.263, 19];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 19, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 19, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 23
-        res = [263.4, 65.3, -0.454, 23];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 23, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 23, 15, 15];
       }
       break;
     }
     case (AgeBracket.a10): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 22
-        res = [310.2, 63.3, -0.263, 22];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 22, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 22, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 25
-        res = [263.4, 65.3, -0.454, 25];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 25, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 25, 15, 15];
       }
       break;
     }
     case (AgeBracket.a11): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 25
-        res = [310.2, 63.3, -0.263, 25];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 25, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 25, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 25
-        res = [263.4, 65.3, -0.454, 25];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 25, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 25, 15, 15];
       }
       break;
     }
     case (AgeBracket.a12): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 29
-        res = [310.2, 63.3, -0.263, 29];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 29, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 29, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 26
-        res = [263.4, 65.3, -0.454, 26];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 26, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 26, 15, 15];
       }
       break;
     }
     case (AgeBracket.a13): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 33
-        res = [310.2, 63.3, -0.263, 33];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 33, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 33, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 24
-        res = [263.4, 65.3, -0.454, 24];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 24, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 24, 15, 15];
       }
       break;
     }
     case (AgeBracket.a14): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 33
-        res = [310.2, 63.3, -0.263, 33];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 33, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 33, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 19
-        res = [263.4, 65.3, -0.454, 19];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 19, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 19, 15, 15];
       }
       break;
     }
     case (AgeBracket.a15): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 31
-        res = [310.2, 63.3, -0.263, 31];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 31, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 31, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 13
-        res = [263.4, 65.3, -0.454, 13];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 13, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 13, 15, 15];
       }
       break;
     }
     case (AgeBracket.a16): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 24
-        res = [310.2, 63.3, -0.263, 24];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 24, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 24, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 5
-        res = [263.4, 65.3, -0.454, 5];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 5, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 5, 15, 15];
       }
       break;
     }
     case (AgeBracket.a17): {
       if (sex === Sex.Masculino) {
-        // 310.2 + (63.3*MP) - 0.263*MP^2 + 14
-        res = [310.2, 63.3, -0.263, 14];
+        // 310.2 + (63.3*MP) - 0.263*MP^2 + 14, -15%/+15% para GET liviano/intenso
+        res = [310.2, 63.3, -0.263, 14, 15, 15];
       } else if (sex === Sex.Femenino) {
-        // 263.4 + (65.3*MP) - 0.454*MP^2 + 0
-        res = [263.4, 65.3, -0.454, 0];
+        // 263.4 + (65.3*MP) - 0.454*MP^2 + 0, -15%/+15% para GET liviano/intenso
+        res = [263.4, 65.3, -0.454, 0, 15, 15];
       }
       break;
     }