90dc-core 1.5.14 → 1.5.16

package/dist/index.d.ts

@@ -7,4 +7,8 @@ export * from "./lib/dbmodels/PersistedUser";
 export * from "./lib/dbmodels/UserBadges";
 export * from "./lib/dbmodels/UserStreaks";
 export * from "./lib/dbmodels/Badge";
+export * from "./lib/dbmodels/Program";
+export * from "./lib/dbmodels/Workout";
+export * from "./lib/dbmodels/Exercise";
+export * from "./lib/dbmodels/Superset";
 export * from "./lib/utils/Logger";

package/dist/index.js

@@ -9,6 +9,10 @@ export * from "./lib/dbmodels/PersistedUser";
 export * from "./lib/dbmodels/UserBadges";
 export * from "./lib/dbmodels/UserStreaks";
 export * from "./lib/dbmodels/Badge";
+export * from "./lib/dbmodels/Program";
+export * from "./lib/dbmodels/Workout";
+export * from "./lib/dbmodels/Exercise";
+export * from "./lib/dbmodels/Superset";
 //Utils
 export * from "./lib/utils/Logger";
 

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["//Interfaces\nexport * from \"./lib/models/ProgramInterfaces\";\nexport * from \"./lib/models/ExerciseInterfaces\";\nexport * from \"./lib/models/WorkoutInterfaces\";\nexport * from \"./lib/models/UserInterfaces\";\n\n//DB Models\nexport * from \"./lib/dbmodels/UsersFriends\"\nexport * from \"./lib/dbmodels/PersistedUser\"\nexport * from \"./lib/dbmodels/UserBadges\"\nexport * from \"./lib/dbmodels/UserStreaks\"\nexport * from \"./lib/dbmodels/Badge\"\n\n//Utils\nexport * from \"./lib/utils/Logger\"\n"],"names":[],"mappings":"AAAA,YAAY;AACZ,cAAc,iCAAiC;AAC/C,cAAc,kCAAkC;AAChD,cAAc,iCAAiC;AAC/C,cAAc,8BAA8B;AAE5C,WAAW;AACX,cAAc,8BAA6B;AAC3C,cAAc,+BAA8B;AAC5C,cAAc,4BAA2B;AACzC,cAAc,6BAA4B;AAC1C,cAAc,uBAAsB;AAEpC,OAAO;AACP,cAAc,qBAAoB"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["//Interfaces\nexport * from \"./lib/models/ProgramInterfaces\";\nexport * from \"./lib/models/ExerciseInterfaces\";\nexport * from \"./lib/models/WorkoutInterfaces\";\nexport * from \"./lib/models/UserInterfaces\";\n\n//DB Models\nexport * from \"./lib/dbmodels/UsersFriends\"\nexport * from \"./lib/dbmodels/PersistedUser\"\nexport * from \"./lib/dbmodels/UserBadges\"\nexport * from \"./lib/dbmodels/UserStreaks\"\nexport * from \"./lib/dbmodels/Badge\"\nexport * from \"./lib/dbmodels/Program\"\nexport * from \"./lib/dbmodels/Workout\"\nexport * from \"./lib/dbmodels/Exercise\"\nexport * from \"./lib/dbmodels/Superset\"\n\n//Utils\nexport * from \"./lib/utils/Logger\"\n"],"names":[],"mappings":"AAAA,YAAY;AACZ,cAAc,iCAAiC;AAC/C,cAAc,kCAAkC;AAChD,cAAc,iCAAiC;AAC/C,cAAc,8BAA8B;AAE5C,WAAW;AACX,cAAc,8BAA6B;AAC3C,cAAc,+BAA8B;AAC5C,cAAc,4BAA2B;AACzC,cAAc,6BAA4B;AAC1C,cAAc,uBAAsB;AACpC,cAAc,yBAAwB;AACtC,cAAc,yBAAwB;AACtC,cAAc,0BAAyB;AACvC,cAAc,0BAAyB;AAEvC,OAAO;AACP,cAAc,qBAAoB"}

package/dist/lib/dbmodels/Badge.js

@@ -26,7 +26,7 @@ __decorate([
 ], Badge.prototype, "title", void 0);
 __decorate([
     Column({
-        type: DataType.ARRAY(DataType.STRING),
+        type: DataType.ARRAY(DataType.TEXT),
         allowNull: false
     })
 ], Badge.prototype, "tags", void 0);

package/dist/lib/dbmodels/Badge.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/Badge.ts"],"sourcesContent":["import { BelongsToMany, Column, DataType, Default, Model, Table } from \"sequelize-typescript\";\nimport { UserBadges } from \"./UserBadges\";\nimport { PersistedUser } from \"./PersistedUser\";\n\n@Table\nexport class Badge extends Model {\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.TEXT, allowNull: false })\n    declare title: string;\n\n    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })\n    declare tags: string;\n\n    @Column({ type: DataType.TEXT, allowNull: false })\n    declare imageURL: string;\n\n    @Column({ type: DataType.TEXT, allowNull: false })\n    declare description: string;\n\n    @BelongsToMany(() => PersistedUser, () => UserBadges)\n    declare users: PersistedUser[];\n}\n"],"names":["BelongsToMany","Column","DataType","Default","Model","Table","UserBadges","PersistedUser","Badge","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","ARRAY","STRING"],"mappings":";;;;;;AAAA,SAASA,aAAa,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAC9F,SAASC,UAAU,QAAQ,eAAe;AAC1C,SAASC,aAAa,QAAQ,kBAAkB;AAGhD,WAAaC,QAAN,oBAAoBJ;AAwB3B,EAAC;;IAvBID,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,IAAI;QAAEF,WAAW,KAAK;IAAC;GAVvCL;;IAaRP,OAAO;QAAES,MAAMR,SAASc,KAAK,CAACd,SAASe,MAAM;QAAGJ,WAAW,KAAK;IAAC;GAbzDL;;IAgBRP,OAAO;QAAES,MAAMR,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAhBvCL;;IAmBRP,OAAO;QAAES,MAAMR,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAnBvCL;;IAsBRR,cAAc,IAAMO,eAAe,IAAMD;GAtBjCE;AAAAA;IADZH;GACYG"}
+{"version":3,"sources":["../../../src/lib/dbmodels/Badge.ts"],"sourcesContent":["import { BelongsToMany, Column, DataType, Default, Model, Table } from \"sequelize-typescript\";\nimport { UserBadges } from \"./UserBadges\";\nimport { PersistedUser } from \"./PersistedUser\";\n\n@Table\nexport class Badge extends Model {\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.TEXT, allowNull: false })\n    declare title: string;\n\n    @Column({ type: DataType.ARRAY(DataType.TEXT), allowNull: false })\n    declare tags: string;\n\n    @Column({ type: DataType.TEXT, allowNull: false })\n    declare imageURL: string;\n\n    @Column({ type: DataType.TEXT, allowNull: false })\n    declare description: string;\n\n    @BelongsToMany(() => PersistedUser, () => UserBadges)\n    declare users: PersistedUser[];\n}\n"],"names":["BelongsToMany","Column","DataType","Default","Model","Table","UserBadges","PersistedUser","Badge","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","ARRAY"],"mappings":";;;;;;AAAA,SAASA,aAAa,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAC9F,SAASC,UAAU,QAAQ,eAAe;AAC1C,SAASC,aAAa,QAAQ,kBAAkB;AAGhD,WAAaC,QAAN,oBAAoBJ;AAwB3B,EAAC;;IAvBID,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,IAAI;QAAEF,WAAW,KAAK;IAAC;GAVvCL;;IAaRP,OAAO;QAAES,MAAMR,SAASc,KAAK,CAACd,SAASa,IAAI;QAAGF,WAAW,KAAK;IAAC;GAbvDL;;IAgBRP,OAAO;QAAES,MAAMR,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAhBvCL;;IAmBRP,OAAO;QAAES,MAAMR,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAnBvCL;;IAsBRR,cAAc,IAAMO,eAAe,IAAMD;GAtBjCE;AAAAA;IADZH;GACYG"}

package/dist/lib/dbmodels/Exercise.d.ts

@@ -0,0 +1,14 @@
+import { Model } from "sequelize-typescript";
+import { Workout } from "./Workout";
+import type { Progress, ReducedExercise } from "../models/ExerciseInterfaces";
+export declare class Exercise extends Model<Exercise> implements ReducedExercise {
+    uuid: string;
+    name: string;
+    order: number;
+    progress: Progress[];
+    reps: string;
+    sets: string;
+    restTime: string;
+    workoutUuid: string;
+    workout: Workout;
+}

package/dist/lib/dbmodels/Exercise.js

@@ -0,0 +1,71 @@
+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, Index, Model, Table } from "sequelize-typescript";
+import { Workout } from "./Workout";
+export let Exercise = class Exercise extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], Exercise.prototype, "uuid", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], Exercise.prototype, "name", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], Exercise.prototype, "order", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.JSONB),
+        allowNull: true
+    })
+], Exercise.prototype, "progress", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Exercise.prototype, "reps", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Exercise.prototype, "sets", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: true
+    })
+], Exercise.prototype, "restTime", void 0);
+__decorate([
+    ForeignKey(()=>Workout),
+    Index,
+    Column({
+        type: DataType.UUID,
+        allowNull: true
+    })
+], Exercise.prototype, "workoutUuid", void 0);
+__decorate([
+    BelongsTo(()=>Workout)
+], Exercise.prototype, "workout", void 0);
+Exercise = __decorate([
+    Table
+], Exercise);
+
+//# sourceMappingURL=Exercise.js.map

package/dist/lib/dbmodels/Exercise.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/Exercise.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  Index,\n  Model,\n  Table,\n} from \"sequelize-typescript\";\nimport { Workout } from \"./Workout\";\nimport type {Progress, ReducedExercise} from \"../models/ExerciseInterfaces\";\n\n@Table\nexport class Exercise extends Model<Exercise> implements ReducedExercise {\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.INTEGER, allowNull: false })\n  declare order: number;\n\n  @Column({ type: DataType.ARRAY(DataType.JSONB), allowNull: true })\n  declare progress: Progress[];\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare reps: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare sets: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare restTime: string;\n\n  @ForeignKey(() => Workout)\n  @Index\n  @Column({\n    type: DataType.UUID,\n    allowNull: true,\n  })\n  declare workoutUuid: string;\n\n  @BelongsTo(() => Workout)\n  declare workout: Workout;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","Index","Model","Table","Workout","Exercise","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","INTEGER","ARRAY","JSONB","TEXT"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,KAAK,EACLC,KAAK,EACLC,KAAK,QACA,uBAAuB;AAC9B,SAASC,OAAO,QAAQ,YAAY;AAIpC,WAAaC,WAAN,uBAAuBH;AAsC9B,EAAC;;IArCEH,QAAQD,SAASQ,MAAM;IACvBT,OAAO;QACNU,MAAMT,SAASU,IAAI;QACnBC,cAAcX,SAASU,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IAClB;GAPWN;;IAUVR,OAAO;QAAEU,MAAMT,SAASc,MAAM;QAAEF,WAAW,KAAK;IAAC;GAVvCL;;IAaVR,OAAO;QAAEU,MAAMT,SAASe,OAAO;QAAEH,WAAW,KAAK;IAAC;GAbxCL;;IAgBVR,OAAO;QAAEU,MAAMT,SAASgB,KAAK,CAAChB,SAASiB,KAAK;QAAGL,WAAW,IAAI;IAAC;GAhBrDL;;IAmBVR,OAAO;QAAEU,MAAMT,SAASkB,IAAI;QAAEN,WAAW,KAAK;IAAC;GAnBrCL;;IAsBVR,OAAO;QAAEU,MAAMT,SAASkB,IAAI;QAAEN,WAAW,KAAK;IAAC;GAtBrCL;;IAyBVR,OAAO;QAAEU,MAAMT,SAASkB,IAAI;QAAEN,WAAW,IAAI;IAAC;GAzBpCL;;IA4BVL,WAAW,IAAMI;IACjBH;IACAJ,OAAO;QACNU,MAAMT,SAASU,IAAI;QACnBE,WAAW,IAAI;IACjB;GAjCWL;;IAoCVT,UAAU,IAAMQ;GApCNC;AAAAA;IADZF;GACYE"}

package/dist/lib/dbmodels/Program.d.ts

@@ -0,0 +1,11 @@
+import { Workout } from "./Workout";
+import { Model } from "sequelize-typescript";
+export declare class Program extends Model<Program> {
+    programId: string;
+    userUuid: string;
+    workout: Workout[];
+    startDate: string;
+    programType: string;
+    createdAt: Date;
+    static deleteRelatedWorkouts(instance: Program): Promise<void>;
+}

package/dist/lib/dbmodels/Program.js

@@ -0,0 +1,65 @@
+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 { Workout } from "./Workout";
+import { BeforeDestroy, Column, DataType, Default, HasMany, Model, Table } from "sequelize-typescript";
+export let Program = class Program extends Model {
+    static async deleteRelatedWorkouts(instance) {
+        const workouts = await instance.$get("workout", {
+            scope: "workout"
+        });
+        for (const workout of workouts){
+            await workout.destroy();
+        }
+    }
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], Program.prototype, "programId", void 0);
+__decorate([
+    Column({
+        type: DataType.UUID,
+        allowNull: false
+    })
+], Program.prototype, "userUuid", void 0);
+__decorate([
+    HasMany(()=>Workout, {
+        foreignKey: "programId",
+        onDelete: "CASCADE"
+    })
+], Program.prototype, "workout", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Program.prototype, "startDate", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: true
+    })
+], Program.prototype, "programType", void 0);
+__decorate([
+    Column({
+        type: DataType.DATE,
+        allowNull: true
+    })
+], Program.prototype, "createdAt", void 0);
+__decorate([
+    BeforeDestroy
+], Program, "deleteRelatedWorkouts", null);
+Program = __decorate([
+    Table
+], Program);
+
+//# sourceMappingURL=Program.js.map

package/dist/lib/dbmodels/Program.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/Program.ts"],"sourcesContent":["import { Workout } from \"./Workout\";\nimport {\n  BeforeDestroy,\n  Column,\n  DataType,\n  Default,\n  HasMany,\n  Model,\n  Table,\n} from \"sequelize-typescript\";\n\n@Table\nexport class Program extends Model<Program> {\n  @Default(DataType.UUIDV4)\n  @Column({\n    type: DataType.UUID,\n    defaultValue: DataType.UUID,\n    allowNull: false,\n    primaryKey: true,\n  })\n  declare programId: string;\n\n  @Column({ type: DataType.UUID, allowNull: false })\n  declare userUuid: string;\n\n  @HasMany(() => Workout, { foreignKey: \"programId\", onDelete: \"CASCADE\" })\n  declare workout: Workout[];\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare startDate: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare programType: string;\n\n  @Column({ type: DataType.DATE, allowNull: true })\n  declare createdAt: Date;\n\n  @BeforeDestroy\n  static async deleteRelatedWorkouts(instance: Program) {\n    const workouts = await instance.$get(\"workout\", { scope: \"workout\" });\n\n    for (const workout of workouts) {\n      await workout.destroy();\n    }\n  }\n}\n"],"names":["Workout","BeforeDestroy","Column","DataType","Default","HasMany","Model","Table","Program","deleteRelatedWorkouts","instance","workouts","$get","scope","workout","destroy","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","foreignKey","onDelete","TEXT","DATE"],"mappings":";;;;;;AAAA,SAASA,OAAO,QAAQ,YAAY;AACpC,SACEC,aAAa,EACbC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,OAAO,EACPC,KAAK,EACLC,KAAK,QACA,uBAAuB;AAG9B,WAAaC,UAAN,sBAAsBF;IAyB3B,aACaG,sBAAsBC,QAAiB,EAAE;QACpD,MAAMC,WAAW,MAAMD,SAASE,IAAI,CAAC,WAAW;YAAEC,OAAO;QAAU;QAEnE,KAAK,MAAMC,WAAWH,SAAU;YAC9B,MAAMG,QAAQC,OAAO;QACvB;IACF;AACF,EAAC;;IAhCEX,QAAQD,SAASa,MAAM;IACvBd,OAAO;QACNe,MAAMd,SAASe,IAAI;QACnBC,cAAchB,SAASe,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IAClB;GAPWb;;IAUVN,OAAO;QAAEe,MAAMd,SAASe,IAAI;QAAEE,WAAW,KAAK;IAAC;GAVrCZ;;IAaVH,QAAQ,IAAML,SAAS;QAAEsB,YAAY;QAAaC,UAAU;IAAU;GAb5Df;;IAgBVN,OAAO;QAAEe,MAAMd,SAASqB,IAAI;QAAEJ,WAAW,KAAK;IAAC;GAhBrCZ;;IAmBVN,OAAO;QAAEe,MAAMd,SAASqB,IAAI;QAAEJ,WAAW,IAAI;IAAC;GAnBpCZ;;IAsBVN,OAAO;QAAEe,MAAMd,SAASsB,IAAI;QAAEL,WAAW,IAAI;IAAC;GAtBpCZ;;IAyBVP;GAzBUO;AAAAA;IADZD;GACYC"}

package/dist/lib/dbmodels/Superset.d.ts

@@ -0,0 +1,8 @@
+import { Model } from "sequelize-typescript";
+import type { ReducedExercise } from "../models/ExerciseInterfaces";
+export declare class Superset extends Model<Superset> {
+    uuid: string;
+    startPosition: number;
+    workoutUuid: string;
+    exercises: ReducedExercise[];
+}

package/dist/lib/dbmodels/Superset.js

@@ -0,0 +1,40 @@
+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, ForeignKey, Index, Model, Table } from "sequelize-typescript";
+import { Workout } from "./Workout";
+export let Superset = class Superset extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], Superset.prototype, "uuid", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], Superset.prototype, "startPosition", void 0);
+__decorate([
+    ForeignKey(()=>Workout),
+    Index
+], Superset.prototype, "workoutUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.ARRAY(DataType.JSONB),
+        allowNull: false
+    })
+], Superset.prototype, "exercises", void 0);
+Superset = __decorate([
+    Table
+], Superset);
+
+//# sourceMappingURL=Superset.js.map

package/dist/lib/dbmodels/Superset.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/Superset.ts"],"sourcesContent":["\nimport {Column, DataType, Default, ForeignKey, Index, Model, Table} from \"sequelize-typescript\";\nimport { Workout } from \"./Workout\";\nimport type {ReducedExercise} from \"../models/ExerciseInterfaces\";\n\n@Table\nexport class Superset extends Model<Superset> {\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.INTEGER, allowNull: false })\n    declare startPosition: number;\n\n    @ForeignKey(() => Workout)\n    @Index\n    declare workoutUuid: string;\n\n    @Column({ type: DataType.ARRAY(DataType.JSONB), allowNull: false })\n    declare exercises: ReducedExercise[];\n\n}\n"],"names":["Column","DataType","Default","ForeignKey","Index","Model","Table","Workout","Superset","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","INTEGER","ARRAY","JSONB"],"mappings":";;;;;;AACA,SAAQA,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,UAAU,EAAEC,KAAK,EAAEC,KAAK,EAAEC,KAAK,QAAO,uBAAuB;AAChG,SAASC,OAAO,QAAQ,YAAY;AAIpC,WAAaC,WAAN,uBAAuBH;AAoB9B,EAAC;;IAnBIH,QAAQD,SAASQ,MAAM;IACvBT,OAAO;QACJU,MAAMT,SAASU,IAAI;QACnBC,cAAcX,SAASU,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IACpB;GAPSN;;IAURR,OAAO;QAAEU,MAAMT,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GAV1CL;;IAaRL,WAAW,IAAMI;IACjBH;GAdQI;;IAiBRR,OAAO;QAAEU,MAAMT,SAASe,KAAK,CAACf,SAASgB,KAAK;QAAGJ,WAAW,KAAK;IAAC;GAjBxDL;AAAAA;IADZF;GACYE"}

package/dist/lib/dbmodels/UserBadges.d.ts

@@ -1,11 +1,14 @@
 import { Model } from "sequelize-typescript";
 import { Badge } from "./Badge";
 import { PersistedUser } from "./PersistedUser";
+import { Program } from "./Program";
 export declare class UserBadges extends Model {
     userUuid: string;
     badgeUuid: string;
+    programInstanceUuid?: string;
     timesEarned: number;
     hasBeenShown: boolean;
     user: PersistedUser;
     badge: Badge;
+    programInstance?: Program;
 }

package/dist/lib/dbmodels/UserBadges.js

@@ -7,6 +7,7 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
 import { BelongsTo, Column, DataType, ForeignKey, Model, Table } from "sequelize-typescript";
 import { Badge } from "./Badge";
 import { PersistedUser } from "./PersistedUser";
+import { Program } from "./Program";
 export let UserBadges = class UserBadges extends Model {
 };
 __decorate([
@@ -23,6 +24,13 @@ __decorate([
         allowNull: false
     })
 ], UserBadges.prototype, "badgeUuid", void 0);
+__decorate([
+    ForeignKey(()=>Program),
+    Column({
+        type: DataType.UUID,
+        allowNull: true
+    })
+], UserBadges.prototype, "programInstanceUuid", void 0);
 __decorate([
     Column({
         type: DataType.INTEGER,
@@ -43,6 +51,9 @@ __decorate([
 __decorate([
     BelongsTo(()=>Badge)
 ], UserBadges.prototype, "badge", void 0);
+__decorate([
+    BelongsTo(()=>Program)
+], UserBadges.prototype, "programInstance", void 0);
 UserBadges = __decorate([
     Table({
         timestamps: true

package/dist/lib/dbmodels/UserBadges.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/UserBadges.ts"],"sourcesContent":["import { BelongsTo, Column, DataType, ForeignKey, Model, Table } from \"sequelize-typescript\";\nimport { Badge } from \"./Badge\";\nimport { PersistedUser } from \"./PersistedUser\";\n\n@Table({\n    timestamps: true,\n})export class UserBadges extends Model {\n    @ForeignKey(() => PersistedUser)\n    @Column({\n        type: DataType.UUID,\n        allowNull: false,\n    })\n    declare userUuid: string;\n\n    @ForeignKey(() => Badge)\n    @Column({\n        type: DataType.UUID,\n        allowNull: false,\n    })\n    declare badgeUuid: string;\n\n    @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 1})\n    declare timesEarned: number;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false, defaultValue: false})\n    declare hasBeenShown: boolean;\n\n    @BelongsTo(() => PersistedUser)\n    declare user: PersistedUser;\n\n    @BelongsTo(() => Badge)\n    declare badge: Badge;\n}\n"],"names":["BelongsTo","Column","DataType","ForeignKey","Model","Table","Badge","PersistedUser","UserBadges","type","UUID","allowNull","INTEGER","defaultValue","BOOLEAN","timestamps"],"mappings":";;;;;;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,UAAU,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAC7F,SAASC,KAAK,QAAQ,UAAU;AAChC,SAASC,aAAa,QAAQ,kBAAkB;AAI9C,WAAaC,aAAN,yBAAyBJ;AA0BlC,EAAC;;IAzBID,WAAW,IAAMI;IACjBN,OAAO;QACJQ,MAAMP,SAASQ,IAAI;QACnBC,WAAW,KAAK;IACpB;GALWH;;IAQVL,WAAW,IAAMG;IACjBL,OAAO;QACJQ,MAAMP,SAASQ,IAAI;QACnBC,WAAW,KAAK;IACpB;GAZWH;;IAeVP,OAAO;QAAEQ,MAAMP,SAASU,OAAO;QAAED,WAAW,KAAK;QAAEE,cAAc;IAAC;GAfxDL;;IAkBVP,OAAO;QAAEQ,MAAMP,SAASY,OAAO;QAAEH,WAAW,KAAK;QAAEE,cAAc,KAAK;IAAA;GAlB5DL;;IAqBVR,UAAU,IAAMO;GArBNC;;IAwBVR,UAAU,IAAMM;GAxBNE;AAAAA;IAFdH,MAAM;QACHU,YAAY,IAAI;IACpB;GAAeP"}
+{"version":3,"sources":["../../../src/lib/dbmodels/UserBadges.ts"],"sourcesContent":["import { BelongsTo, Column, DataType, ForeignKey, Model, Table } from \"sequelize-typescript\";\nimport { Badge } from \"./Badge\";\nimport { PersistedUser } from \"./PersistedUser\";\nimport {Program} from \"./Program\";\n\n@Table({\n    timestamps: true,\n})export class UserBadges extends Model {\n    @ForeignKey(() => PersistedUser)\n    @Column({\n        type: DataType.UUID,\n        allowNull: false,\n    })\n    declare userUuid: string;\n\n    @ForeignKey(() => Badge)\n    @Column({\n        type: DataType.UUID,\n        allowNull: false,\n    })\n    declare badgeUuid: string;\n\n    @ForeignKey(() => Program)\n    @Column({\n        type: DataType.UUID,\n        allowNull: true,\n    })\n    declare programInstanceUuid?: string;\n\n\n    @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 1})\n    declare timesEarned: number;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false, defaultValue: false})\n    declare hasBeenShown: boolean;\n\n    @BelongsTo(() => PersistedUser)\n    declare user: PersistedUser;\n\n    @BelongsTo(() => Badge)\n    declare badge: Badge;\n\n    @BelongsTo(() => Program)\n    declare programInstance?: Program;\n}\n"],"names":["BelongsTo","Column","DataType","ForeignKey","Model","Table","Badge","PersistedUser","Program","UserBadges","type","UUID","allowNull","INTEGER","defaultValue","BOOLEAN","timestamps"],"mappings":";;;;;;AAAA,SAASA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,UAAU,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAC7F,SAASC,KAAK,QAAQ,UAAU;AAChC,SAASC,aAAa,QAAQ,kBAAkB;AAChD,SAAQC,OAAO,QAAO,YAAY;AAIhC,WAAaC,aAAN,yBAAyBL;AAqClC,EAAC;;IApCID,WAAW,IAAMI;IACjBN,OAAO;QACJS,MAAMR,SAASS,IAAI;QACnBC,WAAW,KAAK;IACpB;GALWH;;IAQVN,WAAW,IAAMG;IACjBL,OAAO;QACJS,MAAMR,SAASS,IAAI;QACnBC,WAAW,KAAK;IACpB;GAZWH;;IAeVN,WAAW,IAAMK;IACjBP,OAAO;QACJS,MAAMR,SAASS,IAAI;QACnBC,WAAW,IAAI;IACnB;GAnBWH;;IAuBVR,OAAO;QAAES,MAAMR,SAASW,OAAO;QAAED,WAAW,KAAK;QAAEE,cAAc;IAAC;GAvBxDL;;IA0BVR,OAAO;QAAES,MAAMR,SAASa,OAAO;QAAEH,WAAW,KAAK;QAAEE,cAAc,KAAK;IAAA;GA1B5DL;;IA6BVT,UAAU,IAAMO;GA7BNE;;IAgCVT,UAAU,IAAMM;GAhCNG;;IAmCVT,UAAU,IAAMQ;GAnCNC;AAAAA;IAFdJ,MAAM;QACHW,YAAY,IAAI;IACpB;GAAeP"}

package/dist/lib/dbmodels/Workout.d.ts

@@ -0,0 +1,13 @@
+import { Superset } from './Superset';
+import { Model } from 'sequelize-typescript';
+import { Exercise } from "./Exercise";
+export declare class Workout extends Model<Workout> {
+    uuid: string;
+    isFinished: boolean;
+    title: string;
+    duration: string;
+    order: number;
+    exercise: Exercise[];
+    superset: Superset[];
+    programId: string;
+}

package/dist/lib/dbmodels/Workout.js

@@ -0,0 +1,66 @@
+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 { Superset } from "./Superset";
+import { Column, DataType, Default, ForeignKey, HasMany, Index, Model, Table } from "sequelize-typescript";
+import { Program } from "./Program";
+import { Exercise } from "./Exercise";
+export let Workout = class Workout extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], Workout.prototype, "uuid", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false
+    })
+], Workout.prototype, "isFinished", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Workout.prototype, "title", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Workout.prototype, "duration", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: true
+    })
+], Workout.prototype, "order", void 0);
+__decorate([
+    HasMany(()=>Exercise, {
+        foreignKey: 'workoutUuid',
+        onDelete: 'CASCADE'
+    })
+], Workout.prototype, "exercise", void 0);
+__decorate([
+    HasMany(()=>Superset, {
+        foreignKey: 'workoutUuid',
+        onDelete: 'CASCADE'
+    })
+], Workout.prototype, "superset", void 0);
+__decorate([
+    ForeignKey(()=>Program),
+    Index
+], Workout.prototype, "programId", void 0);
+Workout = __decorate([
+    Table
+], Workout);
+
+//# sourceMappingURL=Workout.js.map

package/dist/lib/dbmodels/Workout.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/Workout.ts"],"sourcesContent":["import { Superset } from './Superset';\nimport {\n\tColumn,\n\tDataType,\n\tDefault,\n\tForeignKey,\n\tHasMany, Index,\n\tModel,\n\tTable\n} from 'sequelize-typescript';\nimport { Program } from './Program';\nimport {Exercise} from \"./Exercise\";\n\n@Table\nexport class Workout extends Model<Workout> {\n\t@Default(DataType.UUIDV4)\n\t@Column({\n\t\ttype: DataType.UUID,\n\t\tdefaultValue: DataType.UUID,\n\t\tallowNull: false,\n\t\tprimaryKey: true\n\t})\n\tdeclare uuid: string;\n\n\t@Column({ type: DataType.BOOLEAN, allowNull: false })\n\tdeclare isFinished: boolean;\n\n\t@Column({ type: DataType.TEXT, allowNull: false })\n\tdeclare title: string;\n\n\t@Column({ type: DataType.TEXT, allowNull: false })\n\tdeclare duration: string;\n\n\t@Column({ type: DataType.INTEGER, allowNull: true })\n\tdeclare order: number;\n\n\t@HasMany(() => Exercise, { foreignKey: 'workoutUuid', onDelete: 'CASCADE' })\n\tdeclare exercise: Exercise[];\n\n\t@HasMany(() => Superset, { foreignKey: 'workoutUuid', onDelete: 'CASCADE' })\n\tdeclare superset: Superset[];\n\n\t@ForeignKey(() => Program)\n\t@Index\n\tdeclare programId: string;\n}\n"],"names":["Superset","Column","DataType","Default","ForeignKey","HasMany","Index","Model","Table","Program","Exercise","Workout","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","BOOLEAN","TEXT","INTEGER","foreignKey","onDelete"],"mappings":";;;;;;AAAA,SAASA,QAAQ,QAAQ,aAAa;AACtC,SACCC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,OAAO,EAAEC,KAAK,EACdC,KAAK,EACLC,KAAK,QACC,uBAAuB;AAC9B,SAASC,OAAO,QAAQ,YAAY;AACpC,SAAQC,QAAQ,QAAO,aAAa;AAGpC,WAAaC,UAAN,sBAAsBJ;AA+B7B,EAAC;;IA9BCJ,QAAQD,SAASU,MAAM;IACvBX,OAAO;QACPY,MAAMX,SAASY,IAAI;QACnBC,cAAcb,SAASY,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IACjB;GAPYN;;IAUXV,OAAO;QAAEY,MAAMX,SAASgB,OAAO;QAAEF,WAAW,KAAK;IAAC;GAVvCL;;IAaXV,OAAO;QAAEY,MAAMX,SAASiB,IAAI;QAAEH,WAAW,KAAK;IAAC;GAbpCL;;IAgBXV,OAAO;QAAEY,MAAMX,SAASiB,IAAI;QAAEH,WAAW,KAAK;IAAC;GAhBpCL;;IAmBXV,OAAO;QAAEY,MAAMX,SAASkB,OAAO;QAAEJ,WAAW,IAAI;IAAC;GAnBtCL;;IAsBXN,QAAQ,IAAMK,UAAU;QAAEW,YAAY;QAAeC,UAAU;IAAU;GAtB9DX;;IAyBXN,QAAQ,IAAML,UAAU;QAAEqB,YAAY;QAAeC,UAAU;IAAU;GAzB9DX;;IA4BXP,WAAW,IAAMK;IACjBH;GA7BWK;AAAAA;IADZH;GACYG"}

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

@@ -1,36 +1,21 @@
-import type { ProgramBlueprint } from "./BlueprintInterfaces";
-export interface ExerciseModel {
-    uuid: string;
-    name: string;
-    level: string[];
-    isCompound: boolean;
-    needsEquipment: boolean;
-    hasPriority: boolean;
-    hasVariations: boolean;
-    variations: object;
-    muscles: string[];
-    homeWorkout: boolean;
+export type ProgramTypes = "BodyweightHomeWorkout" | "BodyweightOnlyBodyweight" | "BodyweightWeightedCali" | "Weights" | "Both";
+export interface GraphProgress extends Progress {
+    date: string;
 }
-export interface ExerciseProgressRequest {
-    exerciseUuid: string;
-    reps: string;
-    weight: string;
+export interface Progress {
+    [key: string]: number | string | undefined;
 }
-export interface ExerciseProgressGetRequest {
-    exerciseUuid: string;
+export interface ExerciseOptions {
+    sets: string;
+    reps: string;
+    order: number;
 }
-export interface ExerciseBlueprint {
+export interface ReducedExercise {
     uuid: string;
-    hasPriority: boolean;
-    isCompound: boolean;
-    homeWorkout: boolean;
-    needsEquipment: boolean;
-    isSuperset: boolean;
-    isFixed: boolean;
-    muscle: string;
-    rir: number;
+    name: string;
     order: number;
-    reps: string;
+    progress: Progress[];
     sets: string;
-    program: ProgramBlueprint;
+    reps: string;
+    restTime?: string;
 }

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/models/ExerciseInterfaces.ts"],"sourcesContent":["import type { ProgramBlueprint } from \"./BlueprintInterfaces\";\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}\nexport interface ExerciseProgressRequest {\n    exerciseUuid: string;\n    reps: string;\n    weight: string;\n}\nexport interface ExerciseProgressGetRequest {\n    exerciseUuid: string;\n}\nexport interface ExerciseBlueprint {\n    uuid: string;\n    hasPriority: boolean;\n    isCompound: boolean;\n    homeWorkout: boolean;\n    needsEquipment: boolean;\n    isSuperset: boolean;\n    isFixed: boolean;\n    muscle: string;\n    rir: number;\n    order: number;\n    reps: string;\n    sets: string;\n    program: ProgramBlueprint;\n}\n"],"names":[],"mappings":"AAAA,WAoCC"}
+{"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"}

package/package.json

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

package/src/index.ts

@@ -10,6 +10,10 @@ export * from "./lib/dbmodels/PersistedUser"
 export * from "./lib/dbmodels/UserBadges"
 export * from "./lib/dbmodels/UserStreaks"
 export * from "./lib/dbmodels/Badge"
+export * from "./lib/dbmodels/Program"
+export * from "./lib/dbmodels/Workout"
+export * from "./lib/dbmodels/Exercise"
+export * from "./lib/dbmodels/Superset"
 
 //Utils
 export * from "./lib/utils/Logger"

package/src/lib/dbmodels/Badge.ts

@@ -16,7 +16,7 @@ export class Badge extends Model {
     @Column({ type: DataType.TEXT, allowNull: false })
     declare title: string;
 
-    @Column({ type: DataType.ARRAY(DataType.STRING), allowNull: false })
+    @Column({ type: DataType.ARRAY(DataType.TEXT), allowNull: false })
     declare tags: string;
 
     @Column({ type: DataType.TEXT, allowNull: false })

package/src/lib/dbmodels/Exercise.ts

@@ -0,0 +1,53 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  Default,
+  ForeignKey,
+  Index,
+  Model,
+  Table,
+} from "sequelize-typescript";
+import { Workout } from "./Workout";
+import type {Progress, ReducedExercise} from "../models/ExerciseInterfaces";
+
+@Table
+export class Exercise extends Model<Exercise> implements ReducedExercise {
+  @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.INTEGER, allowNull: false })
+  declare order: number;
+
+  @Column({ type: DataType.ARRAY(DataType.JSONB), allowNull: true })
+  declare progress: Progress[];
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare reps: string;
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare sets: string;
+
+  @Column({ type: DataType.TEXT, allowNull: true })
+  declare restTime: string;
+
+  @ForeignKey(() => Workout)
+  @Index
+  @Column({
+    type: DataType.UUID,
+    allowNull: true,
+  })
+  declare workoutUuid: string;
+
+  @BelongsTo(() => Workout)
+  declare workout: Workout;
+}

package/src/lib/dbmodels/Program.ts

@@ -0,0 +1,46 @@
+import { Workout } from "./Workout";
+import {
+  BeforeDestroy,
+  Column,
+  DataType,
+  Default,
+  HasMany,
+  Model,
+  Table,
+} from "sequelize-typescript";
+
+@Table
+export class Program extends Model<Program> {
+  @Default(DataType.UUIDV4)
+  @Column({
+    type: DataType.UUID,
+    defaultValue: DataType.UUID,
+    allowNull: false,
+    primaryKey: true,
+  })
+  declare programId: string;
+
+  @Column({ type: DataType.UUID, allowNull: false })
+  declare userUuid: string;
+
+  @HasMany(() => Workout, { foreignKey: "programId", onDelete: "CASCADE" })
+  declare workout: Workout[];
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare startDate: string;
+
+  @Column({ type: DataType.TEXT, allowNull: true })
+  declare programType: string;
+
+  @Column({ type: DataType.DATE, allowNull: true })
+  declare createdAt: Date;
+
+  @BeforeDestroy
+  static async deleteRelatedWorkouts(instance: Program) {
+    const workouts = await instance.$get("workout", { scope: "workout" });
+
+    for (const workout of workouts) {
+      await workout.destroy();
+    }
+  }
+}

package/src/lib/dbmodels/Superset.ts

@@ -0,0 +1,27 @@
+
+import {Column, DataType, Default, ForeignKey, Index, Model, Table} from "sequelize-typescript";
+import { Workout } from "./Workout";
+import type {ReducedExercise} from "../models/ExerciseInterfaces";
+
+@Table
+export class Superset extends Model<Superset> {
+    @Default(DataType.UUIDV4)
+    @Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true,
+    })
+    declare uuid: string;
+
+    @Column({ type: DataType.INTEGER, allowNull: false })
+    declare startPosition: number;
+
+    @ForeignKey(() => Workout)
+    @Index
+    declare workoutUuid: string;
+
+    @Column({ type: DataType.ARRAY(DataType.JSONB), allowNull: false })
+    declare exercises: ReducedExercise[];
+
+}

package/src/lib/dbmodels/UserBadges.ts

@@ -1,6 +1,7 @@
 import { BelongsTo, Column, DataType, ForeignKey, Model, Table } from "sequelize-typescript";
 import { Badge } from "./Badge";
 import { PersistedUser } from "./PersistedUser";
+import {Program} from "./Program";
 
 @Table({
     timestamps: true,
@@ -19,6 +20,14 @@ import { PersistedUser } from "./PersistedUser";
     })
     declare badgeUuid: string;
 
+    @ForeignKey(() => Program)
+    @Column({
+        type: DataType.UUID,
+        allowNull: true,
+    })
+    declare programInstanceUuid?: string;
+
+
     @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 1})
     declare timesEarned: number;
 
@@ -30,4 +39,7 @@ import { PersistedUser } from "./PersistedUser";
 
     @BelongsTo(() => Badge)
     declare badge: Badge;
+
+    @BelongsTo(() => Program)
+    declare programInstance?: Program;
 }

package/src/lib/dbmodels/Workout.ts

@@ -0,0 +1,46 @@
+import { Superset } from './Superset';
+import {
+	Column,
+	DataType,
+	Default,
+	ForeignKey,
+	HasMany, Index,
+	Model,
+	Table
+} from 'sequelize-typescript';
+import { Program } from './Program';
+import {Exercise} from "./Exercise";
+
+@Table
+export class Workout extends Model<Workout> {
+	@Default(DataType.UUIDV4)
+	@Column({
+		type: DataType.UUID,
+		defaultValue: DataType.UUID,
+		allowNull: false,
+		primaryKey: true
+	})
+	declare uuid: string;
+
+	@Column({ type: DataType.BOOLEAN, allowNull: false })
+	declare isFinished: boolean;
+
+	@Column({ type: DataType.TEXT, allowNull: false })
+	declare title: string;
+
+	@Column({ type: DataType.TEXT, allowNull: false })
+	declare duration: string;
+
+	@Column({ type: DataType.INTEGER, allowNull: true })
+	declare order: number;
+
+	@HasMany(() => Exercise, { foreignKey: 'workoutUuid', onDelete: 'CASCADE' })
+	declare exercise: Exercise[];
+
+	@HasMany(() => Superset, { foreignKey: 'workoutUuid', onDelete: 'CASCADE' })
+	declare superset: Superset[];
+
+	@ForeignKey(() => Program)
+	@Index
+	declare programId: string;
+}

package/src/lib/models/ExerciseInterfaces.ts

@@ -1,37 +1,27 @@
-import type { ProgramBlueprint } from "./BlueprintInterfaces";
+export type ProgramTypes =
+  | "BodyweightHomeWorkout"
+  | "BodyweightOnlyBodyweight"
+  | "BodyweightWeightedCali"
+  | "Weights"
+  | "Both";
 
-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 GraphProgress extends Progress {
+  date: string;
 }
-export interface ExerciseProgressRequest {
-    exerciseUuid: string;
-    reps: string;
-    weight: string;
+export interface Progress {
+  [key: string]: number | string | undefined;
 }
-export interface ExerciseProgressGetRequest {
-    exerciseUuid: string;
+export interface ExerciseOptions {
+  sets: string;
+  reps: string;
+  order: number;
 }
-export interface ExerciseBlueprint {
-    uuid: string;
-    hasPriority: boolean;
-    isCompound: boolean;
-    homeWorkout: boolean;
-    needsEquipment: boolean;
-    isSuperset: boolean;
-    isFixed: boolean;
-    muscle: string;
-    rir: number;
-    order: number;
-    reps: string;
-    sets: string;
-    program: ProgramBlueprint;
+export interface ReducedExercise {
+  uuid: string;
+  name: string;
+  order: number;
+  progress: Progress[];
+  sets: string;
+  reps: string;
+  restTime?: string;
 }