@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/utils/RecommendationError.tsx

@@ -1,8 +1,10 @@
-import * as Calculator from "@hedia/recommendation-calculator";
+import { BolusCalculator } from "@hedia/types";
 import { t } from "@lingui/macro";
 import { i18n } from "../locale/i18nUtils";
 import { RecommendationErrorEnum } from "../types/enum";
 
+const SAFETY_INSULIN_LIMIT = BolusCalculator.Constants.SAFETY_INSULIN_LIMIT;
+
 export class RecommendationError extends Error {
 	public readonly type: RecommendationErrorEnum;
 
@@ -72,6 +74,13 @@ export const CurrentBGLError = (): RecommendationError =>
 		i18n._(t`Error. Hedia Calculator does not support your current blood glucose level.`),
 		RecommendationErrorEnum.CurrentBGL,
 	);
+export const LatestLogbook6HoursBGLError = (): RecommendationError =>
+	new RecommendationError(
+		i18n._(
+			t`Error. Hedia Calculator does not support the blood glucose level of your latest logbook entry from the last 6 hours.`,
+		),
+		RecommendationErrorEnum.LatestLogbook6HoursBGL,
+	);
 export const CurrentBKLError = (): RecommendationError =>
 	new RecommendationError(
 		i18n._(t`Error. Hedia Calculator does not support your current blood ketone level.`),
@@ -86,9 +95,7 @@ export const TargetBGLError = (): RecommendationError =>
 
 export const BolusInsulinDoseError = (): RecommendationError =>
 	new RecommendationError(
-		i18n._(
-			t`Error. Hedia Calculator does not support an insulin dose greater than ${Calculator.SAFETY_INSULIN_LIMIT} units`,
-		),
+		i18n._(t`Error. Hedia Calculator does not support an insulin dose greater than ${SAFETY_INSULIN_LIMIT} units`),
 		RecommendationErrorEnum.BolusInsulinDose,
 	);
 
@@ -98,6 +105,12 @@ export const BolusInsulinSecondsPassedError = (): RecommendationError =>
 		RecommendationErrorEnum.BolusInsulinSecondsPassed,
 	);
 
+export const RecentBolusError = (): RecommendationError =>
+	new RecommendationError(
+		i18n._(t`Error. Hedia Calculator could not find your recent boluses`),
+		RecommendationErrorEnum.RecentBolus,
+	);
+
 export const UserReminderError = (): RecommendationError =>
 	new RecommendationError(
 		i18n._(t`Error. Please verify your notifications settings.`),

package/src/utils/RecommendationUtils.d.ts

@@ -1,10 +1,9 @@
-import { IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
 import { BgLevel } from "../types/enum";
-import { logbookEntry } from "../types/types";
+import { IActivityParams, logbookEntry } from "../types/types";
 import { AttentionMessage, Messages } from "./AttentionMessages";
-export declare function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry): BgLevel;
-export declare function getReminder(bgLevel: BgLevel, carbohydrates: number, userReminder: number, activity: IActivityParams): number;
-export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams): AttentionMessage;
-export declare function isSevereHyperglycemia(latestLogbookFrom6Hours: logbookEntry): boolean;
-export declare function isActivityWithin15Minutes(activity: IActivityParams): boolean;
-export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number): Messages;
+export declare function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry | null): BgLevel;
+export declare function getReminder(bgLevel: BgLevel, carbohydrates: number, userReminder: number, activity: IActivityParams | null): number;
+export declare function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): AttentionMessage | null;
+export declare function isSevereHyperglycemia(logbook?: logbookEntry | null): boolean;
+export declare function isActivityWithin15Minutes(activity: IActivityParams | null): boolean;
+export declare function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): Messages | null;

package/src/utils/RecommendationUtils.js

@@ -31,7 +31,9 @@ function getBGLevel(currentBGL, latestLogbookFrom6Hours) {
     if (currentBGL > 7 && currentBGL < 15) {
         return enum_1.BgLevel.MildHyperglycemia;
     }
-    if (currentBGL > 15 && currentBGL <= 33.3 && isSevereHyperglycemia(latestLogbookFrom6Hours)) {
+    if (currentBGL > 15 && currentBGL <= 33.3 && latestLogbookFrom6Hours
+        ? isSevereHyperglycemia(latestLogbookFrom6Hours)
+        : false) {
         return enum_1.BgLevel.SevereHyperglycemia;
     }
     if (currentBGL >= 15 && currentBGL <= 33.3) {
@@ -67,9 +69,9 @@ function getAttentionMessage(bgLevel, activity) {
         case enum_1.BgLevel.BGLevelNotProvided:
         case enum_1.BgLevel.Normoglycemia:
         case enum_1.BgLevel.MildHyperglycemia:
-            return undefined;
+            return null;
         case enum_1.BgLevel.NormoglycemiaUnder5MMOL:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : undefined;
+            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
         case enum_1.BgLevel.SevereHypoglycemia:
         case enum_1.BgLevel.Hypoglycemia:
         case enum_1.BgLevel.MildHypoglycemia:
@@ -77,7 +79,7 @@ function getAttentionMessage(bgLevel, activity) {
                 ? AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]())
                 : AttentionMessages_1.AttentionMessage[enum_1.BgLevel[bgLevel]]();
         case enum_1.BgLevel.Hyperglycemia:
-            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : undefined;
+            return isActivityWithin15Minutes(activity) ? AttentionMessages_1.AttentionMessage.HyperglycemiaActivity() : null;
         case enum_1.BgLevel.SevereHyperglycemia:
             return isActivityWithin15Minutes(activity)
                 ? AttentionMessages_1.AttentionMessage.SevereHyperglycemiaActivity()
@@ -87,8 +89,14 @@ function getAttentionMessage(bgLevel, activity) {
     }
 }
 exports.getAttentionMessage = getAttentionMessage;
-function isSevereHyperglycemia(latestLogbookFrom6Hours) {
-    return latestLogbookFrom6Hours?.blood_glucose_millimolar > Constants_1.SEVERE_HYPERGLYCEMIA_START_MMOL;
+function isSevereHyperglycemia(logbook) {
+    if (logbook !== null && logbook !== undefined) {
+        const { blood_glucose_millimolar } = logbook;
+        if (blood_glucose_millimolar !== null) {
+            return blood_glucose_millimolar > Constants_1.SEVERE_HYPERGLYCEMIA_START_MMOL;
+        }
+    }
+    return false;
 }
 exports.isSevereHyperglycemia = isSevereHyperglycemia;
 function isActivityWithin15Minutes(activity) {
@@ -102,6 +110,6 @@ function getLimitationMessage(wasLimited, activityReduction) {
     const message = activityReduction
         ? AttentionMessages_1.Messages.RecommendationWasLimitedActivity(activityReduction)
         : AttentionMessages_1.Messages.RecommendationWasLimited();
-    return wasLimited ? message : undefined;
+    return wasLimited ? message : null;
 }
 exports.getLimitationMessage = getLimitationMessage;

package/src/utils/RecommendationUtils.ts

@@ -1,12 +1,11 @@
-import { IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
 import moment from "moment";
 import { BgLevel, RecommendationReminders } from "../types/enum";
-import { logbookEntry } from "../types/types";
+import { IActivityParams, logbookEntry } from "../types/types";
 import { addPostponeActivityMessageUnder5MMOL, AttentionMessage, Messages } from "./AttentionMessages";
 import { SEVERE_HYPERGLYCEMIA_START_MMOL } from "./Constants";
 import { CurrentBGLError } from "./RecommendationError";
 
-export function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry): BgLevel {
+export function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookEntry | null): BgLevel {
 	if (currentBGL === null) {
 		return BgLevel.BGLevelNotProvided;
 	}
@@ -28,7 +27,11 @@ export function getBGLevel(currentBGL: number, latestLogbookFrom6Hours: logbookE
 	if (currentBGL > 7 && currentBGL < 15) {
 		return BgLevel.MildHyperglycemia;
 	}
-	if (currentBGL > 15 && currentBGL <= 33.3 && isSevereHyperglycemia(latestLogbookFrom6Hours)) {
+	if (
+		currentBGL > 15 && currentBGL <= 33.3 && latestLogbookFrom6Hours
+			? isSevereHyperglycemia(latestLogbookFrom6Hours)
+			: false
+	) {
 		return BgLevel.SevereHyperglycemia;
 	}
 	if (currentBGL >= 15 && currentBGL <= 33.3) {
@@ -41,7 +44,7 @@ export function getReminder(
 	bgLevel: BgLevel,
 	carbohydrates: number,
 	userReminder: number,
-	activity: IActivityParams,
+	activity: IActivityParams | null,
 ): number {
 	const reminder = userReminder === undefined ? RecommendationReminders.HediaReminderDefault : userReminder;
 	switch (bgLevel) {
@@ -67,15 +70,15 @@ export function getReminder(
 	}
 }
 
-export function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams): AttentionMessage {
+export function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams | null): AttentionMessage | null {
 	switch (bgLevel) {
 		case BgLevel.BGLevelNotProvided:
 		case BgLevel.Normoglycemia:
 		case BgLevel.MildHyperglycemia:
-			return undefined;
+			return null;
 
 		case BgLevel.NormoglycemiaUnder5MMOL:
-			return isActivityWithin15Minutes(activity) ? AttentionMessage.NormoglycemiaActivityUnder5MMOL() : undefined;
+			return isActivityWithin15Minutes(activity) ? AttentionMessage.NormoglycemiaActivityUnder5MMOL() : null;
 
 		case BgLevel.SevereHypoglycemia:
 		case BgLevel.Hypoglycemia:
@@ -85,7 +88,7 @@ export function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams)
 				: AttentionMessage[BgLevel[bgLevel]]();
 
 		case BgLevel.Hyperglycemia:
-			return isActivityWithin15Minutes(activity) ? AttentionMessage.HyperglycemiaActivity() : undefined;
+			return isActivityWithin15Minutes(activity) ? AttentionMessage.HyperglycemiaActivity() : null;
 
 		case BgLevel.SevereHyperglycemia:
 			return isActivityWithin15Minutes(activity)
@@ -96,20 +99,27 @@ export function getAttentionMessage(bgLevel: BgLevel, activity: IActivityParams)
 	}
 }
 
-export function isSevereHyperglycemia(latestLogbookFrom6Hours: logbookEntry): boolean {
-	return latestLogbookFrom6Hours?.blood_glucose_millimolar > SEVERE_HYPERGLYCEMIA_START_MMOL;
+export function isSevereHyperglycemia(logbook?: logbookEntry | null): boolean {
+	if (logbook !== null && logbook !== undefined) {
+		const { blood_glucose_millimolar } = logbook;
+		if (blood_glucose_millimolar !== null) {
+			return blood_glucose_millimolar > SEVERE_HYPERGLYCEMIA_START_MMOL;
+		}
+	}
+
+	return false;
 }
 
-export function isActivityWithin15Minutes(activity: IActivityParams): boolean {
+export function isActivityWithin15Minutes(activity: IActivityParams | null): boolean {
 	const minutes = activity?.activityDuration;
 	return moment
 		.utc(activity?.activityDate)
 		.isBetween(moment.utc().subtract(minutes, `minutes`), moment.utc().add(15, `minutes`));
 }
 
-export function getLimitationMessage(wasLimited: boolean, activityReduction: number): Messages {
+export function getLimitationMessage(wasLimited: boolean, activityReduction: number | null): Messages | null {
 	const message = activityReduction
 		? Messages.RecommendationWasLimitedActivity(activityReduction)
 		: Messages.RecommendationWasLimited();
-	return wasLimited ? message : undefined;
+	return wasLimited ? message : null;
 }

package/src/utils/Translations.d.ts

@@ -0,0 +1,2 @@
+import { Activity } from "@hedia/types";
+export declare const ActivityIntensityTranslations: Record<Activity.Enums.ActivityIntensity, () => string>;

package/src/utils/Translations.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActivityIntensityTranslations = void 0;
+const macro_1 = require("@lingui/macro");
+const i18nUtils_1 = require("../locale/i18nUtils");
+exports.ActivityIntensityTranslations = {
+    light: () => i18nUtils_1.i18n._(macro_1.t `Light`),
+    moderate: () => i18nUtils_1.i18n._(macro_1.t `Moderate`),
+    hard: () => i18nUtils_1.i18n._(macro_1.t `Hard`),
+};

package/src/utils/Translations.ts

@@ -0,0 +1,9 @@
+import { Activity } from "@hedia/types";
+import { t } from "@lingui/macro";
+import { i18n } from "../locale/i18nUtils";
+
+export const ActivityIntensityTranslations: Record<Activity.Enums.ActivityIntensity, () => string> = {
+	light: (): string => i18n._(t`Light`),
+	moderate: (): string => i18n._(t`Moderate`),
+	hard: (): string => i18n._(t`Hard`),
+};

package/src/utils/Utils.d.ts

@@ -1,10 +1,9 @@
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
-import { InjectionMethod } from "../types/enum";
+import { BloodGlucoseUnit, BloodKetonesUnit, UserSettings } from "@hedia/types";
 import { IInterval } from "../types/types";
 export declare class Utils {
-    static getRounding(method: InjectionMethod): number;
-    static roundValue(value: number, injectMethod: InjectionMethod): number;
-    static isInClosedInterval(value: number, interval: IInterval): boolean;
+    static getRounding(method: UserSettings.Enums.InjectionMethod): number;
+    static roundValue(value: number, injectMethod: UserSettings.Enums.InjectionMethod): number;
+    static isInRange(value: number | null, interval: IInterval): boolean;
     static convertBGLToMGDL(value: number): number;
     static displayedBGLValue(value: number, unit: BloodGlucoseUnit): number;
     static convertBKLToMGDL(value: number): number;

package/src/utils/Utils.js

@@ -2,16 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const types_1 = require("@hedia/types");
-const enum_1 = require("../types/enum");
 const Constants_1 = require("./Constants");
+const InjectionMethod = types_1.UserSettings.Enums.InjectionMethod;
+const { PenHalf, PenWhole, Pump } = InjectionMethod;
 class Utils {
     static getRounding(method) {
         switch (method) {
-            case enum_1.InjectionMethod.PenWhole:
+            case PenWhole:
                 return 1;
-            case enum_1.InjectionMethod.PenHalf:
+            case PenHalf:
                 return 2;
-            case enum_1.InjectionMethod.Pump:
+            case Pump:
                 return 10;
             default:
                 throw Error(`Unsupported InjectionMethod: ${method}`);
@@ -21,7 +22,7 @@ class Utils {
         const rounding = Utils.getRounding(injectMethod);
         return Math.round(value * rounding) / rounding;
     }
-    static isInClosedInterval(value, interval) {
+    static isInRange(value, interval) {
         if (value === null) {
             return false;
         }

package/src/utils/Utils.ts

@@ -1,18 +1,20 @@
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
-import { InjectionMethod } from "../types/enum";
+import { BloodGlucoseUnit, BloodKetonesUnit, UserSettings } from "@hedia/types";
 import { IInterval } from "../types/types";
 import { MGDL_PER_MMOLL_BGL, MGDL_PER_MMOLL_BKL } from "./Constants";
 
+const InjectionMethod = UserSettings.Enums.InjectionMethod;
+const { PenHalf, PenWhole, Pump } = InjectionMethod;
+
 export class Utils {
-	public static getRounding(method: InjectionMethod): number {
+	public static getRounding(method: UserSettings.Enums.InjectionMethod): number {
 		switch (method) {
-			case InjectionMethod.PenWhole:
+			case PenWhole:
 				return 1;
 
-			case InjectionMethod.PenHalf:
+			case PenHalf:
 				return 2;
 
-			case InjectionMethod.Pump:
+			case Pump:
 				return 10;
 
 			default:
@@ -20,12 +22,12 @@ export class Utils {
 		}
 	}
 
-	public static roundValue(value: number, injectMethod: InjectionMethod): number {
+	public static roundValue(value: number, injectMethod: UserSettings.Enums.InjectionMethod): number {
 		const rounding: number = Utils.getRounding(injectMethod);
 		return Math.round(value * rounding) / rounding;
 	}
 
-	public static isInClosedInterval(value: number, interval: IInterval): boolean {
+	public static isInRange(value: number | null, interval: IInterval): boolean {
 		if (value === null) {
 			return false;
 		}

package/src/utils/Validations.d.ts

@@ -1,21 +1,22 @@
-import { ActivityIntensity, IActivityParams, IActivitySettings, IRecentBolus } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
-import { BloodGlucoseUnit, BloodKetonesUnit } from "@hedia/types";
+import { Activity, BloodGlucoseUnit, BloodKetonesUnit, Languages, UserSettings } from "@hedia/types";
 import { IRecommendationProps } from "../RecommendationScreen";
-import { ActivityEnum, InjectionMethod, Language } from "../types/enum";
+import { ActivitySettings, IActivityParams, IRecentBolus, logbookEntry } from "../types/types";
 export declare function validateParams(props: IRecommendationProps): void;
-export declare function checkLanguage(language: Language): void;
-export declare function checkInjectionMethod(injectionMethod: InjectionMethod): void;
+export declare function checkLanguage(language: Languages): void;
+export declare function checkLatestLogbook6Hours(logbook: logbookEntry | null): void;
+export declare function checkInjectionMethod(injectionMethod: UserSettings.Enums.InjectionMethod): void;
 export declare function checkBGLUnit(unit: BloodGlucoseUnit): void;
 export declare function checkBKLUnit(unit: BloodKetonesUnit): void;
 export declare function checkUserReminder(userReminder: number): void;
-export declare function checkActivity(activity: IActivityParams): void;
+export declare function checkActivity(activity: IActivityParams | null): void;
+export declare function checkRecentBolus(recentBoluses: Array<IRecentBolus>): void;
 export declare function checkRecentBolusesInsulinDose(recentBoluses: Array<IRecentBolus>): void;
 export declare function checkRecentBolusesSecondsPassed(recentBoluses: Array<IRecentBolus>): void;
 export declare function checkActivityDuration(activityDuration: number): void;
-export declare function checkActivityIntensity(activityIntensity: ActivityIntensity): void;
-export declare function checkActivityType(activityType: ActivityEnum): void;
+export declare function checkActivityIntensity(activityIntensity: Activity.Enums.ActivityIntensity): void;
+export declare function checkActivityType(activityType: Activity.Enums.ActivityEnum | null): void;
 export declare function checkActivityDate(activity: IActivityParams): void;
-export declare function checkActivitySettings(activitySettings: IActivitySettings): void;
+export declare function checkActivitySettings(activitySettings: ActivitySettings): void;
 export declare function checkActivityTargetBGL(activitySettingsTargetBGL: number): void;
 export declare function checkCurrentBGL(currentBGL: number): void;
 export declare function checkTargetBGL(targetBGL: number): void;

package/src/utils/Validations.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLanguage = exports.validateParams = void 0;
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
+exports.checkCarbohydrates = exports.checkInsulinToCarbRatio = exports.checkInsulinSensitivity = exports.checkBloodKetoneLevel = exports.checkTargetBGL = exports.checkCurrentBGL = exports.checkActivityTargetBGL = exports.checkActivitySettings = exports.checkActivityDate = exports.checkActivityType = exports.checkActivityIntensity = exports.checkActivityDuration = exports.checkRecentBolusesSecondsPassed = exports.checkRecentBolusesInsulinDose = exports.checkRecentBolus = exports.checkActivity = exports.checkUserReminder = exports.checkBKLUnit = exports.checkBGLUnit = exports.checkInjectionMethod = exports.checkLatestLogbook6Hours = exports.checkLanguage = exports.validateParams = void 0;
 const types_1 = require("@hedia/types");
 const moment_1 = __importDefault(require("moment"));
-const enum_1 = require("../types/enum");
 const Constants_1 = require("./Constants");
 const RecommendationError_1 = require("./RecommendationError");
 const Utils_1 = require("./Utils");
+const { hard } = types_1.Activity.Enums.ActivityIntensity;
+const { fromFortysix } = types_1.Activity.Enums.ActivityReductionIntervals;
 function validateParams(props) {
     checkCalculatorParams(props.calculatorParams);
     checkBGLUnit(props.bloodGlucoseUnit);
@@ -19,50 +19,52 @@ function validateParams(props) {
     checkInjectionMethod(props.injectionMethod);
     checkUserReminder(props.userReminder);
     checkLanguage(props.language);
+    checkLatestLogbook6Hours(props.latestLogbookFrom6Hours);
     if (props?.calculatorParams?.activity && props?.activityDisplayProps) {
         checkActivityType(props.activityDisplayProps.activityType);
     }
 }
 exports.validateParams = validateParams;
 function checkLanguage(language) {
-    if (!Object.values(enum_1.Language).includes(language)) {
+    if (!Object.values(types_1.Languages).includes(language)) {
         throw RecommendationError_1.LanguageError();
     }
 }
 exports.checkLanguage = checkLanguage;
+function checkLatestLogbook6Hours(logbook) {
+    if (logbook === undefined) {
+        throw RecommendationError_1.LatestLogbook6HoursBGLError();
+    }
+    if (logbook !== null) {
+        if (!Utils_1.Utils.isInRange(logbook.blood_glucose_millimolar, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+            throw RecommendationError_1.LatestLogbook6HoursBGLError();
+        }
+    }
+}
+exports.checkLatestLogbook6Hours = checkLatestLogbook6Hours;
 function checkInjectionMethod(injectionMethod) {
-    switch (injectionMethod) {
-        case enum_1.InjectionMethod.PenHalf:
-        case enum_1.InjectionMethod.PenWhole:
-        case enum_1.InjectionMethod.Pump:
-            break;
-        default:
-            throw RecommendationError_1.InjectionMethodError();
+    const check = Object.values(types_1.UserSettings.Enums.InjectionMethod).some((method) => method === injectionMethod);
+    if (!check) {
+        throw RecommendationError_1.InjectionMethodError();
     }
 }
 exports.checkInjectionMethod = checkInjectionMethod;
 function checkBGLUnit(unit) {
-    switch (unit) {
-        case types_1.BloodGlucoseUnit.MG_DL:
-        case types_1.BloodGlucoseUnit.MMOL_L:
-            break;
-        default:
-            throw RecommendationError_1.BloodGlucoseUnitError();
+    const check = Object.values(types_1.BloodGlucoseUnit).some((enumUnit) => enumUnit === unit);
+    if (!check) {
+        throw RecommendationError_1.BloodGlucoseUnitError();
     }
 }
 exports.checkBGLUnit = checkBGLUnit;
 function checkBKLUnit(unit) {
-    switch (unit) {
-        case types_1.BloodKetonesUnit.MG_DL:
-        case types_1.BloodKetonesUnit.MMOL_L:
-            break;
-        default:
-            throw RecommendationError_1.BloodKetoneUnitError();
+    const check = Object.values(types_1.BloodKetonesUnit).some((enumUnit) => enumUnit === unit);
+    if (!check) {
+        throw RecommendationError_1.BloodKetoneUnitError();
     }
 }
 exports.checkBKLUnit = checkBKLUnit;
 function checkUserReminder(userReminder) {
-    if (!Utils_1.Utils.isInClosedInterval(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(userReminder, Constants_1.REMINDER_HOURS_LIMITS)) {
         throw RecommendationError_1.UserReminderError();
     }
 }
@@ -74,6 +76,7 @@ function checkCalculatorParams(calculatorParams) {
     checkTargetBGL(calculatorParams.targetBGL);
     checkInsulinToCarbRatio(calculatorParams.carbohydrateRatio);
     checkInsulinSensitivity(calculatorParams.insulinSensitivity);
+    checkRecentBolus(calculatorParams.recentBoluses);
     checkRecentBolusesInsulinDose(calculatorParams.recentBoluses);
     checkRecentBolusesSecondsPassed(calculatorParams.recentBoluses);
 }
@@ -87,53 +90,45 @@ function checkActivity(activity) {
     }
 }
 exports.checkActivity = checkActivity;
-function checkRecentBolusesInsulinDose(recentBoluses) {
-    if (recentBoluses !== null) {
-        recentBoluses.forEach((bolus) => {
-            if (!Utils_1.Utils.isInClosedInterval(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
-                throw RecommendationError_1.BolusInsulinDoseError();
-            }
-        });
+function checkRecentBolus(recentBoluses) {
+    if (recentBoluses === null || recentBoluses === undefined) {
+        throw RecommendationError_1.RecentBolusError();
     }
 }
+exports.checkRecentBolus = checkRecentBolus;
+function checkRecentBolusesInsulinDose(recentBoluses) {
+    recentBoluses.forEach((bolus) => {
+        if (!Utils_1.Utils.isInRange(bolus.insulinDose, Constants_1.INSULIN_DOSE_LIMITS)) {
+            throw RecommendationError_1.BolusInsulinDoseError();
+        }
+    });
+}
 exports.checkRecentBolusesInsulinDose = checkRecentBolusesInsulinDose;
 function checkRecentBolusesSecondsPassed(recentBoluses) {
-    if (recentBoluses !== null) {
-        recentBoluses.forEach((bolus) => {
-            if (!Utils_1.Utils.isInClosedInterval(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
-                throw RecommendationError_1.BolusInsulinSecondsPassedError();
-            }
-        });
-    }
+    recentBoluses.forEach((bolus) => {
+        if (!Utils_1.Utils.isInRange(bolus.secondsPassed, Constants_1.BOLUS_SECONDS_PASSED_LIMITS)) {
+            throw RecommendationError_1.BolusInsulinSecondsPassedError();
+        }
+    });
 }
 exports.checkRecentBolusesSecondsPassed = checkRecentBolusesSecondsPassed;
 function checkActivityDuration(activityDuration) {
-    if (!Utils_1.Utils.isInClosedInterval(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activityDuration, Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS)) {
         throw RecommendationError_1.ActivityDurationError();
     }
 }
 exports.checkActivityDuration = checkActivityDuration;
 function checkActivityIntensity(activityIntensity) {
-    switch (activityIntensity) {
-        case RecommendationCalculator_1.ActivityIntensity.Hard:
-        case RecommendationCalculator_1.ActivityIntensity.Moderate:
-        case RecommendationCalculator_1.ActivityIntensity.Light:
-            break;
-        default:
-            throw RecommendationError_1.ActivityIntensityError();
+    const check = Object.values(types_1.Activity.Enums.ActivityIntensity).some((method) => method === activityIntensity);
+    if (!check) {
+        throw RecommendationError_1.ActivityIntensityError();
     }
 }
 exports.checkActivityIntensity = checkActivityIntensity;
 function checkActivityType(activityType) {
-    switch (activityType) {
-        case enum_1.ActivityEnum.Cycling:
-        case enum_1.ActivityEnum.Other:
-        case enum_1.ActivityEnum.Run:
-        case enum_1.ActivityEnum.Swim:
-        case enum_1.ActivityEnum.Walk:
-            break;
-        default:
-            throw RecommendationError_1.ActivityTypeError();
+    const check = Object.values(types_1.Activity.Enums.ActivityEnum).some((method) => method === activityType);
+    if (!check) {
+        throw RecommendationError_1.ActivityTypeError();
     }
 }
 exports.checkActivityType = checkActivityType;
@@ -148,10 +143,11 @@ function checkActivityDate(activity) {
 exports.checkActivityDate = checkActivityDate;
 function checkActivitySettings(activitySettings) {
     for (const intensity of Object.keys(activitySettings)) {
-        for (const interval of Object.keys(activitySettings[intensity])) {
+        const reductionIntervals = activitySettings[intensity];
+        for (const interval of Object.keys(reductionIntervals)) {
             const value = activitySettings[intensity][interval];
-            const isInInterval = Utils_1.Utils.isInClosedInterval(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
-            if (intensity === RecommendationCalculator_1.ActivityIntensity.Hard.toLowerCase() && interval === enum_1.ActivityInterval.fromFortysix) {
+            const isInInterval = Utils_1.Utils.isInRange(value, Constants_1.ACTIVITY_SETTINGS_INTERVAL_LIMITS);
+            if (intensity === hard && interval === fromFortysix) {
                 if (!isInInterval && value !== null) {
                     throw RecommendationError_1.ActivitySettingsError();
                 }
@@ -164,47 +160,47 @@ function checkActivitySettings(activitySettings) {
 }
 exports.checkActivitySettings = checkActivitySettings;
 function checkActivityTargetBGL(activitySettingsTargetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(activitySettingsTargetBGL, Constants_1.ACTIVITY_TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.ActivityTargetBGLError();
     }
 }
 exports.checkActivityTargetBGL = checkActivityTargetBGL;
 function checkCurrentBGL(currentBGL) {
     if (currentBGL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBGL, Constants_1.CURRENT_BGL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBGLError();
         }
     }
 }
 exports.checkCurrentBGL = checkCurrentBGL;
 function checkTargetBGL(targetBGL) {
-    if (!Utils_1.Utils.isInClosedInterval(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(targetBGL, Constants_1.TARGET_BGL_MMOL_LIMITS)) {
         throw RecommendationError_1.TargetBGLError();
     }
 }
 exports.checkTargetBGL = checkTargetBGL;
 function checkBloodKetoneLevel(currentBKL) {
     if (currentBKL !== null) {
-        if (!Utils_1.Utils.isInClosedInterval(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
+        if (!Utils_1.Utils.isInRange(currentBKL, Constants_1.CURRENT_BKL_MMOL_LIMITS)) {
             throw RecommendationError_1.CurrentBKLError();
         }
     }
 }
 exports.checkBloodKetoneLevel = checkBloodKetoneLevel;
 function checkInsulinSensitivity(insulinSensitivity) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinSensitivity, Constants_1.INSULIN_SENSITIVITY_MMOL_LIMITS)) {
         throw RecommendationError_1.InsulinSensitivityError();
     }
 }
 exports.checkInsulinSensitivity = checkInsulinSensitivity;
 function checkInsulinToCarbRatio(insulinToCarbRatio) {
-    if (!Utils_1.Utils.isInClosedInterval(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
+    if (!Utils_1.Utils.isInRange(insulinToCarbRatio, Constants_1.INSULIN_TO_CARBS_RATIO_LIMITS)) {
         throw RecommendationError_1.InsulinToCarbsRatioError();
     }
 }
 exports.checkInsulinToCarbRatio = checkInsulinToCarbRatio;
 function checkCarbohydrates(carbohydrates) {
-    if (!Utils_1.Utils.isInClosedInterval(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
+    if (!Utils_1.Utils.isInRange(carbohydrates, Constants_1.CARBOHYDRATES_LIMTS)) {
         throw RecommendationError_1.CarbohydrateLimitError();
     }
 }