Merge pull request #102 from Modarb-Ai-Trainer/fix-models

src/lib/models/fitness-model.ts

@@ -1,3 +1,4 @@
+import { ExerciseType } from "@common/enums/exercise-type.enum";
 import { FitnessGoal } from "@common/enums/fitness-goal.enum";
 import { FitnessLevel } from "@common/enums/fitness-level.enum";
 import { Gender } from "@common/enums/gender.enum";
@@ -52,8 +53,9 @@ export class FitnessModel {
       throw new Error("Failed to fetch data from the server");
     }
 
-    return response.json().then((data) => {
-      return data.result;
+    return response.text().then((data) => {
+      data = data.replace('NaN', ExerciseType.DURATION.toString()).replace('\n', '')
+      return JSON.parse(data)
     });
   }
 }

src/lib/models/nutrition_model.ts

@@ -39,8 +39,8 @@ export class NutritionModel {
       throw new Error("Failed to fetch data from the server");
     }
 
-    return response.json().then((data) => {
-      return data.result as INutritionPredictionItem[][];
+    return response.text().then((data) => {
+      return JSON.parse(data) as INutritionPredictionItem[][];
     });
   }
 }