hevy-shared 1.0.563 → 1.0.565

package/built/index.d.ts

@@ -465,8 +465,10 @@ export interface UserPreferences {
     live_pr_volume?: LivePRVolumeOption;
     inline_set_timer_enabled?: boolean;
     default_workout_visibility_public?: boolean;
+    /** Only updateable by the backend within a special API */
+    volume_includes_warmup_sets?: boolean;
 }
-export type UpdateUserPreferencesRequest = Omit<UserPreferences, 'username'>;
+export type UpdateUserPreferencesRequest = Omit<UserPreferences, 'username' | 'volume_includes_warmup_sets'>;
 export type FollowingStatus = 'not-following' | 'following' | 'requested';
 export type FollowingStatusMap = {
     [id: string]: Omit<FollowingStatus, 'not-following'>;
@@ -778,6 +780,11 @@ export interface Workout {
      * why we added estimated_volume_kg
      */
     estimated_volume_kg: number;
+    /**
+     * Whether to include warmup sets in various calculations.
+     * https://github.com/hevyapp/hevy-shared/pull/312
+     */
+    include_warmup_sets: boolean;
     is_private: boolean;
     /**
      * If applicable, the user ID of the coach who logged this workout
@@ -1324,6 +1331,18 @@ export interface WarmupCalculatorData {
     dumbbellRoundingSettingLbs: number;
     warmupSets: WarmupSet[];
 }
+export interface RecalculateSetPRProgress {
+    numWorkoutsProcessed: number;
+    numWorkoutsTotal: number;
+}
+export type RecalculateSetPRStatusResponse = {
+    type: 'ready';
+} | {
+    type: 'busy';
+    progress: RecalculateSetPRProgress;
+} | {
+    type: 'error';
+};
 export interface ExerciseTemplateUnit {
     id: number;
     exercise_template_id: string;

package/built/notifications.d.ts

@@ -7,8 +7,8 @@
  */
 import { ClientsCoachData, Program } from '.';
 import { HevyChatUpdateMobilePushData } from './chat';
-export type Notification = WorkoutCompleteNotification | WorkoutMentionNotification | WorkoutCommentNotification | WorkoutCommentReplyNotification | WorkoutCommentMentionNotification | WorkoutLikeNotification | FollowNotification | FollowRequestNotification | AcceptFollowRequestNotification | CoachClientInviteNotification | ContactOnHevyNotification;
-export type NotificationType = 'workout-complete' | 'workout-mention' | 'workout-comment' | 'workout-comment-reply' | 'workout-comment-mention' | 'workout-like' | 'follow' | 'follow-request' | 'accept-follow-request' | 'coach-client-invite' | 'contact-on-hevy';
+export type Notification = WorkoutCompleteNotification | WorkoutMentionNotification | WorkoutCommentNotification | WorkoutCommentReplyNotification | WorkoutCommentMentionNotification | WorkoutLikeNotification | WorkoutCommentLikeNotification | FollowNotification | FollowRequestNotification | AcceptFollowRequestNotification | CoachClientInviteNotification | ContactOnHevyNotification;
+export type NotificationType = 'workout-complete' | 'workout-mention' | 'workout-comment' | 'workout-comment-reply' | 'workout-comment-mention' | 'workout-like' | 'workout-comment-like' | 'follow' | 'follow-request' | 'accept-follow-request' | 'coach-client-invite' | 'contact-on-hevy';
 export interface BaseNotification {
     id: number;
     type: NotificationType;
@@ -74,6 +74,16 @@ export interface WorkoutLikeNotification extends BaseNotification {
 export interface WorkoutLikeMobilePushData extends BaseMobilePushData {
     type: 'workout-like';
 }
+export interface WorkoutCommentLikeNotification extends BaseNotification {
+    type: 'workout-comment-like';
+    workout_id: string;
+    workout_title: string;
+    comment_id: number;
+    comment: string;
+}
+export interface WorkoutCommentLikeMobilePushData extends BaseMobilePushData {
+    type: 'workout-comment-like';
+}
 export interface FollowNotification extends BaseNotification {
     type: 'follow';
 }
@@ -173,4 +183,4 @@ export interface MonthlyReportMobilePushData extends BaseMobilePushData {
     type: 'monthly-report';
     deeplink: string;
 }
-export type MobilePushData = ChatUpdateMobilePushData | SyncCustomExercisesAndCoachCustomizationsMobilePushData | SyncRoutineFoldersMobilePushData | SyncRoutinesMobilePushData | ProStatusChangedPushMobilePushData | HevyProSubscriptionRenewedMobilePushData | CoachProgramChangedMobilePushData | CoachDataChangedMobilePushData | ContactOnHevyMobilePushData | CoachClientInviteMobilePushData | AcceptFollowRequestMobilePushData | FollowRequestMobilePushData | FollowMobilePushData | WorkoutLikeMobilePushData | WorkoutCommentMentionMobilePushData | WorkoutCommentReplyMobilePushData | WorkoutCommentMobilePushData | WorkoutMentionMobilePushData | WorkoutCompleteMobilePushData | CoachProgramFinishesNextWeekMobilePushData | CoachProgramStartsTodayMobilePushData | CoachLoggedYourWorkoutMobilePushData | CoachLoggedYourMeasurementsMobilePushData | MonthlyReportMobilePushData;
+export type MobilePushData = ChatUpdateMobilePushData | SyncCustomExercisesAndCoachCustomizationsMobilePushData | SyncRoutineFoldersMobilePushData | SyncRoutinesMobilePushData | ProStatusChangedPushMobilePushData | HevyProSubscriptionRenewedMobilePushData | CoachProgramChangedMobilePushData | CoachDataChangedMobilePushData | ContactOnHevyMobilePushData | CoachClientInviteMobilePushData | AcceptFollowRequestMobilePushData | FollowRequestMobilePushData | FollowMobilePushData | WorkoutLikeMobilePushData | WorkoutCommentLikeMobilePushData | WorkoutCommentMentionMobilePushData | WorkoutCommentReplyMobilePushData | WorkoutCommentMobilePushData | WorkoutMentionMobilePushData | WorkoutCompleteMobilePushData | CoachProgramFinishesNextWeekMobilePushData | CoachProgramStartsTodayMobilePushData | CoachLoggedYourWorkoutMobilePushData | CoachLoggedYourMeasurementsMobilePushData | MonthlyReportMobilePushData;

package/built/tests/workoutVolume.test.js

@@ -4,7 +4,10 @@ const workoutVolume_1 = require("../workoutVolume");
 describe('workoutVolume', () => {
     describe('estimatedWorkoutVolumeKg', () => {
         it('calculates the correct workout volume', () => {
-            const emptyWorkout = { exercises: [] };
+            const emptyWorkout = {
+                exercises: [],
+                include_warmup_sets: true,
+            };
             const weightRepsWorkout = {
                 exercises: [
                     {
@@ -14,6 +17,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: false,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 100,
                                 reps: 10,
                                 distance_meters: 0,
@@ -21,6 +25,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const pullUpWorkout = {
                 exercises: [
@@ -31,6 +36,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 0,
                                 reps: 10,
                                 distance_meters: 0,
@@ -38,6 +44,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const assistedPullUpWorkout = {
                 exercises: [
@@ -48,6 +55,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 10,
                                 reps: 10,
                                 distance_meters: 0,
@@ -55,6 +63,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const weightedPullUpWorkout = {
                 exercises: [
@@ -65,6 +74,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: true,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 10,
                                 reps: 10,
                                 distance_meters: 0,
@@ -72,6 +82,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             const shortDistanceWeightWorkout = {
                 exercises: [
@@ -82,6 +93,7 @@ describe('workoutVolume', () => {
                         hundred_percent_bodyweight_exercise: false,
                         sets: [
                             {
+                                indicator: 'normal',
                                 weight_kg: 100,
                                 reps: 0,
                                 distance_meters: 10,
@@ -89,6 +101,7 @@ describe('workoutVolume', () => {
                         ],
                     },
                 ],
+                include_warmup_sets: true,
             };
             expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
                 bodyweightKg: 100,
@@ -124,8 +137,49 @@ describe('workoutVolume', () => {
                         ...weightedPullUpWorkout.exercises,
                         ...shortDistanceWeightWorkout.exercises,
                     ],
+                    include_warmup_sets: true,
                 },
             })).toBe(5000);
         });
+        it('takes warmup sets into account only if `include_warmup_sets` === `true`', () => {
+            const workoutWithWarmupSets = {
+                exercises: [
+                    {
+                        exercise_type: 'weight_reps',
+                        exercise_template_id: 'asd',
+                        volume_doubling_enabled: false,
+                        hundred_percent_bodyweight_exercise: false,
+                        sets: [
+                            {
+                                indicator: 'warmup',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                            {
+                                indicator: 'normal',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                            {
+                                indicator: 'normal',
+                                weight_kg: 100,
+                                reps: 10,
+                                distance_meters: 0,
+                            },
+                        ],
+                    },
+                ],
+            };
+            expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
+                bodyweightKg: 100,
+                workout: Object.assign(Object.assign({}, workoutWithWarmupSets), { include_warmup_sets: false }),
+            })).toBe(2000);
+            expect((0, workoutVolume_1.estimatedWorkoutVolumeKg)({
+                bodyweightKg: 100,
+                workout: Object.assign(Object.assign({}, workoutWithWarmupSets), { include_warmup_sets: true }),
+            })).toBe(3000);
+        });
     });
 });

package/built/workoutVolume.d.ts

@@ -1,4 +1,4 @@
-import { BodyMeasurement, ExerciseType, BaseExerciseTemplate } from '.';
+import { BodyMeasurement, ExerciseType, BaseExerciseTemplate, WorkoutExerciseSet } from '.';
 export declare const isVolumeDoublingSupportableForExerciseTemplate: (exerciseTemplate: Pick<BaseExerciseTemplate, "equipment_category" | "exercise_type">) => boolean;
 export interface VolumeCalculableWorkout {
     exercises: {
@@ -6,13 +6,9 @@ export interface VolumeCalculableWorkout {
         exercise_template_id: string;
         volume_doubling_enabled: boolean;
         hundred_percent_bodyweight_exercise: boolean;
-        sets: {
-            weight_kg?: number | null;
-            reps?: number | null;
-            distance_meters?: number | null;
-            duration_seconds?: number | null;
-        }[];
+        sets: Pick<WorkoutExerciseSet, 'indicator' | 'weight_kg' | 'reps' | 'distance_meters' | 'duration_seconds'>[];
     }[];
+    include_warmup_sets: boolean;
 }
 export interface TimestampedVolumeCalculableWorkout extends VolumeCalculableWorkout {
     start_time: number;

package/built/workoutVolume.js

@@ -98,7 +98,9 @@ const setVolumeKg = (set, bodyweightKg) => {
 exports.setVolumeKg = setVolumeKg;
 const workoutToWorkoutVolumeSets = (workout) => {
     const unflatSets = workout.exercises.map((e) => {
-        return e.sets.map((s) => {
+        return e.sets
+            .filter((s) => workout.include_warmup_sets || s.indicator !== 'warmup')
+            .map((s) => {
             var _a, _b, _c;
             return {
                 type: e.exercise_type || 'weight_reps',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hevy-shared",
-  "version": "1.0.563",
+  "version": "1.0.565",
   "description": "",
   "main": "built/index.js",
   "types": "built/index.d.ts",