hevy-shared 1.0.962 → 1.0.963

package/built/tests/routineUtils.test.js

@@ -0,0 +1,745 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const routineUtils_1 = require("../routineUtils");
+const testUtils_1 = require("./testUtils");
+describe('majorRoutineUpdate', () => {
+    it('takes a routine and a workout, and generates a list of routine exercise updates from the workout', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Warmup',
+            exerciseType: 'duration',
+        })
+            .addDurationSet('normal', 10000))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            exerciseType: 'reps_only',
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('normal', 10)
+            .addRepsSet('normal', 5))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Pull ups',
+            exerciseType: 'reps_only',
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('normal', null) // no value in routine
+            .addRepsSet('normal', null) // no value in routine
+            .addRepsSet('normal', null))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Running',
+            exerciseType: 'distance_duration',
+        })
+            .addDistanceDurationSet('normal', 3000, 1000))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Farmer Walk',
+            exerciseType: 'short_distance_weight',
+        })
+            .addShortDistanceWeightSet('normal', 100, 100)
+            .addShortDistanceWeightSet('normal', 200, 200))
+            .build();
+        /**
+         * This workout should generate the following routine updates:
+         * - Add a new exercise: Deadlift, after the first exercise
+         * - Switch the order of the Pull ups and Push ups exercises
+         * - Add a new set to the Push ups exercise, of type 'dropset'
+         * - Delete 1 set from the Pull ups exercise
+         * - Change the 3rd set type of Push Ups from 'normal' to 'failure'
+         * - Update various set values in multiple exercises
+         */
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Warmup',
+        })
+            .addDurationSet('normal', 15000))
+            .addExercise((it) => it
+            .setProps({
+            id: 'Deadlift',
+        })
+            .addWeightRepsSet('warmup', 10, 5)
+            .addWeightRepsSet('normal', 10, 10)
+            .addWeightRepsSet('normal', 10, 10, undefined, false))
+            .addExercise((it) => it
+            .setProps({
+            id: 'Pull ups',
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('normal', 15)
+            .addRepsSet('normal', 0, undefined, false))
+            .addExercise((it) => it
+            .setProps({
+            id: 'Push ups',
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('failure', 8) // set type and value updated
+            .addRepsSet('dropset', 10, undefined, false) // set exists in routine but isn't completed in workout
+            .addRepsSet('dropset', 5, undefined, false))
+            .addExercise((it) => it
+            .setProps({
+            id: 'Running',
+        })
+            .addDistanceDurationSet('normal', 3000, 1000)
+            .addDistanceDurationSet('normal', 4000, 4000))
+            .addExercise((it) => it
+            .setProps({
+            id: 'Farmer Walk',
+        })
+            .addShortDistanceWeightSet('normal', 300, 300)
+            .addShortDistanceWeightSet('normal', 400, 400))
+            .build();
+        const routineUpdate = (0, routineUtils_1.majorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Warmup',
+        })
+            .addDurationSet('normal', 15000))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Deadlift',
+            inputModifier: undefined,
+        })
+            .addWeightRepsSet('warmup', 10, 5)
+            .addWeightRepsSet('normal', 10, 10)
+            .addWeightRepsSet('normal', 10, 10))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Pull ups',
+            inputModifier: undefined,
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('normal', 15)
+            .addRepsSet('normal', null))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            inputModifier: undefined,
+        })
+            .addRepsSet('warmup', 5)
+            .addRepsSet('normal', 10)
+            .addRepsSet('failure', 8)
+            .addRepsSet('dropset', 10) // the set wasn't completed in the workout, but we should still update it
+            .addRepsSet('dropset', 5))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Running',
+            inputModifier: undefined,
+        })
+            .addDistanceDurationSet('normal', 3000, 1000)
+            .addDistanceDurationSet('normal', 4000, 4000))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Farmer Walk',
+            inputModifier: undefined,
+        })
+            .addShortDistanceWeightSet('normal', 300, 300)
+            .addShortDistanceWeightSet('normal', 400, 400))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('adds the reps value to the start of the rep range if the rep range is empty (null - null)', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            exerciseType: 'reps_only',
+            inputModifier: 'rep-range',
+        })
+            .addRepRangeSet('normal', { start: null, end: 5 })
+            .addRepRangeSet('normal', { start: null, end: null }))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Push ups',
+        })
+            .addRepsSet('normal', 1)
+            .addRepsSet('normal', 2)
+            .addRepsSet('normal', 3))
+            .build();
+        const routineUpdate = (0, routineUtils_1.majorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            inputModifier: 'rep-range',
+        })
+            .addRepRangeSet('normal', { start: null, end: 5 })
+            .addRepRangeSet('normal', { start: 2, end: null })
+            .addRepRangeSet('normal', { start: 3, end: null }))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Preserves rep ranges correctly', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            exerciseType: 'weight_reps',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 71, { start: 8, end: 12 })
+            .addWeightRepRangeSet('normal', 72, { start: null, end: null })
+            .addWeightRepRangeSet('normal', 73, { start: 8, end: null })
+            .addWeightRepRangeSet('normal', 74, { start: null, end: 12 }))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Bench Press',
+        })
+            .addWeightRepsSet('normal', 61, 10)
+            .addWeightRepsSet('normal', 62, 10)
+            .addWeightRepsSet('normal', 63, 10)
+            .addWeightRepsSet('normal', 64, 10)
+            .addWeightRepsSet('normal', 65, 10))
+            .build();
+        const routineUpdate = (0, routineUtils_1.majorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 61, { start: 8, end: 12 })
+            .addWeightRepRangeSet('normal', 62, { start: 10, end: null })
+            .addWeightRepRangeSet('normal', 63, { start: 8, end: null })
+            .addWeightRepRangeSet('normal', 64, { start: null, end: 12 })
+            .addWeightRepRangeSet('normal', 65, { start: 10, end: null }))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles target rpe correctly', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            exerciseType: 'reps_only',
+        })
+            .addRepsSet('warmup', 6) // 6 reps, NO RPE
+            .addRepsSet('normal', 7, 9) // 7 reps, 9 RPE
+            .addRepsSet('normal', 8, 10))
+            .build();
+        // Add a new set to the workout, and logged the RPEs
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Push ups',
+        })
+            .addRepsSet('warmup', 1, 7) // 1 rep, 7 RPE
+            .addRepsSet('normal', 2) // 2 reps, NO RPE
+            .addRepsSet('dropset', 3, 8) // 3 reps, 8 RPE
+            .addRepsSet('failure', 4, 8.5))
+            .build();
+        const routineUpdate = (0, routineUtils_1.majorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+        })
+            .addRepsSet('warmup', 1) // Logged RPE is not included in the routine update
+            .addRepsSet('normal', 2, 9)
+            .addRepsSet('dropset', 3, 10)
+            .addRepsSet('failure', 4))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles rpe, rep range and weight correctly at the same time', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            exerciseType: 'weight_reps',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 }, 7) // 100kg, 3-5 reps, @7 RPE
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 })
+            .addWeightRepRangeSet('normal', 100, { start: null, end: 5 }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: null, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: null, end: null })
+            .addWeightRepRangeSet('normal', 100, { start: 5, end: 6 }, 7))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Bench Press',
+        })
+            .addWeightRepsSet('normal', 100, 2, 10)
+            .addWeightRepsSet('normal', 97, 3, 9)
+            .addWeightRepsSet('normal', 95, 2, 8)
+            .addWeightRepsSet('normal', 100, 4, 7)
+            .addWeightRepsSet('normal', 100, 5, 6)
+            .addWeightRepsSet('normal', 100, 6, 7.5))
+            .build();
+        const routineUpdate = (0, routineUtils_1.majorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 }, 7) // 100kg, 3-5 reps, @7 RPE
+            .addWeightRepRangeSet('normal', 97, { start: 3, end: 5 })
+            .addWeightRepRangeSet('normal', 95, { start: null, end: 5 }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 5, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 6, end: null }))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+});
+describe('minorRoutineUpdate', () => {
+    it('Calculates routine exercise set values to update after a workout', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            exerciseType: 'weight_reps',
+            supersetId: null,
+            restSeconds: 5,
+        })
+            .addWeightRepsSet('warmup', 10, 10)
+            .addWeightRepsSet('normal', 15, 10)
+            .addWeightRepsSet('dropset', 20, 10)
+            .addWeightRepsSet('failure', 25, 10))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            exerciseType: 'weight_reps',
+            supersetId: 0,
+            restSeconds: 10,
+        })
+            .addWeightRepsSet('warmup', 20, 10)
+            .addWeightRepsSet('normal', 25, 10)
+            .addWeightRepsSet('normal', 30, 10)
+            .addWeightRepsSet('normal', 35, 10))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'c',
+            exerciseType: 'weight_reps',
+            supersetId: 0,
+            restSeconds: 15,
+        })
+            .addWeightRepsSet('warmup', 30, 10)
+            .addWeightRepsSet('normal', 35, 10)
+            .addWeightRepsSet('normal', 40, 10)
+            .addWeightRepsSet('normal', 45, 10))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'a',
+            supersetId: 0,
+            autoRestTimerSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('dropset', 5, 6)
+            .addWeightRepsSet('failure', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            id: 'b',
+            supersetId: 0,
+            autoRestTimerSeconds: undefined,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('failure', 11, 12)
+            .addWeightRepsSet('dropset', 13, 14)
+            .addWeightRepsSet('normal', 15, 16))
+            .addExercise((it) => it
+            .setProps({
+            id: 'c',
+            supersetId: undefined,
+            autoRestTimerSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .addExercise((it) => it
+            .setProps({
+            id: 'd',
+            supersetId: undefined,
+            autoRestTimerSeconds: undefined,
+        })
+            .addWeightRepsSet('warmup', 25, 26)
+            .addWeightRepsSet('normal', 27, 28)
+            .addWeightRepsSet('normal', 29, 30)
+            .addWeightRepsSet('normal', 31, 32))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            supersetId: 0,
+            restSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('dropset', 5, 6)
+            .addWeightRepsSet('failure', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            supersetId: 0,
+            restSeconds: undefined,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('normal', 11, 12)
+            .addWeightRepsSet('normal', 15, 16)
+            .addWeightRepsSet('normal', 35, 10))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'c',
+            supersetId: undefined,
+            restSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles reordering exercises in the workout', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'c',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'b',
+            supersetId: 0,
+            autoRestTimerSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('normal', 11, 12)
+            .addWeightRepsSet('normal', 13, 14)
+            .addWeightRepsSet('normal', 15, 16))
+            .addExercise((it) => it
+            .setProps({
+            id: 'c',
+            supersetId: undefined,
+            autoRestTimerSeconds: 3,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .addExercise((it) => it
+            .setProps({
+            id: 'a',
+            supersetId: 0,
+            autoRestTimerSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('normal', 5, 6)
+            .addWeightRepsSet('normal', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            id: 'd',
+            supersetId: undefined,
+            autoRestTimerSeconds: undefined,
+        })
+            .addWeightRepsSet('warmup', 25, 26)
+            .addWeightRepsSet('normal', 27, 28)
+            .addWeightRepsSet('normal', 29, 29)
+            .addWeightRepsSet('normal', 31, 32))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            supersetId: 0,
+            restSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('normal', 5, 6)
+            .addWeightRepsSet('normal', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            supersetId: 0,
+            restSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('normal', 11, 12)
+            .addWeightRepsSet('normal', 13, 14)
+            .addWeightRepsSet('normal', 15, 16))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'c',
+            supersetId: undefined,
+            restSeconds: 3,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles multiple occurrences of the same exercise', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            exerciseType: 'weight_reps',
+        })
+            .addWeightRepsSet('warmup')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal')
+            .addWeightRepsSet('normal'))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'b',
+            supersetId: 0,
+            autoRestTimerSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('normal', 11, 12)
+            .addWeightRepsSet('normal', 13, 14)
+            .addWeightRepsSet('normal', 15, 16))
+            .addExercise((it) => it
+            .setProps({
+            id: 'a',
+            supersetId: undefined,
+            autoRestTimerSeconds: 3,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('normal', 5, 6)
+            .addWeightRepsSet('normal', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            id: 'a',
+            supersetId: 0,
+            autoRestTimerSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .addExercise((it) => it
+            .setProps({
+            id: 'd',
+            supersetId: undefined,
+            autoRestTimerSeconds: undefined,
+        })
+            .addWeightRepsSet('warmup', 25, 26)
+            .addWeightRepsSet('normal', 27, 28)
+            .addWeightRepsSet('normal', 29, 29)
+            .addWeightRepsSet('normal', 31, 32))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            supersetId: undefined,
+            restSeconds: 3,
+        })
+            .addWeightRepsSet('warmup', 1, 2)
+            .addWeightRepsSet('normal', 3, 4)
+            .addWeightRepsSet('normal', 5, 6)
+            .addWeightRepsSet('normal', 7, 8))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'b',
+            supersetId: 0,
+            restSeconds: 2,
+        })
+            .addWeightRepsSet('warmup', 9, 10)
+            .addWeightRepsSet('normal', 11, 12)
+            .addWeightRepsSet('normal', 13, 14)
+            .addWeightRepsSet('normal', 15, 16))
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'a',
+            supersetId: 0,
+            restSeconds: 1,
+        })
+            .addWeightRepsSet('warmup', 17, 18)
+            .addWeightRepsSet('normal', 19, 20)
+            .addWeightRepsSet('normal', 21, 22)
+            .addWeightRepsSet('normal', 23, 24))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles rep ranges correctly', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            exerciseType: 'reps_only',
+            inputModifier: 'rep-range',
+        })
+            .addRepRangeSet('normal', { start: null, end: 5 })
+            .addRepRangeSet('normal', { start: null, end: null }) // blank to blank rep range
+            .addRepRangeSet('normal', { start: 2, end: 2 })
+            .addRepRangeSet('normal', { start: 3, end: 2 })
+            .addRepRangeSet('normal', { start: null, end: 2 }))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Push ups',
+        })
+            .addRepsSet('normal', 1)
+            .addRepsSet('normal', 2)
+            .addRepsSet('normal', 3))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            inputModifier: 'rep-range',
+        })
+            .addRepRangeSet('normal', { start: null, end: 5 })
+            .addRepRangeSet('normal', { start: 2, end: null }) // add logged reps to the start of the rep range, if rep range is blank to blank
+            .addRepRangeSet('normal', { start: 2, end: 2 })
+            .addRepRangeSet('normal', { start: 3, end: 2 })
+            .addRepRangeSet('normal', { start: null, end: 2 }))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles target rpe correctly', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+            exerciseType: 'reps_only',
+        })
+            .addRepsSet('normal', 6) // 6 reps, NO RPE
+            .addRepsSet('normal', 7, 9) // 7 reps, 9 RPE
+            .addRepsSet('normal', 8, 10))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Push ups',
+        })
+            .addRepsSet('normal', 1, 7) // 1 rep, 7 RPE
+            .addRepsSet('normal', 2) // 2 reps, NO RPE
+            .addRepsSet('normal', 3, 8) // 3 reps, 8 RPE
+            .addRepsSet('normal', 4, 8.5))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        // Logged RPE is not included in the routine update and preserved the target RPE
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Push ups',
+        })
+            .addRepsSet('normal', 1)
+            .addRepsSet('normal', 2, 9)
+            .addRepsSet('normal', 3, 10))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+    it('Handles rpe, rep range and weight correctly at the same time', () => {
+        const routine = new testUtils_1.RoutineBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            exerciseType: 'weight_reps',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 }, 7) // 100kg, 3-5 reps, @7 RPE
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 })
+            .addWeightRepRangeSet('normal', 100, { start: null, end: 5 }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: null, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: null, end: null }))
+            .build();
+        const workout = new testUtils_1.WorkoutBuilder()
+            .addExercise((it) => it
+            .setProps({
+            id: 'Bench Press',
+        })
+            .addWeightRepsSet('normal', 100, 2, 10)
+            .addWeightRepsSet('normal', 97, 3, 9)
+            .addWeightRepsSet('normal', 95, 2, 8)
+            .addWeightRepsSet('normal', 100, 4, 7)
+            .addWeightRepsSet('normal', 100, 5, 6)
+            .addWeightRepsSet('normal', 100, 6, 7.5))
+            .build();
+        const routineUpdate = (0, routineUtils_1.minorRoutineUpdate)(routine, workout);
+        const expectedRoutineUpdate = new testUtils_1.RoutineUpdateBuilder()
+            .addExercise((it) => it
+            .setProps({
+            exerciseTemplateId: 'Bench Press',
+            inputModifier: 'rep-range',
+        })
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: 5 }, 7) // 100kg, 3-5 reps, @7 RPE
+            .addWeightRepRangeSet('normal', 97, { start: 3, end: 5 })
+            .addWeightRepRangeSet('normal', 95, { start: null, end: 5 }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 3, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 5, end: null }, 7)
+            .addWeightRepRangeSet('normal', 100, { start: 6, end: null }))
+            .build();
+        expect(routineUpdate).toEqual(expectedRoutineUpdate);
+    });
+});