90dc-core 1.6.1 → 1.6.3

package/dist/lib/dbmodels/program/ExerciseModels.d.ts

@@ -0,0 +1,22 @@
+import { Model } from "sequelize-typescript";
+import type { ExerciseModel, ProgramTypes } from "../../models/ExerciseInterfaces";
+import { TranslatedExerciseModel } from "./TranslatedExerciseModel";
+export declare class ExercisesModels extends Model implements ExerciseModel {
+    uuid: string;
+    name: string;
+    restTime: string;
+    pointers: string;
+    isCustom: boolean;
+    url: string;
+    level: string[];
+    hasPriority: boolean;
+    isCompound: boolean;
+    hasVariations: boolean;
+    needsEquipment: boolean;
+    variations: object;
+    muscles: string[];
+    homeWorkout: boolean;
+    programType: ProgramTypes[];
+    graphData: "reps" | "weight";
+    translatedExercises: TranslatedExerciseModel[];
+}

package/dist/lib/dbmodels/program/ExerciseModels.js

@@ -0,0 +1,117 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { Column, DataType, Default, HasMany, Model, Table } from "sequelize-typescript";
+import { TranslatedExerciseModel } from "./TranslatedExerciseModel";
+export let ExercisesModels = class ExercisesModels extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], ExercisesModels.prototype, "uuid", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "name", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: true
+    })
+], ExercisesModels.prototype, "restTime", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING(2048),
+        allowNull: false
+    })
+], ExercisesModels.prototype, "pointers", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: true
+    })
+], ExercisesModels.prototype, "isCustom", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "url", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], ExercisesModels.prototype, "level", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "hasPriority", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "isCompound", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "hasVariations", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "needsEquipment", void 0);
+__decorate([
+    Column({
+        type: DataType.JSONB,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "variations", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], ExercisesModels.prototype, "muscles", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "homeWorkout", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], ExercisesModels.prototype, "programType", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], ExercisesModels.prototype, "graphData", void 0);
+__decorate([
+    HasMany(()=>TranslatedExerciseModel)
+], ExercisesModels.prototype, "translatedExercises", void 0);
+ExercisesModels = __decorate([
+    Table
+], ExercisesModels);
+
+//# sourceMappingURL=ExerciseModels.js.map

package/dist/lib/dbmodels/program/ExerciseModels.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/dbmodels/program/ExerciseModels.ts"],"sourcesContent":["import { Column, DataType, Default, HasMany, Model, Table } from \"sequelize-typescript\";\nimport type {ExerciseModel, ProgramTypes} from \"../../models/ExerciseInterfaces\";\nimport {TranslatedExerciseModel} from \"./TranslatedExerciseModel\";\n\n@Table\nexport class ExercisesModels extends Model implements ExerciseModel {\n    @Default(DataType.UUIDV4)\n    @Column({\n        type: DataType.UUID,\n        defaultValue: DataType.UUID,\n        allowNull: false,\n        primaryKey: true,\n    })\n    declare uuid: string;\n\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare name: string;\n\n    @Column({ type: DataType.STRING, allowNull: true })\n    declare restTime: string;\n\n    @Column({ type: DataType.STRING(2048), allowNull: false })\n    declare pointers: string;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: true })\n    declare isCustom: boolean;\n\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare url: string;\n\n    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n    declare level: string[];\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false })\n    declare hasPriority: boolean;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false })\n    declare isCompound: boolean;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false })\n    declare hasVariations: boolean;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false })\n    declare needsEquipment: boolean;\n\n    @Column({ type: DataType.JSONB, allowNull: false })\n    declare variations: object;\n\n    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n    declare muscles: string[];\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false })\n    declare homeWorkout: boolean;\n\n    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n    declare programType: ProgramTypes[];\n\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare graphData: \"reps\" | \"weight\";\n\n    @HasMany(() => TranslatedExerciseModel)\n    declare translatedExercises: TranslatedExerciseModel[];\n}\n"],"names":["Column","DataType","Default","HasMany","Model","Table","TranslatedExerciseModel","ExercisesModels","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","BOOLEAN","ARRAY","JSONB"],"mappings":";;;;;;AAAA,SAASA,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,OAAO,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAExF,SAAQC,uBAAuB,QAAO,4BAA4B;AAGlE,WAAaC,kBAAN,8BAA8BH;AAyDrC,EAAC;;IAxDIF,QAAQD,SAASO,MAAM;IACvBR,OAAO;QACJS,MAAMR,SAASS,IAAI;QACnBC,cAAcV,SAASS,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IACpB;GAPSN;;IAURP,OAAO;QAAES,MAAMR,SAASa,MAAM;QAAEF,WAAW,KAAK;IAAC;GAVzCL;;IAaRP,OAAO;QAAES,MAAMR,SAASa,MAAM;QAAEF,WAAW,IAAI;IAAC;GAbxCL;;IAgBRP,OAAO;QAAES,MAAMR,SAASa,MAAM,CAAC;QAAOF,WAAW,KAAK;IAAC;GAhB/CL;;IAmBRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,IAAI;IAAC;GAnBzCL;;IAsBRP,OAAO;QAAES,MAAMR,SAASa,MAAM;QAAEF,WAAW,KAAK;IAAC;GAtBzCL;;IAyBRP,OAAO;QAAES,MAAMR,SAASe,KAAK,CAACf,SAASa,MAAM;QAAGF,WAAW,KAAK;IAAC;GAzBzDL;;IA4BRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,KAAK;IAAC;GA5B1CL;;IA+BRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,KAAK;IAAC;GA/B1CL;;IAkCRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,KAAK;IAAC;GAlC1CL;;IAqCRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,KAAK;IAAC;GArC1CL;;IAwCRP,OAAO;QAAES,MAAMR,SAASgB,KAAK;QAAEL,WAAW,KAAK;IAAC;GAxCxCL;;IA2CRP,OAAO;QAAES,MAAMR,SAASe,KAAK,CAACf,SAASa,MAAM;QAAGF,WAAW,KAAK;IAAC;GA3CzDL;;IA8CRP,OAAO;QAAES,MAAMR,SAASc,OAAO;QAAEH,WAAW,KAAK;IAAC;GA9C1CL;;IAiDRP,OAAO;QAAES,MAAMR,SAASe,KAAK,CAACf,SAASa,MAAM;QAAGF,WAAW,KAAK;IAAC;GAjDzDL;;IAoDRP,OAAO;QAAES,MAAMR,SAASa,MAAM;QAAEF,WAAW,KAAK;IAAC;GApDzCL;;IAuDRJ,QAAQ,IAAMG;GAvDNC;AAAAA;IADZF;GACYE"}

package/dist/lib/dbmodels/program/TranslatedExerciseModel.d.ts

@@ -0,0 +1,24 @@
+import { Model } from 'sequelize-typescript';
+import { ExercisesModels } from './ExerciseModels';
+import type { ProgramTypes } from "../../models/ExerciseInterfaces";
+export declare class TranslatedExerciseModel extends Model {
+    uuid: string;
+    exerciseUuid: string;
+    name: string;
+    language: string;
+    restTime: string;
+    pointers: string;
+    isCustom: boolean;
+    url: string;
+    level: string[];
+    hasPriority: boolean;
+    isCompound: boolean;
+    hasVariations: boolean;
+    needsEquipment: boolean;
+    variations: object;
+    muscles: string[];
+    homeWorkout: boolean;
+    programType: ProgramTypes[];
+    graphData: 'reps' | 'weight';
+    exercise: ExercisesModels;
+}

package/dist/lib/dbmodels/program/TranslatedExerciseModel.js

@@ -0,0 +1,123 @@
+var __decorate = this && this.__decorate || function(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { BelongsTo, Column, DataType, Default, ForeignKey, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { ExercisesModels } from "./ExerciseModels";
+export let TranslatedExerciseModel = class TranslatedExerciseModel extends Model {
+};
+__decorate([
+    PrimaryKey,
+    Default(DataType.UUIDV4),
+    Column(DataType.UUID)
+], TranslatedExerciseModel.prototype, "uuid", void 0);
+__decorate([
+    ForeignKey(()=>ExercisesModels),
+    Column(DataType.UUID)
+], TranslatedExerciseModel.prototype, "exerciseUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "name", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "language", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: true
+    })
+], TranslatedExerciseModel.prototype, "restTime", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING(2048),
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "pointers", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: true
+    })
+], TranslatedExerciseModel.prototype, "isCustom", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "url", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "level", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "hasPriority", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "isCompound", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "hasVariations", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "needsEquipment", void 0);
+__decorate([
+    Column({
+        type: DataType.JSONB,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "variations", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "muscles", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "homeWorkout", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.STRING),
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "programType", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], TranslatedExerciseModel.prototype, "graphData", void 0);
+__decorate([
+    BelongsTo(()=>ExercisesModels)
+], TranslatedExerciseModel.prototype, "exercise", void 0);
+TranslatedExerciseModel = __decorate([
+    Table
+], TranslatedExerciseModel);
+
+//# sourceMappingURL=TranslatedExerciseModel.js.map

package/dist/lib/dbmodels/program/TranslatedExerciseModel.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/dbmodels/program/TranslatedExerciseModel.ts"],"sourcesContent":["import { BelongsTo, Column, DataType, Default, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript';\nimport { ExercisesModels } from './ExerciseModels';\nimport type {ProgramTypes} from \"../../models/ExerciseInterfaces\";\n\n@Table\nexport class TranslatedExerciseModel extends Model {\n\t@PrimaryKey\n\t@Default(DataType.UUIDV4)\n\t@Column(DataType.UUID)\n\tdeclare uuid: string;\n\n\t@ForeignKey(() => ExercisesModels)\n\t@Column(DataType.UUID)\n\tdeclare exerciseUuid: string;\n\n\t@Column({ type: DataType.STRING, allowNull: false })\n\tdeclare name: string;\n\n\t@Column({ type: DataType.TEXT, allowNull: false })\n\tdeclare language: string;\n\n\t@Column({ type: DataType.STRING, allowNull: true })\n\tdeclare restTime: string;\n\n\t@Column({ type: DataType.STRING(2048), allowNull: false })\n\tdeclare pointers: string;\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: true })\n\tdeclare isCustom: boolean;\n\n\t@Column({ type: DataType.STRING, allowNull: false })\n\tdeclare url: string;\n\n\t@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n\tdeclare level: string[];\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare hasPriority: boolean;\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare isCompound: boolean;\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare hasVariations: boolean;\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare needsEquipment: boolean;\n\n\t@Column({ type: DataType.JSONB, allowNull: false })\n\tdeclare variations: object;\n\n\t@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n\tdeclare muscles: string[];\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare homeWorkout: boolean;\n\n\t@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n\tdeclare programType: ProgramTypes[];\n\n\t@Column({ type: DataType.STRING, allowNull: false })\n\tdeclare graphData: 'reps' | 'weight';\n\n\t@BelongsTo(() => ExercisesModels)\n\tdeclare exercise: ExercisesModels;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","Model","PrimaryKey","Table","ExercisesModels","TranslatedExerciseModel","UUIDV4","UUID","type","STRING","allowNull","TEXT","BOOLEAN","ARRAY","JSONB"],"mappings":";;;;;;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,KAAK,EAAEC,UAAU,EAAEC,KAAK,QAAQ,uBAAuB;AAClH,SAASC,eAAe,QAAQ,mBAAmB;AAInD,WAAaC,0BAAN,sCAAsCJ;AA4D7C,EAAC;;IA3DCC;IACAH,QAAQD,SAASQ,MAAM;IACvBT,OAAOC,SAASS,IAAI;GAHTF;;IAMXL,WAAW,IAAMI;IACjBP,OAAOC,SAASS,IAAI;GAPTF;;IAUXR,OAAO;QAAEW,MAAMV,SAASW,MAAM;QAAEC,WAAW,KAAK;IAAC;GAVtCL;;IAaXR,OAAO;QAAEW,MAAMV,SAASa,IAAI;QAAED,WAAW,KAAK;IAAC;GAbpCL;;IAgBXR,OAAO;QAAEW,MAAMV,SAASW,MAAM;QAAEC,WAAW,IAAI;IAAC;GAhBrCL;;IAmBXR,OAAO;QAAEW,MAAMV,SAASW,MAAM,CAAC;QAAOC,WAAW,KAAK;IAAC;GAnB5CL;;IAsBXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,IAAI;IAAC;GAtBtCL;;IAyBXR,OAAO;QAAEW,MAAMV,SAASW,MAAM;QAAEC,WAAW,KAAK;IAAC;GAzBtCL;;IA4BXR,OAAO;QAAEW,MAAMV,SAASe,KAAK,CAACf,SAASW,MAAM;QAAGC,WAAW,KAAK;IAAC;GA5BtDL;;IA+BXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GA/BvCL;;IAkCXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GAlCvCL;;IAqCXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GArCvCL;;IAwCXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GAxCvCL;;IA2CXR,OAAO;QAAEW,MAAMV,SAASgB,KAAK;QAAEJ,WAAW,KAAK;IAAC;GA3CrCL;;IA8CXR,OAAO;QAAEW,MAAMV,SAASe,KAAK,CAACf,SAASW,MAAM;QAAGC,WAAW,KAAK;IAAC;GA9CtDL;;IAiDXR,OAAO;QAAEW,MAAMV,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GAjDvCL;;IAoDXR,OAAO;QAAEW,MAAMV,SAASe,KAAK,CAACf,SAASW,MAAM;QAAGC,WAAW,KAAK;IAAC;GApDtDL;;IAuDXR,OAAO;QAAEW,MAAMV,SAASW,MAAM;QAAEC,WAAW,KAAK;IAAC;GAvDtCL;;IA0DXT,UAAU,IAAMQ;GA1DLC;AAAAA;IADZF;GACYE"}

package/dist/lib/models/ExerciseInterfaces.d.ts

@@ -1,21 +1,65 @@
-export type ProgramTypes = "BodyweightHomeWorkout" | "BodyweightOnlyBodyweight" | "BodyweightWeightedCali" | "Weights" | "Both";
-export interface GraphProgress extends Progress {
-    date: string;
+import type { UserStrengthTests } from "../dbmodels/program/UserStrengthTests";
+import type { UserChallenge } from "../dbmodels/program/UserChallenge";
+import type { TranslatedStrengthTestExercise } from "../dbmodels/program/TranslatedStrengthTestExercise";
+import type { ExercisesModels } from "../dbmodels/program/ExerciseModels";
+export interface ExerciseModel {
+    uuid: string;
+    name: string;
+    level: string[];
+    isCompound: boolean;
+    needsEquipment: boolean;
+    hasPriority: boolean;
+    hasVariations: boolean;
+    variations: object;
+    muscles: string[];
+    homeWorkout: boolean;
 }
-export interface Progress {
-    [key: string]: number | string | undefined;
+export interface ExerciseProgress {
+    exerciseUuid: string;
+    progress: Progress[];
 }
-export interface ExerciseOptions {
-    sets: string;
-    reps: string;
-    order: number;
+export interface UpdateSTRequest {
+    body: UserStrengthTests;
+}
+export interface UpdateUserChallengeRequest {
+    body: UserChallenge;
+}
+export interface STExerciseProgress {
+    exerciseUuid: string;
+    progress: Progress;
+}
+export interface ExercisePerformance {
+    workoutIndex: number;
+    progress: Progress[];
+}
+export interface SwapExerciseRequest {
+    exerciseUuid: string;
+}
+export interface ChangeExerciseRequest {
+    oldExerciseUuid: string;
+    newExercise: ExercisesModels;
 }
 export interface ReducedExercise {
     uuid: string;
     name: string;
     order: number;
-    progress: Progress[];
+    progress?: Progress[];
     sets: string;
     reps: string;
     restTime?: string;
 }
+export interface UpdateTranslatedStrengthTestExercisesRequest {
+    exercises: TranslatedStrengthTestExercise[];
+}
+export interface AddTranslatedStrengthTestExercisesRequest {
+    exercises: TranslatedStrengthTestExercise[];
+}
+export type ProgramTypes = "BodyweightHomeWorkout" | "BodyweightOnlyBodyweight" | "BodyweightWeightedCali" | "Weights" | "Both";
+export interface Progress {
+    [key: string]: number | string | undefined;
+}
+export interface ProgressByExercise {
+    name: string;
+    totalRepsDone: number;
+    weight: number;
+}

package/dist/lib/models/ExerciseInterfaces.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/models/ExerciseInterfaces.ts"],"sourcesContent":["export type ProgramTypes =\n  | \"BodyweightHomeWorkout\"\n  | \"BodyweightOnlyBodyweight\"\n  | \"BodyweightWeightedCali\"\n  | \"Weights\"\n  | \"Both\";\n\nexport interface GraphProgress extends Progress {\n  date: string;\n}\nexport interface Progress {\n  [key: string]: number | string | undefined;\n}\nexport interface ExerciseOptions {\n  sets: string;\n  reps: string;\n  order: number;\n}\nexport interface ReducedExercise {\n  uuid: string;\n  name: string;\n  order: number;\n  progress: Progress[];\n  sets: string;\n  reps: string;\n  restTime?: string;\n}\n"],"names":[],"mappings":"AAAA,WA0BC"}
+{"version":3,"sources":["../../../src/lib/models/ExerciseInterfaces.ts"],"sourcesContent":["import type {UserStrengthTests} from \"../dbmodels/program/UserStrengthTests\";\nimport type {UserChallenge} from \"../dbmodels/program/UserChallenge\";\nimport type {TranslatedStrengthTestExercise} from \"../dbmodels/program/TranslatedStrengthTestExercise\";\nimport type {ExercisesModels} from \"../dbmodels/program/ExerciseModels\";\n\nexport interface ExerciseModel {\n  uuid: string;\n  name: string;\n  level: string[];\n  isCompound: boolean;\n  needsEquipment: boolean;\n  hasPriority: boolean;\n  hasVariations: boolean;\n  variations: object;\n  muscles: string[];\n  homeWorkout: boolean;\n}\n\nexport interface ExerciseProgress {\n  exerciseUuid: string;\n  progress: Progress[];\n}\n\nexport interface UpdateSTRequest {\n  body: UserStrengthTests;\n}\n\nexport interface UpdateUserChallengeRequest {\n  body: UserChallenge;\n}\n\nexport interface STExerciseProgress {\n  exerciseUuid: string;\n  progress: Progress;\n}\n\nexport interface ExercisePerformance {\n  workoutIndex: number;\n  progress: Progress[];\n}\n\nexport interface SwapExerciseRequest {\n  exerciseUuid: string;\n}\n\nexport interface ChangeExerciseRequest {\n  oldExerciseUuid: string;\n  newExercise: ExercisesModels;\n}\n\nexport interface ReducedExercise {\n  uuid: string;\n  name: string;\n  order: number;\n  progress?: Progress[];\n  sets: string;\n  reps: string;\n  restTime?: string;\n}\n\nexport interface UpdateTranslatedStrengthTestExercisesRequest {\n  exercises: TranslatedStrengthTestExercise[];\n}\n\nexport interface AddTranslatedStrengthTestExercisesRequest {\n  exercises: TranslatedStrengthTestExercise[];\n}\n\nexport type ProgramTypes =\n    | \"BodyweightHomeWorkout\"\n    | \"BodyweightOnlyBodyweight\"\n    | \"BodyweightWeightedCali\"\n    | \"Weights\"\n    | \"Both\";\n\nexport interface Progress {\n  [key: string]: number | string | undefined;\n}\n\nexport interface ProgressByExercise {\n  name: string;\n  totalRepsDone: number;\n  weight: number;\n}\n"],"names":[],"mappings":"AAAA,WAmFC"}

package/dist/lib/utils/NotificationsUtil.d.ts

@@ -1,5 +1,5 @@
 import apn from "apn";
-import type { AndroidMessage } from "../models/NotificationInterfaces";
+import type { AndroidMessage, NotificationRequest } from "../models/NotificationInterfaces";
 export default class NotificationsUtil {
     private static apnProvider;
     private static getAccessToken;
@@ -8,7 +8,7 @@ export default class NotificationsUtil {
     static sendAndroidNotification(notification: AndroidMessage): Promise<void>;
     private static buildAppleNotification;
     private static buildAndroidNotification;
-    private static sendNotification;
+    static sendNotification(userUuid: string, notification: NotificationRequest): Promise<void>;
     static calculateDelayUntil10AM(timeZone: string, additionalDelay?: number): number;
     static calculateDelayUntil6PM(timeZone: string): number;
 }

package/dist/lib/utils/NotificationsUtil.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/NotificationsUtil.ts"],"sourcesContent":["import apn, { Provider } from \"apn\";\nimport axios, { isAxiosError } from \"axios\";\nimport * as dotenv from \"dotenv\";\nimport { google } from \"googleapis\";\nimport type { JWT } from \"google-auth-library\";\nimport { cert_key } from \"../enums/cert\";\nimport type {\n   AndroidMessage,\n   NotificationRequest\n} from \"../models/NotificationInterfaces\";\nimport {DeviceTokens} from \"../dbmodels/DeviceTokens\";\ndotenv.config();\n\nexport default class NotificationsUtil {\n  private static apnProvider: Provider = this.getAPNProvider();\n\n  private static async getAccessToken(): Promise<string> {\n    const key = cert_key;\n\n    const jwtClient: JWT = new google.auth.JWT({\n      email: key.client_email,\n      key: key.private_key,\n      scopes: [\"https://www.googleapis.com/auth/firebase.messaging\"],\n    });\n\n    return new Promise<string>((resolve, reject) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access\n      jwtClient.authorize((err: any, tokens: any) => {\n        if (err) {\n          reject(err);\n          return;\n        }\n\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        resolve(tokens.access_token as string);\n      });\n    });\n  }\n\n  private static getAPNProvider(): Provider {\n    return new apn.Provider({\n      token: {\n        key: process.env.APN_KEY_PATH as string,\n        keyId: process.env.NOTIFICATIONS_KEY_ID as string,\n        teamId: process.env.NOTIFICATIONS_TEAM_ID as string,\n      },\n      production: true,\n    });\n  }\n\n  public static async sendAppleNotification(\n    notification: apn.Notification,\n    token: string | string[]\n  ) {\n    try {\n      await this.apnProvider.send(notification, token);\n    } catch (e) {\n      console.error(\n        `ERROR: Could not send apple notification: ${(e as Error).message}`\n      );\n    }\n  }\n\n  public static async sendAndroidNotification(notification: AndroidMessage) {\n    try {\n      await axios.post(\n        \"https://fcm.googleapis.com/v1/projects/dayschallenge-373510/messages:send\",\n        notification,\n        {\n          headers: {\n            \"Content-Type\": \"application/json\",\n            Authorization: `Bearer ${await this.getAccessToken()}`,\n          },\n        }\n      );\n    } catch (e) {\n      if (isAxiosError(e)) {\n        console.error(\n          `ERROR: Could not send android notification: ${(e as Error).message}`\n        );\n      }\n    }\n  }\n\n  private static buildAppleNotification(notificationReq: NotificationRequest) {\n    const notification: apn.Notification = new apn.Notification();\n    notification.topic = process.env.APPLE_BUNDLE_ID as string;\n    notification.priority = 10;\n    notification.expiry = Math.floor(Date.now() / 1000) + 3600;\n    notification.rawPayload = {\n      aps: {\n        alert: {\n          title: notificationReq.title,\n          body: notificationReq.body,\n        },\n        \"content-available\": 1,\n        sound: \"default\",\n        redirectPath: notificationReq.redirectPath,\n      },\n    };\n    return notification;\n  }\n\n  private static buildAndroidNotification(\n    notificationReq: NotificationRequest,\n    token: string | string[]\n  ): AndroidMessage {\n    if (Array.isArray(token)) {\n      return {\n        message: {\n          token: token,\n          notification: {\n            title: notificationReq.title,\n            body: notificationReq.body,\n          },\n        },\n      };\n    }\n\n    return {\n      message: {\n        token: token,\n        notification: {\n          title: notificationReq.title,\n          body: notificationReq.body,\n        },\n      },\n    };\n  }\n\n\n  private static async sendNotification(\n    userUuid: string,\n    notification: NotificationRequest\n  ) {\n    const deviceToken: DeviceTokens | null = await DeviceTokens.findOne({\n      where: { userUuid: userUuid },\n      raw: true,\n    });\n\n    if (!deviceToken) {\n      console.error(`ERROR: No token found for user ${userUuid}}`);\n      return;\n    }\n\n    deviceToken.platform === \"ios\"\n      ? await this.sendAppleNotification(\n          this.buildAppleNotification(notification),\n          deviceToken.deviceToken\n        )\n      : await this.sendAndroidNotification(\n          this.buildAndroidNotification(notification, deviceToken.deviceToken)\n        );\n  }\n\n  public static calculateDelayUntil10AM(timeZone: string, additionalDelay = 0) {\n    const now = new Date(new Date().toLocaleString(\"en-US\", { timeZone }));\n\n    // Create a Date object for 10 AM today in the user's time zone\n    const next10AM = new Date(now);\n    next10AM.setHours(10, 0, 0, 0);\n\n    // If the current time is past 10 AM, set the next 10 AM to tomorrow\n    if (now.getTime() > next10AM.getTime()) {\n      next10AM.setDate(next10AM.getDate() + 1);\n    }\n    next10AM.setDate(next10AM.getDate() + additionalDelay);\n    // Calculate the delay in milliseconds\n    return next10AM.getTime() - now.getTime();\n  }\n\n  public static calculateDelayUntil6PM(timeZone: string) {\n    // Get the current date and time in the user's time zone\n    const now = new Date(new Date().toLocaleString(\"en-US\", { timeZone }));\n\n    // Create a Date object for 6 PM today in the user's time zone\n    const next6PM = new Date(now);\n    next6PM.setHours(18, 0, 0, 0);\n\n    // If the current time is past 6 PM, set the next 6 PM to tomorrow\n    if (now.getTime() > next6PM.getTime()) {\n      next6PM.setDate(next6PM.getDate() + 1);\n    }\n\n    // Calculate the delay in milliseconds\n    return next6PM.getTime() - now.getTime();\n  }\n}\n"],"names":["apn","axios","isAxiosError","dotenv","google","cert_key","DeviceTokens","config","NotificationsUtil","apnProvider","getAPNProvider","getAccessToken","key","jwtClient","auth","JWT","email","client_email","private_key","scopes","Promise","resolve","reject","authorize","err","tokens","access_token","Provider","token","process","env","APN_KEY_PATH","keyId","NOTIFICATIONS_KEY_ID","teamId","NOTIFICATIONS_TEAM_ID","production","sendAppleNotification","notification","send","e","console","error","message","sendAndroidNotification","post","headers","Authorization","buildAppleNotification","notificationReq","Notification","topic","APPLE_BUNDLE_ID","priority","expiry","Math","floor","Date","now","rawPayload","aps","alert","title","body","sound","redirectPath","buildAndroidNotification","Array","isArray","sendNotification","userUuid","deviceToken","findOne","where","raw","platform","calculateDelayUntil10AM","timeZone","additionalDelay","toLocaleString","next10AM","setHours","getTime","setDate","getDate","calculateDelayUntil6PM","next6PM"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/utils/NotificationsUtil.ts"],"sourcesContent":["import apn, { Provider } from \"apn\";\nimport axios, { isAxiosError } from \"axios\";\nimport * as dotenv from \"dotenv\";\nimport { google } from \"googleapis\";\nimport type { JWT } from \"google-auth-library\";\nimport { cert_key } from \"../enums/cert\";\nimport type {\n   AndroidMessage,\n   NotificationRequest\n} from \"../models/NotificationInterfaces\";\nimport {DeviceTokens} from \"../dbmodels/DeviceTokens\";\ndotenv.config();\n\nexport default class NotificationsUtil {\n  private static apnProvider: Provider = this.getAPNProvider();\n\n  private static async getAccessToken(): Promise<string> {\n    const key = cert_key;\n\n    const jwtClient: JWT = new google.auth.JWT({\n      email: key.client_email,\n      key: key.private_key,\n      scopes: [\"https://www.googleapis.com/auth/firebase.messaging\"],\n    });\n\n    return new Promise<string>((resolve, reject) => {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access\n      jwtClient.authorize((err: any, tokens: any) => {\n        if (err) {\n          reject(err);\n          return;\n        }\n\n        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n        resolve(tokens.access_token as string);\n      });\n    });\n  }\n\n  private static getAPNProvider(): Provider {\n    return new apn.Provider({\n      token: {\n        key: process.env.APN_KEY_PATH as string,\n        keyId: process.env.NOTIFICATIONS_KEY_ID as string,\n        teamId: process.env.NOTIFICATIONS_TEAM_ID as string,\n      },\n      production: true,\n    });\n  }\n\n  public static async sendAppleNotification(\n    notification: apn.Notification,\n    token: string | string[]\n  ) {\n    try {\n      await this.apnProvider.send(notification, token);\n    } catch (e) {\n      console.error(\n        `ERROR: Could not send apple notification: ${(e as Error).message}`\n      );\n    }\n  }\n\n  public static async sendAndroidNotification(notification: AndroidMessage) {\n    try {\n      await axios.post(\n        \"https://fcm.googleapis.com/v1/projects/dayschallenge-373510/messages:send\",\n        notification,\n        {\n          headers: {\n            \"Content-Type\": \"application/json\",\n            Authorization: `Bearer ${await this.getAccessToken()}`,\n          },\n        }\n      );\n    } catch (e) {\n      if (isAxiosError(e)) {\n        console.error(\n          `ERROR: Could not send android notification: ${(e as Error).message}`\n        );\n      }\n    }\n  }\n\n  private static buildAppleNotification(notificationReq: NotificationRequest) {\n    const notification: apn.Notification = new apn.Notification();\n    notification.topic = process.env.APPLE_BUNDLE_ID as string;\n    notification.priority = 10;\n    notification.expiry = Math.floor(Date.now() / 1000) + 3600;\n    notification.rawPayload = {\n      aps: {\n        alert: {\n          title: notificationReq.title,\n          body: notificationReq.body,\n        },\n        \"content-available\": 1,\n        sound: \"default\",\n        redirectPath: notificationReq.redirectPath,\n      },\n    };\n    return notification;\n  }\n\n  private static buildAndroidNotification(\n    notificationReq: NotificationRequest,\n    token: string | string[]\n  ): AndroidMessage {\n    if (Array.isArray(token)) {\n      return {\n        message: {\n          token: token,\n          notification: {\n            title: notificationReq.title,\n            body: notificationReq.body,\n          },\n        },\n      };\n    }\n\n    return {\n      message: {\n        token: token,\n        notification: {\n          title: notificationReq.title,\n          body: notificationReq.body,\n        },\n      },\n    };\n  }\n\n\n  public static async sendNotification(\n    userUuid: string,\n    notification: NotificationRequest\n  ) {\n    const deviceToken: DeviceTokens | null = await DeviceTokens.findOne({\n      where: { userUuid: userUuid },\n      raw: true,\n    });\n\n    if (!deviceToken) {\n      console.error(`ERROR: No token found for user ${userUuid}}`);\n      return;\n    }\n\n    deviceToken.platform === \"ios\"\n      ? await this.sendAppleNotification(\n          this.buildAppleNotification(notification),\n          deviceToken.deviceToken\n        )\n      : await this.sendAndroidNotification(\n          this.buildAndroidNotification(notification, deviceToken.deviceToken)\n        );\n  }\n\n  public static calculateDelayUntil10AM(timeZone: string, additionalDelay = 0) {\n    const now = new Date(new Date().toLocaleString(\"en-US\", { timeZone }));\n\n    // Create a Date object for 10 AM today in the user's time zone\n    const next10AM = new Date(now);\n    next10AM.setHours(10, 0, 0, 0);\n\n    // If the current time is past 10 AM, set the next 10 AM to tomorrow\n    if (now.getTime() > next10AM.getTime()) {\n      next10AM.setDate(next10AM.getDate() + 1);\n    }\n    next10AM.setDate(next10AM.getDate() + additionalDelay);\n    // Calculate the delay in milliseconds\n    return next10AM.getTime() - now.getTime();\n  }\n\n  public static calculateDelayUntil6PM(timeZone: string) {\n    // Get the current date and time in the user's time zone\n    const now = new Date(new Date().toLocaleString(\"en-US\", { timeZone }));\n\n    // Create a Date object for 6 PM today in the user's time zone\n    const next6PM = new Date(now);\n    next6PM.setHours(18, 0, 0, 0);\n\n    // If the current time is past 6 PM, set the next 6 PM to tomorrow\n    if (now.getTime() > next6PM.getTime()) {\n      next6PM.setDate(next6PM.getDate() + 1);\n    }\n\n    // Calculate the delay in milliseconds\n    return next6PM.getTime() - now.getTime();\n  }\n}\n"],"names":["apn","axios","isAxiosError","dotenv","google","cert_key","DeviceTokens","config","NotificationsUtil","apnProvider","getAPNProvider","getAccessToken","key","jwtClient","auth","JWT","email","client_email","private_key","scopes","Promise","resolve","reject","authorize","err","tokens","access_token","Provider","token","process","env","APN_KEY_PATH","keyId","NOTIFICATIONS_KEY_ID","teamId","NOTIFICATIONS_TEAM_ID","production","sendAppleNotification","notification","send","e","console","error","message","sendAndroidNotification","post","headers","Authorization","buildAppleNotification","notificationReq","Notification","topic","APPLE_BUNDLE_ID","priority","expiry","Math","floor","Date","now","rawPayload","aps","alert","title","body","sound","redirectPath","buildAndroidNotification","Array","isArray","sendNotification","userUuid","deviceToken","findOne","where","raw","platform","calculateDelayUntil10AM","timeZone","additionalDelay","toLocaleString","next10AM","setHours","getTime","setDate","getDate","calculateDelayUntil6PM","next6PM"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "90dc-core",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "A package that contains utils and interfaces used to create 90dc",
   "main": "dist/index.js",
   "type": "module",

package/src/lib/dbmodels/program/ExerciseModels.ts

@@ -0,0 +1,63 @@
+import { Column, DataType, Default, HasMany, Model, Table } from "sequelize-typescript";
+import type {ExerciseModel, ProgramTypes} from "../../models/ExerciseInterfaces";
+import {TranslatedExerciseModel} from "./TranslatedExerciseModel";
+
+@Table
+export class ExercisesModels extends Model implements ExerciseModel {
+    @Default(DataType.UUIDV4)
+    @Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true,
+    })
+    declare uuid: string;
+
+    @Column({ type: DataType.STRING, allowNull: false })
+    declare name: string;
+
+    @Column({ type: DataType.STRING, allowNull: true })
+    declare restTime: string;
+
+    @Column({ type: DataType.STRING(2048), allowNull: false })
+    declare pointers: string;
+
+    @Column({ type: DataType.BOOLEAN, allowNull: true })
+    declare isCustom: boolean;
+
+    @Column({ type: DataType.STRING, allowNull: false })
+    declare url: string;
+
+    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+    declare level: string[];
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false })
+    declare hasPriority: boolean;
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false })
+    declare isCompound: boolean;
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false })
+    declare hasVariations: boolean;
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false })
+    declare needsEquipment: boolean;
+
+    @Column({ type: DataType.JSONB, allowNull: false })
+    declare variations: object;
+
+    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+    declare muscles: string[];
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false })
+    declare homeWorkout: boolean;
+
+    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+    declare programType: ProgramTypes[];
+
+    @Column({ type: DataType.STRING, allowNull: false })
+    declare graphData: "reps" | "weight";
+
+    @HasMany(() => TranslatedExerciseModel)
+    declare translatedExercises: TranslatedExerciseModel[];
+}

package/src/lib/dbmodels/program/TranslatedExerciseModel.ts

@@ -0,0 +1,66 @@
+import { BelongsTo, Column, DataType, Default, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript';
+import { ExercisesModels } from './ExerciseModels';
+import type {ProgramTypes} from "../../models/ExerciseInterfaces";
+
+@Table
+export class TranslatedExerciseModel extends Model {
+	@PrimaryKey
+	@Default(DataType.UUIDV4)
+	@Column(DataType.UUID)
+	declare uuid: string;
+
+	@ForeignKey(() => ExercisesModels)
+	@Column(DataType.UUID)
+	declare exerciseUuid: string;
+
+	@Column({ type: DataType.STRING, allowNull: false })
+	declare name: string;
+
+	@Column({ type: DataType.TEXT, allowNull: false })
+	declare language: string;
+
+	@Column({ type: DataType.STRING, allowNull: true })
+	declare restTime: string;
+
+	@Column({ type: DataType.STRING(2048), allowNull: false })
+	declare pointers: string;
+
+	@Column({ type: DataType.BOOLEAN, allowNull: true })
+	declare isCustom: boolean;
+
+	@Column({ type: DataType.STRING, allowNull: false })
+	declare url: string;
+
+	@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+	declare level: string[];
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare hasPriority: boolean;
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare isCompound: boolean;
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare hasVariations: boolean;
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare needsEquipment: boolean;
+
+	@Column({ type: DataType.JSONB, allowNull: false })
+	declare variations: object;
+
+	@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+	declare muscles: string[];
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare homeWorkout: boolean;
+
+	@Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+	declare programType: ProgramTypes[];
+
+	@Column({ type: DataType.STRING, allowNull: false })
+	declare graphData: 'reps' | 'weight';
+
+	@BelongsTo(() => ExercisesModels)
+	declare exercise: ExercisesModels;
+}

package/src/lib/models/ExerciseInterfaces.ts

@@ -1,27 +1,84 @@
-export type ProgramTypes =
-  | "BodyweightHomeWorkout"
-  | "BodyweightOnlyBodyweight"
-  | "BodyweightWeightedCali"
-  | "Weights"
-  | "Both";
+import type {UserStrengthTests} from "../dbmodels/program/UserStrengthTests";
+import type {UserChallenge} from "../dbmodels/program/UserChallenge";
+import type {TranslatedStrengthTestExercise} from "../dbmodels/program/TranslatedStrengthTestExercise";
+import type {ExercisesModels} from "../dbmodels/program/ExerciseModels";
 
-export interface GraphProgress extends Progress {
-  date: string;
+export interface ExerciseModel {
+  uuid: string;
+  name: string;
+  level: string[];
+  isCompound: boolean;
+  needsEquipment: boolean;
+  hasPriority: boolean;
+  hasVariations: boolean;
+  variations: object;
+  muscles: string[];
+  homeWorkout: boolean;
 }
-export interface Progress {
-  [key: string]: number | string | undefined;
+
+export interface ExerciseProgress {
+  exerciseUuid: string;
+  progress: Progress[];
 }
-export interface ExerciseOptions {
-  sets: string;
-  reps: string;
-  order: number;
+
+export interface UpdateSTRequest {
+  body: UserStrengthTests;
+}
+
+export interface UpdateUserChallengeRequest {
+  body: UserChallenge;
+}
+
+export interface STExerciseProgress {
+  exerciseUuid: string;
+  progress: Progress;
 }
+
+export interface ExercisePerformance {
+  workoutIndex: number;
+  progress: Progress[];
+}
+
+export interface SwapExerciseRequest {
+  exerciseUuid: string;
+}
+
+export interface ChangeExerciseRequest {
+  oldExerciseUuid: string;
+  newExercise: ExercisesModels;
+}
+
 export interface ReducedExercise {
   uuid: string;
   name: string;
   order: number;
-  progress: Progress[];
+  progress?: Progress[];
   sets: string;
   reps: string;
   restTime?: string;
 }
+
+export interface UpdateTranslatedStrengthTestExercisesRequest {
+  exercises: TranslatedStrengthTestExercise[];
+}
+
+export interface AddTranslatedStrengthTestExercisesRequest {
+  exercises: TranslatedStrengthTestExercise[];
+}
+
+export type ProgramTypes =
+    | "BodyweightHomeWorkout"
+    | "BodyweightOnlyBodyweight"
+    | "BodyweightWeightedCali"
+    | "Weights"
+    | "Both";
+
+export interface Progress {
+  [key: string]: number | string | undefined;
+}
+
+export interface ProgressByExercise {
+  name: string;
+  totalRepsDone: number;
+  weight: number;
+}

package/src/lib/utils/NotificationsUtil.ts

@@ -129,7 +129,7 @@ export default class NotificationsUtil {
   }
 
 
-  private static async sendNotification(
+  public static async sendNotification(
     userUuid: string,
     notification: NotificationRequest
   ) {