90dc-core 1.9.5 → 1.9.7

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

@@ -30,6 +30,10 @@ export declare class PersistedUser extends Model {
     utilityEmailConfirmed: boolean;
     changeEmail: boolean;
     changeUtilityEmail: boolean;
+    totalXp: number;
+    weeklyXp: number;
+    monthlyXp: number;
+    country?: string;
     subscription: Subscription;
     nonConsumablePrograms: NonConsumableProgram[];
     coachUuid?: string;

package/dist/lib/dbmodels/PersistedUser.js

@@ -183,6 +183,33 @@ __decorate([
         allowNull: true
     })
 ], PersistedUser.prototype, "changeUtilityEmail", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false,
+        defaultValue: 0
+    })
+], PersistedUser.prototype, "totalXp", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false,
+        defaultValue: 0
+    })
+], PersistedUser.prototype, "weeklyXp", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false,
+        defaultValue: 0
+    })
+], PersistedUser.prototype, "monthlyXp", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: true
+    })
+], PersistedUser.prototype, "country", void 0);
 __decorate([
     HasOne(()=>Subscription)
 ], PersistedUser.prototype, "subscription", void 0);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/PersistedUser.ts"],"sourcesContent":["import {\n  BelongsTo,\n  BelongsToMany,\n  Column,\n  DataType,\n  Default,\n  HasMany,\n  HasOne,\n  Index,\n  Model,\n  Table\n} from \"sequelize-typescript\";\nimport  { Subscription } from \"./Subscription\";\nimport {UserPrograms} from \"./nonconsprogram/UserNonConsumableProgram\";\nimport {NonConsumableProgram} from \"./nonconsprogram/NonConsumableProgram\";\n\n@Table\nexport class PersistedUser extends Model {\n\n  @Default(DataType.UUIDV4)\n  @Column({\n    type: DataType.UUID,\n    defaultValue: DataType.UUID,\n    allowNull: false,\n    primaryKey: true\n  })\n  declare userUuid: string;\n\n  @Index\n  @Column({ type: DataType.TEXT, allowNull: false, unique: false })\n  declare email: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare password: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare firstName?: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare lastName?: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare avatar: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare sex: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare goal: string;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare isFreeVersion: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare allowsEmail: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare gotParentalConsent: boolean;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare weightGoal: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare role: 'default' | 'admin';\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare level: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare type: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare days: number;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare dateOfBirth: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare metricSystem: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare height: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare weight: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare activeProgramId: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare registrationDate: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare registrationService: 'apple' | 'google' | 'facebook' | 'native';\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare utilityEmail: string;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare emailConfirmed: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare utilityEmailConfirmed: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare changeEmail: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare changeUtilityEmail: boolean;\n\n  @HasOne(() => Subscription)\n  declare subscription: Subscription;\n\n  @BelongsToMany(() => NonConsumableProgram, { through: () => UserPrograms })\n  declare nonConsumablePrograms: NonConsumableProgram[];\n\n  @Column({ type: DataType.UUID, allowNull: true })\n  declare coachUuid?: string;\n\n  @BelongsTo(() => PersistedUser, 'coachUuid')\n  declare coach?: PersistedUser;\n\n  @HasMany(() => PersistedUser, 'coachUuid')\n  declare clients?: PersistedUser[];\n}\n"],"names":["BelongsTo","BelongsToMany","Column","DataType","Default","HasMany","HasOne","Index","Model","Table","Subscription","UserPrograms","NonConsumableProgram","PersistedUser","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","unique","BOOLEAN","through"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/dbmodels/PersistedUser.ts"],"sourcesContent":["import {\n  BelongsTo,\n  BelongsToMany,\n  Column,\n  DataType,\n  Default,\n  HasMany,\n  HasOne,\n  Index,\n  Model,\n  Table\n} from \"sequelize-typescript\";\nimport  { Subscription } from \"./Subscription\";\nimport {UserPrograms} from \"./nonconsprogram/UserNonConsumableProgram\";\nimport {NonConsumableProgram} from \"./nonconsprogram/NonConsumableProgram\";\n\n@Table\nexport class PersistedUser extends Model {\n\n  @Default(DataType.UUIDV4)\n  @Column({\n    type: DataType.UUID,\n    defaultValue: DataType.UUID,\n    allowNull: false,\n    primaryKey: true\n  })\n  declare userUuid: string;\n\n  @Index\n  @Column({ type: DataType.TEXT, allowNull: false, unique: false })\n  declare email: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare password: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare firstName?: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare lastName?: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare avatar: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare sex: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare goal: string;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare isFreeVersion: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare allowsEmail: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare gotParentalConsent: boolean;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare weightGoal: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare role: 'default' | 'admin';\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare level: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare type: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare days: number;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare dateOfBirth: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare metricSystem: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare height: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare weight: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare activeProgramId: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare registrationDate: string;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare registrationService: 'apple' | 'google' | 'facebook' | 'native';\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare utilityEmail: string;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare emailConfirmed: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare utilityEmailConfirmed: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare changeEmail: boolean;\n\n  @Column({ type: DataType.BOOLEAN, allowNull: true })\n  declare changeUtilityEmail: boolean;\n\n  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })\n  declare totalXp: number;\n\n  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })\n  declare weeklyXp: number;\n\n  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })\n  declare monthlyXp: number;\n\n  @Column({ type: DataType.TEXT, allowNull: true })\n  declare country?: string;\n\n  @HasOne(() => Subscription)\n  declare subscription: Subscription;\n\n  @BelongsToMany(() => NonConsumableProgram, { through: () => UserPrograms })\n  declare nonConsumablePrograms: NonConsumableProgram[];\n\n  @Column({ type: DataType.UUID, allowNull: true })\n  declare coachUuid?: string;\n\n  @BelongsTo(() => PersistedUser, 'coachUuid')\n  declare coach?: PersistedUser;\n\n  @HasMany(() => PersistedUser, 'coachUuid')\n  declare clients?: PersistedUser[];\n}\n"],"names":["BelongsTo","BelongsToMany","Column","DataType","Default","HasMany","HasOne","Index","Model","Table","Subscription","UserPrograms","NonConsumableProgram","PersistedUser","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","unique","BOOLEAN","INTEGER","through"],"mappings":"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"}

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

@@ -1,6 +1,10 @@
 import { Model } from "sequelize-typescript";
+import { PersistedUser } from "./PersistedUser.js";
 export declare class UsersFriends extends Model {
-    userId: string;
-    friendId: string;
-    createDate: Date;
+    userUuid: string;
+    friendUuid: string;
+    status: 'pending' | 'accepted' | 'rejected';
+    createdAt: Date;
+    user: PersistedUser;
+    friend: PersistedUser;
 }

package/dist/lib/dbmodels/UsersFriends.js

@@ -4,7 +4,8 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     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, Model, Table } from "sequelize-typescript";
+import { BelongsTo, Column, DataType, Model, Table } from "sequelize-typescript";
+import { PersistedUser } from "./PersistedUser.js";
 export let UsersFriends = class UsersFriends extends Model {
 };
 __decorate([
@@ -12,19 +13,32 @@ __decorate([
         type: DataType.UUID,
         allowNull: false
     })
-], UsersFriends.prototype, "userId", void 0);
+], UsersFriends.prototype, "userUuid", void 0);
 __decorate([
     Column({
         type: DataType.UUID,
         allowNull: false
     })
-], UsersFriends.prototype, "friendId", void 0);
+], UsersFriends.prototype, "friendUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.ENUM('pending', 'accepted', 'rejected'),
+        defaultValue: 'pending'
+    })
+], UsersFriends.prototype, "status", void 0);
 __decorate([
     Column({
         type: DataType.DATE,
-        allowNull: false
+        allowNull: false,
+        defaultValue: DataType.NOW
     })
-], UsersFriends.prototype, "createDate", void 0);
+], UsersFriends.prototype, "createdAt", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser, 'userUuid')
+], UsersFriends.prototype, "user", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser, 'friendUuid')
+], UsersFriends.prototype, "friend", void 0);
 UsersFriends = __decorate([
     Table
 ], UsersFriends);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/UsersFriends.ts"],"sourcesContent":["import { Column, DataType, Model, Table } from \"sequelize-typescript\";\n\n@Table\nexport class UsersFriends extends Model {\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n  })\n  declare userId: string;\n\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n  })\n  declare friendId: string;\n\n  @Column({ type: DataType.DATE, allowNull: false })\n  declare createDate: Date;\n}\n"],"names":["Column","DataType","Model","Table","UsersFriends","type","UUID","allowNull","DATE"],"mappings":";;;;;;AAAA,SAASA,MAAM,EAAEC,QAAQ,EAAEC,KAAK,EAAEC,KAAK,QAAQ,uBAAuB;AAGtE,WAAaC,eAAN,2BAA2BF;AAelC,EAAC;;IAdEF,OAAO;QACNK,MAAMJ,SAASK,IAAI;QACnBC,WAAW,KAAK;IAClB;GAJWH;;IAOVJ,OAAO;QACNK,MAAMJ,SAASK,IAAI;QACnBC,WAAW,KAAK;IAClB;GAVWH;;IAaVJ,OAAO;QAAEK,MAAMJ,SAASO,IAAI;QAAED,WAAW,KAAK;IAAC;GAbrCH;AAAAA;IADZD;GACYC"}
+{"version":3,"sources":["../../../src/lib/dbmodels/UsersFriends.ts"],"sourcesContent":["import {BelongsTo, Column, DataType, Model, Table} from \"sequelize-typescript\";\nimport {PersistedUser} from \"./PersistedUser.js\";\n\n@Table\nexport class UsersFriends extends Model {\n  @Column({ type: DataType.UUID, allowNull: false })\n  declare userUuid: string;\n\n  @Column({ type: DataType.UUID, allowNull: false })\n  declare friendUuid: string;\n\n  @Column({ type: DataType.ENUM('pending', 'accepted', 'rejected'), defaultValue: 'pending' })\n  declare status: 'pending' | 'accepted' | 'rejected';\n\n  @Column({ type: DataType.DATE, allowNull: false, defaultValue: DataType.NOW })\n  declare createdAt: Date;\n\n  @BelongsTo(() => PersistedUser, 'userUuid')\n  declare user: PersistedUser;\n\n  @BelongsTo(() => PersistedUser, 'friendUuid')\n  declare friend: PersistedUser;\n\n}\n"],"names":["BelongsTo","Column","DataType","Model","Table","PersistedUser","UsersFriends","type","UUID","allowNull","ENUM","defaultValue","DATE","NOW"],"mappings":";;;;;;AAAA,SAAQA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,KAAK,EAAEC,KAAK,QAAO,uBAAuB;AAC/E,SAAQC,aAAa,QAAO,qBAAqB;AAGjD,WAAaC,eAAN,2BAA2BH;AAmBlC,EAAC;;IAlBEF,OAAO;QAAEM,MAAML,SAASM,IAAI;QAAEC,WAAW,KAAK;IAAC;GADrCH;;IAIVL,OAAO;QAAEM,MAAML,SAASM,IAAI;QAAEC,WAAW,KAAK;IAAC;GAJrCH;;IAOVL,OAAO;QAAEM,MAAML,SAASQ,IAAI,CAAC,WAAW,YAAY;QAAaC,cAAc;IAAU;GAP/EL;;IAUVL,OAAO;QAAEM,MAAML,SAASU,IAAI;QAAEH,WAAW,KAAK;QAAEE,cAAcT,SAASW,GAAG;IAAC;GAVjEP;;IAaVN,UAAU,IAAMK,eAAe;GAbrBC;;IAgBVN,UAAU,IAAMK,eAAe;GAhBrBC;AAAAA;IADZF;GACYE"}

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

@@ -3,8 +3,10 @@ import { RestDay } from "./RestDay.js";
 import { ChallengeBlueprint } from "./ChallengeBlueprint.js";
 import { CustomStrengthTest } from "./CustomStrengthTest.js";
 import { CustomWorkoutBlueprint } from "./CustomWorkoutBlueprint.js";
+import { PersistedUser } from "../PersistedUser.js";
 export declare class CustomProgramBlueprint extends Model {
     uuid: string;
+    createdBy: string;
     title: string;
     level: string;
     numberOfDays: number;
@@ -12,4 +14,5 @@ export declare class CustomProgramBlueprint extends Model {
     restDays: RestDay[];
     challenges: ChallengeBlueprint[];
     strengthTests: CustomStrengthTest[];
+    user: PersistedUser;
 }

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

@@ -4,11 +4,12 @@ var __decorate = this && this.__decorate || function(decorators, target, key, de
     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 { BelongsTo, Column, DataType, Default, ForeignKey, HasMany, Model, Table } from "sequelize-typescript";
 import { RestDay } from "./RestDay.js";
 import { ChallengeBlueprint } from "./ChallengeBlueprint.js";
 import { CustomStrengthTest } from "./CustomStrengthTest.js";
 import { CustomWorkoutBlueprint } from "./CustomWorkoutBlueprint.js";
+import { PersistedUser } from "../PersistedUser.js";
 export let CustomProgramBlueprint = class CustomProgramBlueprint extends Model {
 };
 __decorate([
@@ -20,6 +21,13 @@ __decorate([
         primaryKey: true
     })
 ], CustomProgramBlueprint.prototype, "uuid", void 0);
+__decorate([
+    ForeignKey(()=>PersistedUser),
+    Column({
+        type: DataType.UUID,
+        allowNull: true
+    })
+], CustomProgramBlueprint.prototype, "createdBy", void 0);
 __decorate([
     Column({
         type: DataType.STRING,
@@ -59,6 +67,9 @@ __decorate([
         foreignKey: "blueprintUuid"
     })
 ], CustomProgramBlueprint.prototype, "strengthTests", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser)
+], CustomProgramBlueprint.prototype, "user", void 0);
 CustomProgramBlueprint = __decorate([
     Table
 ], CustomProgramBlueprint);

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/dbmodels/program/CustomProgramBlueprint.ts"],"sourcesContent":["import {\n    Column,\n    DataType,\n    Default,\n    HasMany, Index,\n    Model,\n    Table,\n} from \"sequelize-typescript\";\nimport {RestDay} from \"./RestDay.js\";\nimport {ChallengeBlueprint} from \"./ChallengeBlueprint.js\";\nimport {CustomStrengthTest} from \"./CustomStrengthTest.js\";\nimport {CustomWorkoutBlueprint} from \"./CustomWorkoutBlueprint.js\";\n\n@Table\nexport class CustomProgramBlueprint 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.STRING, allowNull: false, unique: true })\n    declare title: string;\n\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare level: string;\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare numberOfDays: number;\n\n    @HasMany(() => CustomWorkoutBlueprint, { foreignKey: \"blueprintUuid\" })\n    declare workouts: CustomWorkoutBlueprint[];\n\n    @HasMany(() => RestDay, { foreignKey: \"blueprintUuid\" })\n    declare restDays: RestDay[];\n\n    @HasMany(() => ChallengeBlueprint, { foreignKey: \"blueprintUuid\" })\n    declare challenges: ChallengeBlueprint[];\n\n    @HasMany(() => CustomStrengthTest, { foreignKey: \"blueprintUuid\" })\n    declare strengthTests: CustomStrengthTest[];\n}\n"],"names":["Column","DataType","Default","HasMany","Model","Table","RestDay","ChallengeBlueprint","CustomStrengthTest","CustomWorkoutBlueprint","CustomProgramBlueprint","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","unique","INTEGER","foreignKey"],"mappings":";;;;;;AAAA,SACIA,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,OAAO,EACPC,KAAK,EACLC,KAAK,QACF,uBAAuB;AAC9B,SAAQC,OAAO,QAAO,eAAe;AACrC,SAAQC,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,sBAAsB,QAAO,8BAA8B;AAGnE,WAAaC,yBAAN,qCAAqCN;AA8B5C,EAAC;;IA7BIF,QAAQD,SAASU,MAAM;IACvBX,OAAO;QACJY,MAAMX,SAASY,IAAI;QACnBC,cAAcb,SAASY,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IACpB;GAPSN;;IAURV,OAAO;QAAEY,MAAMX,SAASgB,MAAM;QAAEF,WAAW,KAAK;QAAEG,QAAQ,IAAI;IAAC;GAVvDR;;IAaRV,OAAO;QAAEY,MAAMX,SAASgB,MAAM;QAAEF,WAAW,KAAK;IAAC;GAbzCL;;IAgBRV,OAAO;QAAEY,MAAMX,SAASkB,OAAO;QAAEJ,WAAW,KAAK;IAAC;GAhB1CL;;IAmBRP,QAAQ,IAAMM,wBAAwB;QAAEW,YAAY;IAAgB;GAnB5DV;;IAsBRP,QAAQ,IAAMG,SAAS;QAAEc,YAAY;IAAgB;GAtB7CV;;IAyBRP,QAAQ,IAAMI,oBAAoB;QAAEa,YAAY;IAAgB;GAzBxDV;;IA4BRP,QAAQ,IAAMK,oBAAoB;QAAEY,YAAY;IAAgB;GA5BxDV;AAAAA;IADZL;GACYK"}
+{"version":3,"sources":["../../../../src/lib/dbmodels/program/CustomProgramBlueprint.ts"],"sourcesContent":["import {\n    BelongsTo,\n    Column,\n    DataType,\n    Default, ForeignKey,\n    HasMany, Index,\n    Model,\n    Table,\n} from \"sequelize-typescript\";\nimport {RestDay} from \"./RestDay.js\";\nimport {ChallengeBlueprint} from \"./ChallengeBlueprint.js\";\nimport {CustomStrengthTest} from \"./CustomStrengthTest.js\";\nimport {CustomWorkoutBlueprint} from \"./CustomWorkoutBlueprint.js\";\nimport {PersistedUser} from \"../PersistedUser.js\";\n\n@Table\nexport class CustomProgramBlueprint 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    @ForeignKey(() => PersistedUser)\n    @Column({\n        type: DataType.UUID,\n        allowNull: true,\n    })\n    declare createdBy: string;\n\n    @Column({ type: DataType.STRING, allowNull: false, unique: true })\n    declare title: string;\n\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare level: string;\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare numberOfDays: number;\n\n    @HasMany(() => CustomWorkoutBlueprint, { foreignKey: \"blueprintUuid\" })\n    declare workouts: CustomWorkoutBlueprint[];\n\n    @HasMany(() => RestDay, { foreignKey: \"blueprintUuid\" })\n    declare restDays: RestDay[];\n\n    @HasMany(() => ChallengeBlueprint, { foreignKey: \"blueprintUuid\" })\n    declare challenges: ChallengeBlueprint[];\n\n    @HasMany(() => CustomStrengthTest, { foreignKey: \"blueprintUuid\" })\n    declare strengthTests: CustomStrengthTest[];\n\n    @BelongsTo(() => PersistedUser)\n    declare user: PersistedUser;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","HasMany","Model","Table","RestDay","ChallengeBlueprint","CustomStrengthTest","CustomWorkoutBlueprint","PersistedUser","CustomProgramBlueprint","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","STRING","unique","INTEGER","foreignKey"],"mappings":";;;;;;AAAA,SACIA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EAAEC,UAAU,EACnBC,OAAO,EACPC,KAAK,EACLC,KAAK,QACF,uBAAuB;AAC9B,SAAQC,OAAO,QAAO,eAAe;AACrC,SAAQC,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,kBAAkB,QAAO,0BAA0B;AAC3D,SAAQC,sBAAsB,QAAO,8BAA8B;AACnE,SAAQC,aAAa,QAAO,sBAAsB;AAGlD,WAAaC,yBAAN,qCAAqCP;AAwC5C,EAAC;;IAvCIH,QAAQD,SAASY,MAAM;IACvBb,OAAO;QACJc,MAAMb,SAASc,IAAI;QACnBC,cAAcf,SAASc,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IACpB;GAPSN;;IAURT,WAAW,IAAMQ;IACjBX,OAAO;QACJc,MAAMb,SAASc,IAAI;QACnBE,WAAW,IAAI;IACnB;GAdSL;;IAiBRZ,OAAO;QAAEc,MAAMb,SAASkB,MAAM;QAAEF,WAAW,KAAK;QAAEG,QAAQ,IAAI;IAAC;GAjBvDR;;IAoBRZ,OAAO;QAAEc,MAAMb,SAASkB,MAAM;QAAEF,WAAW,KAAK;IAAC;GApBzCL;;IAuBRZ,OAAO;QAAEc,MAAMb,SAASoB,OAAO;QAAEJ,WAAW,KAAK;IAAC;GAvB1CL;;IA0BRR,QAAQ,IAAMM,wBAAwB;QAAEY,YAAY;IAAgB;GA1B5DV;;IA6BRR,QAAQ,IAAMG,SAAS;QAAEe,YAAY;IAAgB;GA7B7CV;;IAgCRR,QAAQ,IAAMI,oBAAoB;QAAEc,YAAY;IAAgB;GAhCxDV;;IAmCRR,QAAQ,IAAMK,oBAAoB;QAAEa,YAAY;IAAgB;GAnCxDV;;IAsCRb,UAAU,IAAMY;GAtCRC;AAAAA;IADZN;GACYM"}

package/dist/lib/dbmodels/xpAndLeaderboards/UserRankHistory.d.ts

@@ -0,0 +1,10 @@
+import { Model } from "sequelize-typescript";
+import { PersistedUser } from "../PersistedUser.js";
+export declare class UserRankHistory extends Model {
+    userUuid: string;
+    period: 'weekly' | 'monthly' | 'alltime';
+    rank: number;
+    xp: number;
+    recordedAt: Date;
+    user: PersistedUser;
+}

package/dist/lib/dbmodels/xpAndLeaderboards/UserRankHistory.js

@@ -0,0 +1,48 @@
+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, Model, Table } from "sequelize-typescript";
+import { PersistedUser } from "../PersistedUser.js";
+export let UserRankHistory = class UserRankHistory extends Model {
+};
+__decorate([
+    Column({
+        type: DataType.UUID,
+        allowNull: false
+    })
+], UserRankHistory.prototype, "userUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.ENUM('weekly', 'monthly', 'alltime'),
+        allowNull: false
+    })
+], UserRankHistory.prototype, "period", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], UserRankHistory.prototype, "rank", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], UserRankHistory.prototype, "xp", void 0);
+__decorate([
+    Column({
+        type: DataType.DATE,
+        allowNull: false
+    })
+], UserRankHistory.prototype, "recordedAt", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser, 'userUuid')
+], UserRankHistory.prototype, "user", void 0);
+UserRankHistory = __decorate([
+    Table
+], UserRankHistory);
+
+//# sourceMappingURL=UserRankHistory.js.map

package/dist/lib/dbmodels/xpAndLeaderboards/UserRankHistory.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/dbmodels/xpAndLeaderboards/UserRankHistory.ts"],"sourcesContent":["import {BelongsTo, Column, DataType, Model, Table} from \"sequelize-typescript\";\nimport {PersistedUser} from \"../PersistedUser.js\";\n\n\n@Table\nexport class UserRankHistory extends Model {\n    @Column({ type: DataType.UUID, allowNull: false })\n    declare userUuid: string;\n\n    @Column({ type: DataType.ENUM('weekly', 'monthly', 'alltime'), allowNull: false })\n    declare period: 'weekly' | 'monthly' | 'alltime';\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare rank: number;\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare xp: number;\n\n    @Column({ type: DataType.DATE, allowNull: false })\n    declare recordedAt: Date;\n\n    @BelongsTo(() => PersistedUser, 'userUuid')\n    declare user: PersistedUser;\n}"],"names":["BelongsTo","Column","DataType","Model","Table","PersistedUser","UserRankHistory","type","UUID","allowNull","ENUM","INTEGER","DATE"],"mappings":";;;;;;AAAA,SAAQA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,KAAK,EAAEC,KAAK,QAAO,uBAAuB;AAC/E,SAAQC,aAAa,QAAO,sBAAsB;AAIlD,WAAaC,kBAAN,8BAA8BH;AAkBrC,EAAC;;IAjBIF,OAAO;QAAEM,MAAML,SAASM,IAAI;QAAEC,WAAW,KAAK;IAAC;GADvCH;;IAIRL,OAAO;QAAEM,MAAML,SAASQ,IAAI,CAAC,UAAU,WAAW;QAAYD,WAAW,KAAK;IAAC;GAJvEH;;IAORL,OAAO;QAAEM,MAAML,SAASS,OAAO;QAAEF,WAAW,KAAK;IAAC;GAP1CH;;IAURL,OAAO;QAAEM,MAAML,SAASS,OAAO;QAAEF,WAAW,KAAK;IAAC;GAV1CH;;IAaRL,OAAO;QAAEM,MAAML,SAASU,IAAI;QAAEH,WAAW,KAAK;IAAC;GAbvCH;;IAgBRN,UAAU,IAAMK,eAAe;GAhBvBC;AAAAA;IADZF;GACYE"}

package/dist/lib/dbmodels/xpAndLeaderboards/XpEvent.d.ts

@@ -0,0 +1,9 @@
+import { Model } from "sequelize-typescript";
+export declare class XpEvent extends Model {
+    uuid: string;
+    eventName: string;
+    xpReward: number;
+    dailyLimit?: number;
+    isActive: boolean;
+    description?: string;
+}

package/dist/lib/dbmodels/xpAndLeaderboards/XpEvent.js

@@ -0,0 +1,53 @@
+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, Model, Table } from "sequelize-typescript";
+export let XpEvent = class XpEvent extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        primaryKey: true
+    })
+], XpEvent.prototype, "uuid", void 0);
+__decorate([
+    Column({
+        type: DataType.STRING,
+        allowNull: false,
+        primaryKey: true
+    })
+], XpEvent.prototype, "eventName", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], XpEvent.prototype, "xpReward", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: true
+    })
+], XpEvent.prototype, "dailyLimit", void 0);
+__decorate([
+    Column({
+        type: DataType.BOOLEAN,
+        allowNull: false,
+        defaultValue: true
+    })
+], XpEvent.prototype, "isActive", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: true
+    })
+], XpEvent.prototype, "description", void 0);
+XpEvent = __decorate([
+    Table
+], XpEvent);
+
+//# sourceMappingURL=XpEvent.js.map

package/dist/lib/dbmodels/xpAndLeaderboards/XpEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/dbmodels/xpAndLeaderboards/XpEvent.ts"],"sourcesContent":["import {Column, DataType, Default, Model, Table} from \"sequelize-typescript\";\n\n@Table\nexport class XpEvent extends Model {\n    @Default(DataType.UUIDV4)\n    @Column({ type: DataType.UUID, primaryKey: true })\n    declare uuid: string;\n\n    @Column({ type: DataType.STRING, allowNull: false, primaryKey: true })\n    declare eventName: string;\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare xpReward: number;\n\n    @Column({ type: DataType.INTEGER, allowNull: true })\n    declare dailyLimit?: number;\n\n    @Column({ type: DataType.BOOLEAN, allowNull: false, defaultValue: true })\n    declare isActive: boolean;\n\n    @Column({ type: DataType.TEXT, allowNull: true })\n    declare description?: string;\n}"],"names":["Column","DataType","Default","Model","Table","XpEvent","UUIDV4","type","UUID","primaryKey","STRING","allowNull","INTEGER","BOOLEAN","defaultValue","TEXT"],"mappings":";;;;;;AAAA,SAAQA,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,KAAK,QAAO,uBAAuB;AAG7E,WAAaC,UAAN,sBAAsBF;AAmB7B,EAAC;;IAlBID,QAAQD,SAASK,MAAM;IACvBN,OAAO;QAAEO,MAAMN,SAASO,IAAI;QAAEC,YAAY,IAAI;IAAC;GAFvCJ;;IAKRL,OAAO;QAAEO,MAAMN,SAASS,MAAM;QAAEC,WAAW,KAAK;QAAEF,YAAY,IAAI;IAAC;GAL3DJ;;IAQRL,OAAO;QAAEO,MAAMN,SAASW,OAAO;QAAED,WAAW,KAAK;IAAC;GAR1CN;;IAWRL,OAAO;QAAEO,MAAMN,SAASW,OAAO;QAAED,WAAW,IAAI;IAAC;GAXzCN;;IAcRL,OAAO;QAAEO,MAAMN,SAASY,OAAO;QAAEF,WAAW,KAAK;QAAEG,cAAc,IAAI;IAAC;GAd9DT;;IAiBRL,OAAO;QAAEO,MAAMN,SAASc,IAAI;QAAEJ,WAAW,IAAI;IAAC;GAjBtCN;AAAAA;IADZD;GACYC"}

package/dist/lib/dbmodels/xpAndLeaderboards/XpTransaction.d.ts

@@ -0,0 +1,14 @@
+import { Model } from "sequelize-typescript";
+import { PersistedUser } from "../PersistedUser.js";
+import { XpEvent } from "./XpEvent.js";
+export declare class XpTransaction extends Model {
+    uuid: string;
+    userUuid: string;
+    eventName: string;
+    xpAwarded: number;
+    awardedAt: Date;
+    metadata?: Record<string, any>;
+    status: 'pending' | 'completed' | 'reverted';
+    user: PersistedUser;
+    event: XpEvent;
+}

package/dist/lib/dbmodels/xpAndLeaderboards/XpTransaction.js

@@ -0,0 +1,68 @@
+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, Index, Model, Table } from "sequelize-typescript";
+import { PersistedUser } from "../PersistedUser.js";
+import { XpEvent } from "./XpEvent.js";
+export let XpTransaction = class XpTransaction extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        primaryKey: true
+    })
+], XpTransaction.prototype, "uuid", void 0);
+__decorate([
+    Index,
+    Column({
+        type: DataType.UUID,
+        allowNull: false
+    })
+], XpTransaction.prototype, "userUuid", void 0);
+__decorate([
+    Index,
+    Column({
+        type: DataType.STRING,
+        allowNull: false
+    })
+], XpTransaction.prototype, "eventName", void 0);
+__decorate([
+    Column({
+        type: DataType.INTEGER,
+        allowNull: false
+    })
+], XpTransaction.prototype, "xpAwarded", void 0);
+__decorate([
+    Column({
+        type: DataType.DATE,
+        allowNull: false,
+        defaultValue: DataType.NOW
+    })
+], XpTransaction.prototype, "awardedAt", void 0);
+__decorate([
+    Column({
+        type: DataType.JSON,
+        allowNull: true
+    })
+], XpTransaction.prototype, "metadata", void 0);
+__decorate([
+    Column({
+        type: DataType.ENUM('pending', 'completed', 'reverted'),
+        defaultValue: 'completed'
+    })
+], XpTransaction.prototype, "status", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser, 'userUuid')
+], XpTransaction.prototype, "user", void 0);
+__decorate([
+    BelongsTo(()=>XpEvent, 'eventName')
+], XpTransaction.prototype, "event", void 0);
+XpTransaction = __decorate([
+    Table
+], XpTransaction);
+
+//# sourceMappingURL=XpTransaction.js.map

package/dist/lib/dbmodels/xpAndLeaderboards/XpTransaction.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/lib/dbmodels/xpAndLeaderboards/XpTransaction.ts"],"sourcesContent":["import {BelongsTo, Column, DataType, Default, Index, Model, Table} from \"sequelize-typescript\";\nimport {PersistedUser} from \"../PersistedUser.js\";\nimport {XpEvent} from \"./XpEvent.js\";\n\n@Table\nexport class XpTransaction extends Model {\n    @Default(DataType.UUIDV4)\n    @Column({ type: DataType.UUID, primaryKey: true })\n    declare uuid: string;\n\n    @Index\n    @Column({ type: DataType.UUID, allowNull: false })\n    declare userUuid: string;\n\n    @Index\n    @Column({ type: DataType.STRING, allowNull: false })\n    declare eventName: string;\n\n    @Column({ type: DataType.INTEGER, allowNull: false })\n    declare xpAwarded: number;\n\n    @Column({ type: DataType.DATE, allowNull: false, defaultValue: DataType.NOW })\n    declare awardedAt: Date;\n\n    @Column({ type: DataType.JSON, allowNull: true })\n    declare metadata?: Record<string, any>; // Additional context (workout_id, etc.)\n\n    @Column({ type: DataType.ENUM('pending', 'completed', 'reverted'), defaultValue: 'completed' })\n    declare status: 'pending' | 'completed' | 'reverted';\n\n    @BelongsTo(() => PersistedUser, 'userUuid')\n    declare user: PersistedUser;\n\n    @BelongsTo(() => XpEvent, 'eventName')\n    declare event: XpEvent;\n}"],"names":["BelongsTo","Column","DataType","Default","Index","Model","Table","PersistedUser","XpEvent","XpTransaction","UUIDV4","type","UUID","primaryKey","allowNull","STRING","INTEGER","DATE","defaultValue","NOW","JSON","ENUM"],"mappings":";;;;;;AAAA,SAAQA,SAAS,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,OAAO,EAAEC,KAAK,EAAEC,KAAK,EAAEC,KAAK,QAAO,uBAAuB;AAC/F,SAAQC,aAAa,QAAO,sBAAsB;AAClD,SAAQC,OAAO,QAAO,eAAe;AAGrC,WAAaC,gBAAN,4BAA4BJ;AA8BnC,EAAC;;IA7BIF,QAAQD,SAASQ,MAAM;IACvBT,OAAO;QAAEU,MAAMT,SAASU,IAAI;QAAEC,YAAY,IAAI;IAAC;GAFvCJ;;IAKRL;IACAH,OAAO;QAAEU,MAAMT,SAASU,IAAI;QAAEE,WAAW,KAAK;IAAC;GANvCL;;IASRL;IACAH,OAAO;QAAEU,MAAMT,SAASa,MAAM;QAAED,WAAW,KAAK;IAAC;GAVzCL;;IAaRR,OAAO;QAAEU,MAAMT,SAASc,OAAO;QAAEF,WAAW,KAAK;IAAC;GAb1CL;;IAgBRR,OAAO;QAAEU,MAAMT,SAASe,IAAI;QAAEH,WAAW,KAAK;QAAEI,cAAchB,SAASiB,GAAG;IAAC;GAhBnEV;;IAmBRR,OAAO;QAAEU,MAAMT,SAASkB,IAAI;QAAEN,WAAW,IAAI;IAAC;GAnBtCL;;IAsBRR,OAAO;QAAEU,MAAMT,SAASmB,IAAI,CAAC,WAAW,aAAa;QAAaH,cAAc;IAAY;GAtBpFT;;IAyBRT,UAAU,IAAMO,eAAe;GAzBvBE;;IA4BRT,UAAU,IAAMQ,SAAS;GA5BjBC;AAAAA;IADZH;GACYG"}

package/package.json

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

package/src/lib/dbmodels/PersistedUser.ts

@@ -108,6 +108,18 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.BOOLEAN, allowNull: true })
   declare changeUtilityEmail: boolean;
 
+  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })
+  declare totalXp: number;
+
+  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })
+  declare weeklyXp: number;
+
+  @Column({ type: DataType.INTEGER, allowNull: false, defaultValue: 0 })
+  declare monthlyXp: number;
+
+  @Column({ type: DataType.TEXT, allowNull: true })
+  declare country?: string;
+
   @HasOne(() => Subscription)
   declare subscription: Subscription;
 

package/src/lib/dbmodels/UsersFriends.ts

@@ -1,19 +1,24 @@
-import { Column, DataType, Model, Table } from "sequelize-typescript";
+import {BelongsTo, Column, DataType, Model, Table} from "sequelize-typescript";
+import {PersistedUser} from "./PersistedUser.js";
 
 @Table
 export class UsersFriends extends Model {
-  @Column({
-    type: DataType.UUID,
-    allowNull: false,
-  })
-  declare userId: string;
+  @Column({ type: DataType.UUID, allowNull: false })
+  declare userUuid: string;
 
-  @Column({
-    type: DataType.UUID,
-    allowNull: false,
-  })
-  declare friendId: string;
+  @Column({ type: DataType.UUID, allowNull: false })
+  declare friendUuid: string;
+
+  @Column({ type: DataType.ENUM('pending', 'accepted', 'rejected'), defaultValue: 'pending' })
+  declare status: 'pending' | 'accepted' | 'rejected';
+
+  @Column({ type: DataType.DATE, allowNull: false, defaultValue: DataType.NOW })
+  declare createdAt: Date;
+
+  @BelongsTo(() => PersistedUser, 'userUuid')
+  declare user: PersistedUser;
+
+  @BelongsTo(() => PersistedUser, 'friendUuid')
+  declare friend: PersistedUser;
 
-  @Column({ type: DataType.DATE, allowNull: false })
-  declare createDate: Date;
 }

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

@@ -1,7 +1,8 @@
 import {
+    BelongsTo,
     Column,
     DataType,
-    Default,
+    Default, ForeignKey,
     HasMany, Index,
     Model,
     Table,
@@ -10,6 +11,7 @@ import {RestDay} from "./RestDay.js";
 import {ChallengeBlueprint} from "./ChallengeBlueprint.js";
 import {CustomStrengthTest} from "./CustomStrengthTest.js";
 import {CustomWorkoutBlueprint} from "./CustomWorkoutBlueprint.js";
+import {PersistedUser} from "../PersistedUser.js";
 
 @Table
 export class CustomProgramBlueprint extends Model {
@@ -22,6 +24,13 @@ export class CustomProgramBlueprint extends Model {
     })
     declare uuid: string;
 
+    @ForeignKey(() => PersistedUser)
+    @Column({
+        type: DataType.UUID,
+        allowNull: true,
+    })
+    declare createdBy: string;
+
     @Column({ type: DataType.STRING, allowNull: false, unique: true })
     declare title: string;
 
@@ -42,4 +51,7 @@ export class CustomProgramBlueprint extends Model {
 
     @HasMany(() => CustomStrengthTest, { foreignKey: "blueprintUuid" })
     declare strengthTests: CustomStrengthTest[];
+
+    @BelongsTo(() => PersistedUser)
+    declare user: PersistedUser;
 }

package/src/lib/dbmodels/xpAndLeaderboards/UserRankHistory.ts

@@ -0,0 +1,24 @@
+import {BelongsTo, Column, DataType, Model, Table} from "sequelize-typescript";
+import {PersistedUser} from "../PersistedUser.js";
+
+
+@Table
+export class UserRankHistory extends Model {
+    @Column({ type: DataType.UUID, allowNull: false })
+    declare userUuid: string;
+
+    @Column({ type: DataType.ENUM('weekly', 'monthly', 'alltime'), allowNull: false })
+    declare period: 'weekly' | 'monthly' | 'alltime';
+
+    @Column({ type: DataType.INTEGER, allowNull: false })
+    declare rank: number;
+
+    @Column({ type: DataType.INTEGER, allowNull: false })
+    declare xp: number;
+
+    @Column({ type: DataType.DATE, allowNull: false })
+    declare recordedAt: Date;
+
+    @BelongsTo(() => PersistedUser, 'userUuid')
+    declare user: PersistedUser;
+}

package/src/lib/dbmodels/xpAndLeaderboards/XpEvent.ts

@@ -0,0 +1,23 @@
+import {Column, DataType, Default, Model, Table} from "sequelize-typescript";
+
+@Table
+export class XpEvent extends Model {
+    @Default(DataType.UUIDV4)
+    @Column({ type: DataType.UUID, primaryKey: true })
+    declare uuid: string;
+
+    @Column({ type: DataType.STRING, allowNull: false, primaryKey: true })
+    declare eventName: string;
+
+    @Column({ type: DataType.INTEGER, allowNull: false })
+    declare xpReward: number;
+
+    @Column({ type: DataType.INTEGER, allowNull: true })
+    declare dailyLimit?: number;
+
+    @Column({ type: DataType.BOOLEAN, allowNull: false, defaultValue: true })
+    declare isActive: boolean;
+
+    @Column({ type: DataType.TEXT, allowNull: true })
+    declare description?: string;
+}

package/src/lib/dbmodels/xpAndLeaderboards/XpTransaction.ts

@@ -0,0 +1,36 @@
+import {BelongsTo, Column, DataType, Default, Index, Model, Table} from "sequelize-typescript";
+import {PersistedUser} from "../PersistedUser.js";
+import {XpEvent} from "./XpEvent.js";
+
+@Table
+export class XpTransaction extends Model {
+    @Default(DataType.UUIDV4)
+    @Column({ type: DataType.UUID, primaryKey: true })
+    declare uuid: string;
+
+    @Index
+    @Column({ type: DataType.UUID, allowNull: false })
+    declare userUuid: string;
+
+    @Index
+    @Column({ type: DataType.STRING, allowNull: false })
+    declare eventName: string;
+
+    @Column({ type: DataType.INTEGER, allowNull: false })
+    declare xpAwarded: number;
+
+    @Column({ type: DataType.DATE, allowNull: false, defaultValue: DataType.NOW })
+    declare awardedAt: Date;
+
+    @Column({ type: DataType.JSON, allowNull: true })
+    declare metadata?: Record<string, any>; // Additional context (workout_id, etc.)
+
+    @Column({ type: DataType.ENUM('pending', 'completed', 'reverted'), defaultValue: 'completed' })
+    declare status: 'pending' | 'completed' | 'reverted';
+
+    @BelongsTo(() => PersistedUser, 'userUuid')
+    declare user: PersistedUser;
+
+    @BelongsTo(() => XpEvent, 'eventName')
+    declare event: XpEvent;
+}