@hedia/recommendation-screen 1.8.2 → 2.0.2

package/src/__tests__/RecommendationUtils.test.js

@@ -1,43 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const RecommendationCalculator_1 = require("@hedia/recommendation-calculator/src/RecommendationCalculator");
+const types_1 = require("@hedia/types");
 const enum_1 = require("../types/enum");
 const AttentionMessages_1 = require("../utils/AttentionMessages");
 const RecommendationError_1 = require("../utils/RecommendationError");
 const RecommendationUtils_1 = require("../utils/RecommendationUtils");
+const utils_1 = require("./utils");
+const ActivityIntensity = types_1.Activity.Enums.ActivityIntensity;
+const { moderate } = ActivityIntensity;
 describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, () => {
     const logbookUnder15MMOL = {
-        blood_glucose_millimolar: 10,
-        carbohydrates_entered_grams: 25,
-        carbohydrates_suggested_grams: 25,
-        client_timestamp: `25`,
-        client_version: 25,
-        entry_timestamp: `25`,
-        event_uuid: null,
-        insulin_entered_units: 25,
-        insulin_suggested_units: 25,
-        is_deleted: null,
-        mood: 2,
-        settings_uuid: `25`,
-        uuid: `aaa`,
+        ...utils_1.generateDefaultLogbook(),
+        blood_glucose_millimolar: 14.9,
     };
     const logbookOver15MMOL = {
-        ...logbookUnder15MMOL,
+        ...utils_1.generateDefaultLogbook(),
         blood_glucose_millimolar: 15.1,
     };
-    const inactiveDate = new Date(Date.now() + enum_1.Milliseconds.Minute * 15.1);
+    const logbookWithNullBloodGlucose = {
+        ...utils_1.generateDefaultLogbook(),
+        blood_glucose_millimolar: null,
+    };
+    const inactiveDate = new Date(Date.now() + types_1.Milliseconds.Minute * 15.1);
     const activeDate = new Date();
     const activeActivity = {
         activityDate: activeDate,
         activityDuration: 10,
-        activityIntensity: RecommendationCalculator_1.ActivityIntensity.Moderate,
-        activitySettings: {
-            hard: { fromFortysix: 0.25, fromThirty: 0.99, fromZero: 0.25 },
-            light: { fromFortysix: 0.25, fromThirty: 0.25, fromZero: 0.25 },
-            post: { fromFortysix: 0.25, fromThirty: 0.25, fromZero: 0.25 },
-            moderate: { fromZero: 0.7, fromThirty: 0.9, fromFortysix: 0.7 },
-            target: 8.3,
-        },
+        activityIntensity: moderate,
+        activitySettings: utils_1.generateDefaultActivitySettings(),
     };
     const inactiveActivity = { ...activeActivity, activityDate: inactiveDate };
     it.each `
@@ -62,12 +52,13 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ()
         expect(RecommendationUtils_1.getBGLevel(bloodGlucoseValue, latestLogbookFrom6Hours)).toBe(bgLevel);
     });
     it.each `
-		latestLogbookFrom6Hours | severeHyperglycemia
-		${null}                 | ${false}
-		${logbookOver15MMOL}    | ${true}
-		${logbookUnder15MMOL}   | ${false}
-		${undefined}            | ${false}
-		${{}}                   | ${false}
+		latestLogbookFrom6Hours        | severeHyperglycemia
+		${null}                        | ${false}
+		${logbookOver15MMOL}           | ${true}
+		${logbookUnder15MMOL}          | ${false}
+		${undefined}                   | ${false}
+		${{}}                          | ${false}
+		${logbookWithNullBloodGlucose} | ${false}
 	`(`tests isSevereGlycemia method `, ({ latestLogbookFrom6Hours, severeHyperglycemia }) => {
         expect(RecommendationUtils_1.isSevereHyperglycemia(latestLogbookFrom6Hours)).toBe(severeHyperglycemia);
     });
@@ -90,13 +81,13 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ()
     });
     it.each `
 		bgLevel                            | activity          | attentionMessage
-		${enum_1.BgLevel.BGLevelNotProvided}      | ${activeActivity} | ${undefined}
+		${enum_1.BgLevel.BGLevelNotProvided}      | ${activeActivity} | ${null}
 		${enum_1.BgLevel.SevereHypoglycemia}      | ${activeActivity} | ${AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage.SevereHypoglycemia())}
 		${enum_1.BgLevel.Hypoglycemia}            | ${activeActivity} | ${AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage.Hypoglycemia())}
 		${enum_1.BgLevel.MildHypoglycemia}        | ${activeActivity} | ${AttentionMessages_1.addPostponeActivityMessageUnder5MMOL(AttentionMessages_1.AttentionMessage.MildHypoglycemia())}
 		${enum_1.BgLevel.NormoglycemiaUnder5MMOL} | ${activeActivity} | ${AttentionMessages_1.AttentionMessage.NormoglycemiaActivityUnder5MMOL()}
-		${enum_1.BgLevel.Normoglycemia}           | ${activeActivity} | ${undefined}
-		${enum_1.BgLevel.MildHyperglycemia}       | ${activeActivity} | ${undefined}
+		${enum_1.BgLevel.Normoglycemia}           | ${activeActivity} | ${null}
+		${enum_1.BgLevel.MildHyperglycemia}       | ${activeActivity} | ${null}
 		${enum_1.BgLevel.Hyperglycemia}           | ${activeActivity} | ${AttentionMessages_1.AttentionMessage.HyperglycemiaActivity()}
 		${enum_1.BgLevel.SevereHyperglycemia}     | ${activeActivity} | ${AttentionMessages_1.AttentionMessage.SevereHyperglycemiaActivity()}
 	`(`return the correct attention message with an active activity for $bgLevel`, ({ bgLevel, activity, attentionMessage }) => {
@@ -104,14 +95,14 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ()
     });
     it.each `
 		bgLevel                            | activity            | attentionMessage
-		${enum_1.BgLevel.BGLevelNotProvided}      | ${inactiveActivity} | ${undefined}
+		${enum_1.BgLevel.BGLevelNotProvided}      | ${inactiveActivity} | ${null}
 		${enum_1.BgLevel.SevereHypoglycemia}      | ${inactiveActivity} | ${AttentionMessages_1.AttentionMessage.SevereHypoglycemia()}
 		${enum_1.BgLevel.Hypoglycemia}            | ${inactiveActivity} | ${AttentionMessages_1.AttentionMessage.Hypoglycemia()}
 		${enum_1.BgLevel.MildHypoglycemia}        | ${inactiveActivity} | ${AttentionMessages_1.AttentionMessage.MildHypoglycemia()}
-		${enum_1.BgLevel.NormoglycemiaUnder5MMOL} | ${inactiveActivity} | ${undefined}
-		${enum_1.BgLevel.Normoglycemia}           | ${inactiveActivity} | ${undefined}
-		${enum_1.BgLevel.MildHyperglycemia}       | ${inactiveActivity} | ${undefined}
-		${enum_1.BgLevel.Hyperglycemia}           | ${inactiveActivity} | ${undefined}
+		${enum_1.BgLevel.NormoglycemiaUnder5MMOL} | ${inactiveActivity} | ${null}
+		${enum_1.BgLevel.Normoglycemia}           | ${inactiveActivity} | ${null}
+		${enum_1.BgLevel.MildHyperglycemia}       | ${inactiveActivity} | ${null}
+		${enum_1.BgLevel.Hyperglycemia}           | ${inactiveActivity} | ${null}
 		${enum_1.BgLevel.SevereHyperglycemia}     | ${inactiveActivity} | ${AttentionMessages_1.AttentionMessage.SevereHyperglycemia()}
 	`(`return the correct attention message with an inactive activity for $bgLevel`, ({ bgLevel, activity, attentionMessage }) => {
         expect(RecommendationUtils_1.getAttentionMessage(bgLevel, activity)).toBe(attentionMessage);
@@ -220,7 +211,7 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ()
 		wasLimited | activityReduction | attentionMessage
 		${true}    | ${0.25}           | ${AttentionMessages_1.Messages.RecommendationWasLimitedActivity(0.25)}
 		${true}    | ${0}              | ${AttentionMessages_1.Messages.RecommendationWasLimited()}
-		${false}   | ${0}              | ${undefined}
+		${false}   | ${0}              | ${null}
 	`(`return the correct attention message for $bgLevel`, ({ wasLimited, activityReduction, attentionMessage }) => {
         expect(RecommendationUtils_1.getLimitationMessage(wasLimited, activityReduction)).toBe(attentionMessage);
     });

package/src/__tests__/RecommendationUtils.test.ts

@@ -1,6 +1,6 @@
-import { ActivityIntensity, IActivityParams } from "@hedia/recommendation-calculator/src/RecommendationCalculator";
-import { BgLevel, Milliseconds, RecommendationReminders } from "../types/enum";
-import { logbookEntry } from "../types/types";
+import { Activity, Milliseconds } from "@hedia/types";
+import { BgLevel, RecommendationReminders } from "../types/enum";
+import { IActivityParams, logbookEntry } from "../types/types";
 import { addPostponeActivityMessageUnder5MMOL, AttentionMessage, Messages } from "../utils/AttentionMessages";
 import { CurrentBGLError } from "../utils/RecommendationError";
 import {
@@ -11,41 +11,33 @@ import {
 	isActivityWithin15Minutes,
 	isSevereHyperglycemia,
 } from "../utils/RecommendationUtils";
+import { generateDefaultActivitySettings, generateDefaultLogbook } from "./utils";
+
+const ActivityIntensity = Activity.Enums.ActivityIntensity;
+const { moderate } = ActivityIntensity;
 
 describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, (): void => {
 	const logbookUnder15MMOL: logbookEntry = {
-		blood_glucose_millimolar: 10,
-		carbohydrates_entered_grams: 25,
-		carbohydrates_suggested_grams: 25,
-		client_timestamp: `25`,
-		client_version: 25,
-		entry_timestamp: `25`,
-		event_uuid: null,
-		insulin_entered_units: 25,
-		insulin_suggested_units: 25,
-		is_deleted: null,
-		mood: 2,
-		settings_uuid: `25`,
-		uuid: `aaa`,
+		...generateDefaultLogbook(),
+		blood_glucose_millimolar: 14.9,
 	};
-
 	const logbookOver15MMOL: logbookEntry = {
-		...logbookUnder15MMOL,
+		...generateDefaultLogbook(),
 		blood_glucose_millimolar: 15.1,
 	};
+
+	const logbookWithNullBloodGlucose: logbookEntry = {
+		...generateDefaultLogbook(),
+		blood_glucose_millimolar: null,
+	};
+
 	const inactiveDate = new Date(Date.now() + Milliseconds.Minute * 15.1);
 	const activeDate = new Date();
 	const activeActivity: IActivityParams = {
 		activityDate: activeDate,
 		activityDuration: 10,
-		activityIntensity: ActivityIntensity.Moderate,
-		activitySettings: {
-			hard: { fromFortysix: 0.25, fromThirty: 0.99, fromZero: 0.25 },
-			light: { fromFortysix: 0.25, fromThirty: 0.25, fromZero: 0.25 },
-			post: { fromFortysix: 0.25, fromThirty: 0.25, fromZero: 0.25 },
-			moderate: { fromZero: 0.7, fromThirty: 0.9, fromFortysix: 0.7 },
-			target: 8.3,
-		},
+		activityIntensity: moderate,
+		activitySettings: generateDefaultActivitySettings(),
 	};
 	const inactiveActivity: IActivityParams = { ...activeActivity, activityDate: inactiveDate };
 
@@ -81,15 +73,16 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ():
 
 	interface IIsSevereGlycemia {
 		severeHyperglycemia: boolean;
-		latestLogbookFrom6Hours: logbookEntry;
+		latestLogbookFrom6Hours: logbookEntry | null;
 	}
 	it.each`
-		latestLogbookFrom6Hours | severeHyperglycemia
-		${null}                 | ${false}
-		${logbookOver15MMOL}    | ${true}
-		${logbookUnder15MMOL}   | ${false}
-		${undefined}            | ${false}
-		${{}}                   | ${false}
+		latestLogbookFrom6Hours        | severeHyperglycemia
+		${null}                        | ${false}
+		${logbookOver15MMOL}           | ${true}
+		${logbookUnder15MMOL}          | ${false}
+		${undefined}                   | ${false}
+		${{}}                          | ${false}
+		${logbookWithNullBloodGlucose} | ${false}
 	`(`tests isSevereGlycemia method `, ({ latestLogbookFrom6Hours, severeHyperglycemia }: IIsSevereGlycemia): void => {
 		expect(isSevereHyperglycemia(latestLogbookFrom6Hours)).toBe(severeHyperglycemia);
 	});
@@ -126,19 +119,21 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ():
 	`(
 		`Unsupported bg level throws error`,
 		({ bgLevel, activity, attentionMessage }: IGetAttentionMessageError): void => {
-			expect((): AttentionMessage => getAttentionMessage(bgLevel, activity)).toThrowError(attentionMessage);
+			expect((): AttentionMessage | null => getAttentionMessage(bgLevel, activity)).toThrowError(
+				attentionMessage,
+			);
 		},
 	);
 
 	it.each`
 		bgLevel                            | activity          | attentionMessage
-		${BgLevel.BGLevelNotProvided}      | ${activeActivity} | ${undefined}
+		${BgLevel.BGLevelNotProvided}      | ${activeActivity} | ${null}
 		${BgLevel.SevereHypoglycemia}      | ${activeActivity} | ${addPostponeActivityMessageUnder5MMOL(AttentionMessage.SevereHypoglycemia())}
 		${BgLevel.Hypoglycemia}            | ${activeActivity} | ${addPostponeActivityMessageUnder5MMOL(AttentionMessage.Hypoglycemia())}
 		${BgLevel.MildHypoglycemia}        | ${activeActivity} | ${addPostponeActivityMessageUnder5MMOL(AttentionMessage.MildHypoglycemia())}
 		${BgLevel.NormoglycemiaUnder5MMOL} | ${activeActivity} | ${AttentionMessage.NormoglycemiaActivityUnder5MMOL()}
-		${BgLevel.Normoglycemia}           | ${activeActivity} | ${undefined}
-		${BgLevel.MildHyperglycemia}       | ${activeActivity} | ${undefined}
+		${BgLevel.Normoglycemia}           | ${activeActivity} | ${null}
+		${BgLevel.MildHyperglycemia}       | ${activeActivity} | ${null}
 		${BgLevel.Hyperglycemia}           | ${activeActivity} | ${AttentionMessage.HyperglycemiaActivity()}
 		${BgLevel.SevereHyperglycemia}     | ${activeActivity} | ${AttentionMessage.SevereHyperglycemiaActivity()}
 	`(
@@ -149,14 +144,14 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ():
 	);
 	it.each`
 		bgLevel                            | activity            | attentionMessage
-		${BgLevel.BGLevelNotProvided}      | ${inactiveActivity} | ${undefined}
+		${BgLevel.BGLevelNotProvided}      | ${inactiveActivity} | ${null}
 		${BgLevel.SevereHypoglycemia}      | ${inactiveActivity} | ${AttentionMessage.SevereHypoglycemia()}
 		${BgLevel.Hypoglycemia}            | ${inactiveActivity} | ${AttentionMessage.Hypoglycemia()}
 		${BgLevel.MildHypoglycemia}        | ${inactiveActivity} | ${AttentionMessage.MildHypoglycemia()}
-		${BgLevel.NormoglycemiaUnder5MMOL} | ${inactiveActivity} | ${undefined}
-		${BgLevel.Normoglycemia}           | ${inactiveActivity} | ${undefined}
-		${BgLevel.MildHyperglycemia}       | ${inactiveActivity} | ${undefined}
-		${BgLevel.Hyperglycemia}           | ${inactiveActivity} | ${undefined}
+		${BgLevel.NormoglycemiaUnder5MMOL} | ${inactiveActivity} | ${null}
+		${BgLevel.Normoglycemia}           | ${inactiveActivity} | ${null}
+		${BgLevel.MildHyperglycemia}       | ${inactiveActivity} | ${null}
+		${BgLevel.Hyperglycemia}           | ${inactiveActivity} | ${null}
 		${BgLevel.SevereHyperglycemia}     | ${inactiveActivity} | ${AttentionMessage.SevereHyperglycemia()}
 	`(
 		`return the correct attention message with an inactive activity for $bgLevel`,
@@ -327,7 +322,7 @@ describe(`Actions based on the blood glucose level:: InsulinSettingsUtils `, ():
 		wasLimited | activityReduction | attentionMessage
 		${true}    | ${0.25}           | ${Messages.RecommendationWasLimitedActivity(0.25)}
 		${true}    | ${0}              | ${Messages.RecommendationWasLimited()}
-		${false}   | ${0}              | ${undefined}
+		${false}   | ${0}              | ${null}
 	`(
 		`return the correct attention message for $bgLevel`,
 		({ wasLimited, activityReduction, attentionMessage }: ILimitationMessage): void => {

package/src/__tests__/Translate.test.jsx

@@ -1,27 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-nocheck
+const types_1 = require("@hedia/types");
 const i18nUtils_1 = require("../locale/i18nUtils");
-const enum_1 = require("../types/enum");
 describe(`Translation Utils`, () => {
     test(`Same instance`, () => {
         expect(i18nUtils_1.i18n).toBe(i18nUtils_1.i18n);
     });
     test.each `
-		locale         | text
-		${enum_1.Language.da} | ${`da`}
-		${enum_1.Language.en} | ${`en`}
-		${enum_1.Language.de} | ${`de`}
-		${enum_1.Language.es} | ${`es`}
-		${enum_1.Language.it} | ${`it`}
-		${enum_1.Language.fr} | ${`fr`}
+		locale          | text
+		${types_1.Languages.da} | ${`Dansk`}
+		${types_1.Languages.en} | ${`English`}
+		${types_1.Languages.de} | ${`Deutsch`}
+		${types_1.Languages.es} | ${`Español`}
+		${types_1.Languages.it} | ${`Italiano`}
+		${types_1.Languages.fr} | ${`Français`}
 	`(`Change to the right language; $locale`, ({ locale, text }) => {
         expect(i18nUtils_1.changeLanguage(locale).language).toBe(text);
     });
     test.each `
-		locale  | text
-		${`nl`} | ${`en`}
-		${`jp`} | ${`en`}
-		${`ro`} | ${`en`}
+		locale          | text
+		${types_1.Languages.nl} | ${types_1.Languages.en}
+		${types_1.Languages.jp} | ${types_1.Languages.en}
+		${types_1.Languages.ro} | ${types_1.Languages.en}
 	`(`Unsupported language defaults to english; $locale`, ({ locale, text }) => {
         expect(i18nUtils_1.changeLanguage(locale).language).toBe(text);
     });

package/src/__tests__/Translate.test.tsx

@@ -1,29 +1,30 @@
+// @ts-nocheck
+import { Languages } from "@hedia/types";
 import { changeLanguage, i18n } from "../locale/i18nUtils";
-import { Language } from "../types/enum";
 
 describe(`Translation Utils`, (): void => {
 	test(`Same instance`, (): void => {
 		expect(i18n).toBe(i18n);
 	});
 	test.each`
-		locale         | text
-		${Language.da} | ${`da`}
-		${Language.en} | ${`en`}
-		${Language.de} | ${`de`}
-		${Language.es} | ${`es`}
-		${Language.it} | ${`it`}
-		${Language.fr} | ${`fr`}
-	`(`Change to the right language; $locale`, ({ locale, text }: { locale: Language; text: string }): void => {
+		locale          | text
+		${Languages.da} | ${`Dansk`}
+		${Languages.en} | ${`English`}
+		${Languages.de} | ${`Deutsch`}
+		${Languages.es} | ${`Español`}
+		${Languages.it} | ${`Italiano`}
+		${Languages.fr} | ${`Français`}
+	`(`Change to the right language; $locale`, ({ locale, text }: { locale: Languages; text: string }): void => {
 		expect(changeLanguage(locale).language).toBe(text);
 	});
 	test.each`
-		locale  | text
-		${`nl`} | ${`en`}
-		${`jp`} | ${`en`}
-		${`ro`} | ${`en`}
+		locale          | text
+		${Languages.nl} | ${Languages.en}
+		${Languages.jp} | ${Languages.en}
+		${Languages.ro} | ${Languages.en}
 	`(
 		`Unsupported language defaults to english; $locale`,
-		({ locale, text }: { locale: Language; text: string }): void => {
+		({ locale, text }: { locale: Languages; text: string }): void => {
 			expect(changeLanguage(locale).language).toBe(text);
 		},
 	);

package/src/__tests__/Utils.test.js

@@ -1,32 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const enum_1 = require("../types/enum");
+const types_1 = require("@hedia/types");
 const Constants_1 = require("../utils/Constants");
 const Utils_1 = require("../utils/Utils");
+const InjectionMethod = types_1.UserSettings.Enums.InjectionMethod;
+const { PenHalf, PenWhole, Pump } = InjectionMethod;
 describe(`Utils helper functions`, () => {
     test.each `
-		method                      | expected
-		${enum_1.InjectionMethod.PenWhole} | ${1}
-		${enum_1.InjectionMethod.PenHalf}  | ${2}
-		${enum_1.InjectionMethod.Pump}     | ${10}
+		method      | expected
+		${PenWhole} | ${1}
+		${PenHalf}  | ${2}
+		${Pump}     | ${10}
 	`(`Get correct rounding for $method`, ({ expected, method }) => {
         expect(Utils_1.Utils.getRounding(method)).toBe(expected);
     });
     test.each `
-		value    | method                      | expected
-		${1.99}  | ${enum_1.InjectionMethod.PenWhole} | ${2}
-		${1.99}  | ${enum_1.InjectionMethod.PenHalf}  | ${2}
-		${1.99}  | ${enum_1.InjectionMethod.Pump}     | ${2}
-		${1.74}  | ${enum_1.InjectionMethod.PenWhole} | ${2}
-		${1.74}  | ${enum_1.InjectionMethod.PenHalf}  | ${1.5}
-		${1.74}  | ${enum_1.InjectionMethod.Pump}     | ${1.7}
-		${1.75}  | ${enum_1.InjectionMethod.PenWhole} | ${2}
-		${1.75}  | ${enum_1.InjectionMethod.PenHalf}  | ${2}
-		${1.75}  | ${enum_1.InjectionMethod.Pump}     | ${1.8}
-		${-1.45} | ${enum_1.InjectionMethod.PenWhole} | ${-1}
-		${-1.45} | ${enum_1.InjectionMethod.PenHalf}  | ${-1.5}
-		${-1.45} | ${enum_1.InjectionMethod.Pump}     | ${-1.4}
-	`(`Rounding $value using $method to $expected`, ({ expected, method, value }) => {
+		value    | method      | expected
+		${1.99}  | ${PenWhole} | ${2}
+		${1.99}  | ${PenHalf}  | ${2}
+		${1.99}  | ${Pump}     | ${2}
+		${1.74}  | ${PenWhole} | ${2}
+		${1.74}  | ${PenHalf}  | ${1.5}
+		${1.74}  | ${Pump}     | ${1.7}
+		${1.75}  | ${PenWhole} | ${2}
+		${1.75}  | ${PenHalf}  | ${2}
+		${1.75}  | ${Pump}     | ${1.8}
+		${-1.45} | ${PenWhole} | ${-1}
+		${-1.45} | ${PenHalf}  | ${-1.5}
+		${-1.45} | ${Pump}     | ${-1.4}
+	`(`Rounding $value using $method to $expected`, ({ expected, method, value, }) => {
         expect(Utils_1.Utils.roundValue(value, method)).toBe(expected);
     });
     const customInterval = { min: 0, max: 75.5 };
@@ -43,7 +45,7 @@ describe(`Utils helper functions`, () => {
 		${-1}                                   | ${Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS} | ${false}
 		${3601}                                 | ${Constants_1.ACTIVITY_DURATION_MINUTES_LIMITS} | ${false}
 	`(`Check if a number is in the interval`, ({ value, interval, expected }) => {
-        expect(Utils_1.Utils.isInClosedInterval(value, interval)).toBe(expected);
+        expect(Utils_1.Utils.isInRange(value, interval)).toBe(expected);
     });
     test.each `
 		value     | expected

package/src/__tests__/Utils.test.ts

@@ -1,38 +1,49 @@
-import { InjectionMethod } from "../types/enum";
+import { UserSettings } from "@hedia/types";
 import { IInterval } from "../types/types";
 import { ACTIVITY_DURATION_MINUTES_LIMITS } from "../utils/Constants";
 import { Utils } from "../utils/Utils";
 
+const InjectionMethod = UserSettings.Enums.InjectionMethod;
+const { PenHalf, PenWhole, Pump } = InjectionMethod;
+
 describe(`Utils helper functions`, (): void => {
 	test.each`
-		method                      | expected
-		${InjectionMethod.PenWhole} | ${1}
-		${InjectionMethod.PenHalf}  | ${2}
-		${InjectionMethod.Pump}     | ${10}
+		method      | expected
+		${PenWhole} | ${1}
+		${PenHalf}  | ${2}
+		${Pump}     | ${10}
 	`(
 		`Get correct rounding for $method`,
-		({ expected, method }: { method: InjectionMethod; expected: number }): void => {
+		({ expected, method }: { method: UserSettings.Enums.InjectionMethod; expected: number }): void => {
 			expect(Utils.getRounding(method)).toBe(expected);
 		},
 	);
 
 	test.each`
-		value    | method                      | expected
-		${1.99}  | ${InjectionMethod.PenWhole} | ${2}
-		${1.99}  | ${InjectionMethod.PenHalf}  | ${2}
-		${1.99}  | ${InjectionMethod.Pump}     | ${2}
-		${1.74}  | ${InjectionMethod.PenWhole} | ${2}
-		${1.74}  | ${InjectionMethod.PenHalf}  | ${1.5}
-		${1.74}  | ${InjectionMethod.Pump}     | ${1.7}
-		${1.75}  | ${InjectionMethod.PenWhole} | ${2}
-		${1.75}  | ${InjectionMethod.PenHalf}  | ${2}
-		${1.75}  | ${InjectionMethod.Pump}     | ${1.8}
-		${-1.45} | ${InjectionMethod.PenWhole} | ${-1}
-		${-1.45} | ${InjectionMethod.PenHalf}  | ${-1.5}
-		${-1.45} | ${InjectionMethod.Pump}     | ${-1.4}
+		value    | method      | expected
+		${1.99}  | ${PenWhole} | ${2}
+		${1.99}  | ${PenHalf}  | ${2}
+		${1.99}  | ${Pump}     | ${2}
+		${1.74}  | ${PenWhole} | ${2}
+		${1.74}  | ${PenHalf}  | ${1.5}
+		${1.74}  | ${Pump}     | ${1.7}
+		${1.75}  | ${PenWhole} | ${2}
+		${1.75}  | ${PenHalf}  | ${2}
+		${1.75}  | ${Pump}     | ${1.8}
+		${-1.45} | ${PenWhole} | ${-1}
+		${-1.45} | ${PenHalf}  | ${-1.5}
+		${-1.45} | ${Pump}     | ${-1.4}
 	`(
 		`Rounding $value using $method to $expected`,
-		({ expected, method, value }: { value: number; method: InjectionMethod; expected: number }): void => {
+		({
+			expected,
+			method,
+			value,
+		}: {
+			value: number;
+			method: UserSettings.Enums.InjectionMethod;
+			expected: number;
+		}): void => {
 			expect(Utils.roundValue(value, method)).toBe(expected);
 		},
 	);
@@ -52,7 +63,7 @@ describe(`Utils helper functions`, (): void => {
 	`(
 		`Check if a number is in the interval`,
 		({ value, interval, expected }: { value: number; interval: IInterval; expected: number }): void => {
-			expect(Utils.isInClosedInterval(value, interval)).toBe(expected);
+			expect(Utils.isInRange(value, interval)).toBe(expected);
 		},
 	);