calculator route updated, AgeGroupJSON new definition, EnergeticRequirement...

calculator route updated, AgeGroupJSON new definition, EnergeticRequirement totalOfPeople field added, Parser updated.

src/DTOs/AgeGroupJSON.ts

 type AgeGroupJSON = {
   edad: string;
   sexo: string;
-  pesoMediano: number;
-  cantidad: number;
+  pesoMediano: string;
+  cantidad: string;
 };
 
 export default AgeGroupJSON;

src/DTOs/EnergeticRequirementDTO.ts

 type EnergeticRequirement = {
   requerimientoEnergeticoPerCapita: number;
   requerimientoEnergeticoTotal: number;
+  poblacionTotal: number;
 };
 
 export default EnergeticRequirement;

src/Services/ERCalculator.ts

@@ -76,6 +76,7 @@ const calculateER = (groupParameters: Map<number[], AgeGroup>): CalculatorRespon
   const totalER: EnergeticRequirement = {
     requerimientoEnergeticoPerCapita: totalRequirement / totalOfPeople,
     requerimientoEnergeticoTotal: totalRequirement,
+    poblacionTotal: totalOfPeople,
   };
 
   const result: CalculatorResponse = {

src/Services/ParserService.ts

@@ -162,14 +162,15 @@ import Sex from '../Enum/Sex';
 const parseGroups = (groups: AgeGroupJSON[]): AgeGroup[] => {
   const retGroups: AgeGroup[] = [];
   groups.forEach((obj: AgeGroupJSON) => {
-    if (typeof (obj.pesoMediano) !== 'number' || typeof (obj.cantidad) !== 'number') {
-      throw new Error('Parsing error, attributes do not respect format');
-    }
+    // if (typeof (obj.pesoMediano) !== 'number' || typeof (obj.cantidad) !== 'number') {
+    //  console.log('Estas haciendo cualquiera flaco');
+    //  throw new Error('Parsing error, attributes do not respect format');
+    // }
     const group: AgeGroup = {
       edad: obj.edad as AgeBracket,
       sexo: obj.sexo as Sex,
-      pesoMediano: obj.pesoMediano,
-      cantidad: obj.cantidad,
+      pesoMediano: parseFloat(obj.pesoMediano),
+      cantidad: parseFloat(obj.cantidad),
     };
     retGroups.push(group);
   });
@@ -180,8 +181,8 @@ const unparseGroup = (group: AgeGroup): AgeGroupJSON => {
   const retGroup: AgeGroupJSON = {
     edad: group.edad as string,
     sexo: group.sexo as string,
-    pesoMediano: group.pesoMediano,
-    cantidad: group.cantidad,
+    pesoMediano: String(group.pesoMediano),
+    cantidad: String(group.cantidad),
   };
   return retGroup;
 };

src/routes.ts

 import { Request, Response, Router } from 'express';
 import SheetController from './Controllers/SheetController';
 import CalculatorController from './Controllers/CalculatorController';
+import ParameterController from './Controllers/ParameterController';
 
 const router = Router();
 
@@ -10,6 +11,8 @@ router.get('/', (req: Request, res: Response): void => {
 
 router.use('/sheetParser', SheetController);
 
-router.use('/REPcalculator', CalculatorController);
+router.use('/repCalculator', CalculatorController);
+
+router.use('/parameters', ParameterController);
 
 export default router;