90dc-core 1.6.3 → 1.6.4

package/dist/index.d.ts

@@ -11,4 +11,6 @@ export * from "./lib/dbmodels/program/Program";
 export * from "./lib/dbmodels/program/Workout";
 export * from "./lib/dbmodels/program/Exercise";
 export * from "./lib/dbmodels/program/Superset";
+export * from "./lib/dbmodels/Subscription";
+export * from "./lib/dbmodels/SubscriptionLog";
 export * from "./lib/utils/Logger";

package/dist/index.js

@@ -13,6 +13,8 @@ export * from "./lib/dbmodels/program/Program";
 export * from "./lib/dbmodels/program/Workout";
 export * from "./lib/dbmodels/program/Exercise";
 export * from "./lib/dbmodels/program/Superset";
+export * from "./lib/dbmodels/Subscription";
+export * from "./lib/dbmodels/SubscriptionLog";
 //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\"\nexport * from \"./lib/dbmodels/program/Program\"\nexport * from \"./lib/dbmodels/program/Workout\"\nexport * from \"./lib/dbmodels/program/Exercise\"\nexport * from \"./lib/dbmodels/program/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,iCAAgC;AAC9C,cAAc,iCAAgC;AAC9C,cAAc,kCAAiC;AAC/C,cAAc,kCAAiC;AAE/C,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/Program\"\nexport * from \"./lib/dbmodels/program/Workout\"\nexport * from \"./lib/dbmodels/program/Exercise\"\nexport * from \"./lib/dbmodels/program/Superset\"\nexport * from \"./lib/dbmodels/Subscription\"\nexport * from \"./lib/dbmodels/SubscriptionLog\"\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,iCAAgC;AAC9C,cAAc,iCAAgC;AAC9C,cAAc,kCAAiC;AAC/C,cAAc,kCAAiC;AAC/C,cAAc,8BAA6B;AAC3C,cAAc,iCAAgC;AAE9C,OAAO;AACP,cAAc,qBAAoB"}

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

@@ -1,5 +1,5 @@
 import { Model } from "sequelize-typescript";
-import type { Subscription } from "../models/UserInterfaces";
+import type { Subscription } from "./Subscription";
 export declare class PersistedUser extends Model {
     userUuid: string;
     email: string;

package/dist/lib/dbmodels/PersistedUser.js

@@ -4,7 +4,7 @@ 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, Index, Model, Table } from "sequelize-typescript";
+import { Column, DataType, Default, HasOne, Index, Model, Table } from "sequelize-typescript";
 export let PersistedUser = class PersistedUser extends Model {
 };
 __decorate([
@@ -181,10 +181,7 @@ __decorate([
     })
 ], PersistedUser.prototype, "changeUtilityEmail", void 0);
 __decorate([
-    Column({
-        type: DataType.JSONB,
-        allowNull: true
-    })
+    HasOne(()=>PersistedUser)
 ], PersistedUser.prototype, "subscription", void 0);
 PersistedUser = __decorate([
     Table

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/PersistedUser.ts"],"sourcesContent":["import { Column, DataType, Default, Index, Model, Table } from \"sequelize-typescript\";\nimport type { Subscription } from \"../models/UserInterfaces\";\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.JSONB, allowNull: true })\n  declare subscription: Subscription;\n}\n"],"names":["Column","DataType","Default","Index","Model","Table","PersistedUser","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","unique","BOOLEAN","JSONB"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/dbmodels/PersistedUser.ts"],"sourcesContent":["import {BelongsTo, Column, DataType, Default, HasOne, Index, Model, Table} from \"sequelize-typescript\";\nimport type { Subscription } from \"./Subscription\";\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(() => PersistedUser)\n  declare subscription: Subscription;\n}\n"],"names":["Column","DataType","Default","HasOne","Index","Model","Table","PersistedUser","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","unique","BOOLEAN"],"mappings":"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"}

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

@@ -0,0 +1,14 @@
+import { Model } from "sequelize-typescript";
+import { SubscriptionLog } from "./SubscriptionLog";
+import { PersistedUser } from "./PersistedUser";
+export declare class Subscription extends Model {
+    userUuid: string;
+    identifier: string;
+    platform: "google" | "apple" | "mollie";
+    status: "active" | "canceled" | "expired";
+    type: string;
+    expiresOn: Date;
+    startDate: Date;
+    user: PersistedUser;
+    subscriptionLogs: SubscriptionLog[];
+}

package/dist/lib/dbmodels/Subscription.js

@@ -0,0 +1,67 @@
+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, ForeignKey, HasMany, Model, PrimaryKey, Table } from "sequelize-typescript";
+import { SubscriptionLog } from "./SubscriptionLog";
+import { PersistedUser } from "./PersistedUser";
+export let Subscription = class Subscription extends Model {
+};
+__decorate([
+    ForeignKey(()=>PersistedUser),
+    PrimaryKey,
+    Column({
+        type: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], Subscription.prototype, "userUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Subscription.prototype, "identifier", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Subscription.prototype, "platform", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Subscription.prototype, "status", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], Subscription.prototype, "type", void 0);
+__decorate([
+    Column({
+        type: DataType.DATE,
+        allowNull: false
+    })
+], Subscription.prototype, "expiresOn", void 0);
+__decorate([
+    Column({
+        type: DataType.DATE,
+        allowNull: false
+    })
+], Subscription.prototype, "startDate", void 0);
+__decorate([
+    BelongsTo(()=>PersistedUser)
+], Subscription.prototype, "user", void 0);
+__decorate([
+    HasMany(()=>SubscriptionLog)
+], Subscription.prototype, "subscriptionLogs", void 0);
+Subscription = __decorate([
+    Table
+], Subscription);
+
+//# sourceMappingURL=Subscription.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/Subscription.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  ForeignKey,\n  HasMany,\n  Model,\n  PrimaryKey,\n  Table,\n} from \"sequelize-typescript\";\nimport { SubscriptionLog } from \"./SubscriptionLog\";\nimport {PersistedUser} from \"./PersistedUser\";\n\n@Table\nexport class Subscription extends Model {\n  @ForeignKey(() => PersistedUser)\n  @PrimaryKey\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n    primaryKey: true,\n  })\n  declare userUuid: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare identifier: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare platform: \"google\" | \"apple\" | \"mollie\";\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare status: \"active\" | \"canceled\" | \"expired\";\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare type: string;\n\n  @Column({ type: DataType.DATE, allowNull: false })\n  declare expiresOn: Date;\n\n  @Column({ type: DataType.DATE, allowNull: false })\n  declare startDate: Date;\n\n  @BelongsTo(() => PersistedUser)\n  declare user: PersistedUser;\n\n  @HasMany(() => SubscriptionLog)\n  declare subscriptionLogs: SubscriptionLog[];\n}\n"],"names":["BelongsTo","Column","DataType","ForeignKey","HasMany","Model","PrimaryKey","Table","SubscriptionLog","PersistedUser","Subscription","type","UUID","allowNull","primaryKey","TEXT","DATE"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,UAAU,EACVC,KAAK,QACA,uBAAuB;AAC9B,SAASC,eAAe,QAAQ,oBAAoB;AACpD,SAAQC,aAAa,QAAO,kBAAkB;AAG9C,WAAaC,eAAN,2BAA2BL;AAiClC,EAAC;;IAhCEF,WAAW,IAAMM;IACjBH;IACAL,OAAO;QACNU,MAAMT,SAASU,IAAI;QACnBC,WAAW,KAAK;QAChBC,YAAY,IAAI;IAClB;GAPWJ;;IAUVT,OAAO;QAAEU,MAAMT,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAVrCH;;IAaVT,OAAO;QAAEU,MAAMT,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAbrCH;;IAgBVT,OAAO;QAAEU,MAAMT,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAhBrCH;;IAmBVT,OAAO;QAAEU,MAAMT,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAnBrCH;;IAsBVT,OAAO;QAAEU,MAAMT,SAASc,IAAI;QAAEH,WAAW,KAAK;IAAC;GAtBrCH;;IAyBVT,OAAO;QAAEU,MAAMT,SAASc,IAAI;QAAEH,WAAW,KAAK;IAAC;GAzBrCH;;IA4BVV,UAAU,IAAMS;GA5BNC;;IA+BVN,QAAQ,IAAMI;GA/BJE;AAAAA;IADZH;GACYG"}

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

@@ -0,0 +1,8 @@
+import { Model } from "sequelize-typescript";
+import { Subscription } from "./Subscription";
+export declare class SubscriptionLog extends Model {
+    uuid: string;
+    subscriptionUuid: string;
+    action: string;
+    subscription: Subscription;
+}

package/dist/lib/dbmodels/SubscriptionLog.js

@@ -0,0 +1,42 @@
+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, Table } from "sequelize-typescript";
+import { Subscription } from "./Subscription";
+export let SubscriptionLog = class SubscriptionLog extends Model {
+};
+__decorate([
+    Default(DataType.UUIDV4),
+    Column({
+        type: DataType.UUID,
+        defaultValue: DataType.UUID,
+        allowNull: false,
+        primaryKey: true
+    })
+], SubscriptionLog.prototype, "uuid", void 0);
+__decorate([
+    ForeignKey(()=>Subscription),
+    Column({
+        type: DataType.UUID,
+        allowNull: false
+    })
+], SubscriptionLog.prototype, "subscriptionUuid", void 0);
+__decorate([
+    Column({
+        type: DataType.TEXT,
+        allowNull: false
+    })
+], SubscriptionLog.prototype, "action", void 0);
+__decorate([
+    BelongsTo(()=>Subscription)
+], SubscriptionLog.prototype, "subscription", void 0);
+SubscriptionLog = __decorate([
+    Table({
+        timestamps: true
+    })
+], SubscriptionLog);
+
+//# sourceMappingURL=SubscriptionLog.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/lib/dbmodels/SubscriptionLog.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  Model,\n  Table,\n} from \"sequelize-typescript\";\nimport { Subscription } from \"./Subscription\";\n\n@Table({ timestamps: true })\nexport class SubscriptionLog 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(() => Subscription)\n  @Column({\n    type: DataType.UUID,\n    allowNull: false,\n  })\n  declare subscriptionUuid: string;\n\n  @Column({ type: DataType.TEXT, allowNull: false })\n  declare action: string;\n\n  @BelongsTo(() => Subscription)\n  declare subscription: Subscription;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","Model","Table","Subscription","SubscriptionLog","UUIDV4","type","UUID","defaultValue","allowNull","primaryKey","TEXT","timestamps"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,KAAK,EACLC,KAAK,QACA,uBAAuB;AAC9B,SAASC,YAAY,QAAQ,iBAAiB;AAG9C,WAAaC,kBAAN,8BAA8BH;AAsBrC,EAAC;;IArBEF,QAAQD,SAASO,MAAM;IACvBR,OAAO;QACNS,MAAMR,SAASS,IAAI;QACnBC,cAAcV,SAASS,IAAI;QAC3BE,WAAW,KAAK;QAChBC,YAAY,IAAI;IAClB;GAPWN;;IAUVJ,WAAW,IAAMG;IACjBN,OAAO;QACNS,MAAMR,SAASS,IAAI;QACnBE,WAAW,KAAK;IAClB;GAdWL;;IAiBVP,OAAO;QAAES,MAAMR,SAASa,IAAI;QAAEF,WAAW,KAAK;IAAC;GAjBrCL;;IAoBVR,UAAU,IAAMO;GApBNC;AAAAA;IADZF,MAAM;QAAEU,YAAY,IAAI;IAAC;GACbR"}

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

@@ -23,10 +23,6 @@ export interface UserInfoModel {
     height: string;
     weight: string;
 }
-export interface Subscription {
-    type: "android" | "ios";
-    [key: string]: string;
-}
 export interface SingleTransactionResponse {
     revision: string;
     bundleId: string;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/models/UserInterfaces.ts"],"sourcesContent":["import type jwt from \"jsonwebtoken\";\n\nexport interface UserTypes {\n  userUuid: string;\n  email: string;\n  firstName: string;\n  lastName: string;\n  avatar: string;\n  role: string;\n}\n\nexport interface VerificationStatus {\n  status: string;\n}\n\nexport interface TransactionsResponse {\n  revision: string;\n  bundleId: string;\n  environment: string;\n  hasMore: boolean;\n  signedTransactions: string[];\n  errorCode?: number;\n}\n\nexport interface UserInfoModel {\n  userUuid: string;\n  height: string;\n  weight: string;\n}\n\nexport interface Subscription {\n  type: \"android\" | \"ios\",\n  [key: string]: string;\n}\n\nexport interface SingleTransactionResponse {\n  revision: string;\n  bundleId: string;\n  environment: string;\n  hasMore: boolean;\n  signedTransactionInfo: string;\n  errorCode?: number;\n}\n\nexport interface SubscriptionStatus {\n  originalTransactionId: string;\n  status: number;\n  signedTransactionInfo: string;\n  signedRenewalInfo: string;\n}\n\nexport interface SubscriptionStatusResponse {\n  environment: string;\n  bundleId: string;\n  data: [\n    {\n      subscriptionGroupIdentifier: string;\n      lastTransactions: SubscriptionStatus[];\n    }\n  ];\n  errorCode?: number;\n}\n\nexport interface SubscriptionStatusResponseError {\n  errorCode: number;\n  errorMessage: string;\n}\n\nexport interface SubscriptionStatusResult {\n  originalTransactionId: string;\n  status: number;\n  signedTransactionInfo: string | jwt.JwtPayload | null;\n  signedRenewalInfo: string | jwt.JwtPayload | null;\n}\n\nexport interface SignedTransactions {\n  transactionId: string;\n  originalTransactionId: string;\n  webOrderLineItemId: string;\n  bundleId: string;\n  productId: string;\n  subscriptionGroupIdentifier: string;\n  purchaseDate: number;\n  originalPurchaseDate: number;\n  expiresDate: number;\n  quantity: number;\n  type: string;\n  inAppOwnershipType: string;\n  signedDate: number;\n  environment: string;\n  transactionReason: string;\n  storefront: string;\n  storefrontId: string;\n}\n\nexport interface Credentials {\n  refresh_token?: string | null,\n  expiry_date?: number | null,\n  access_token?: string | null,\n  token_type?: string | null ,\n  id_token?: string | null,\n  scope?: string\n}\n\n\nexport interface LoginRequest {\n  email: string;\n  password: string;\n}\n\nexport interface UserPhotoRequest {\n  base64: string;\n}\n\nexport interface ProgressPhoto {\n  date: Date;\n  progressPhoto: string;\n  userUuid: string;\n}\n\nexport interface ForgotPassword {\n  uuid: string;\n  userUuid: string;\n  token: string;\n  date: Date;\n}\n\nexport interface RefreshPayload {\n  userUuid: string;\n}\n\nexport interface TokenRequest {\n  token: string;\n}\n\nexport interface RefreshRequest {\n  refreshToken: string;\n}\n\nexport interface UuidRequest {\n  userUuid: string;\n}\n\nexport interface EmailRequest {\n  email: string;\n}\n\nexport interface TitleRequest {\n  title: string;\n}\n\nexport interface UserPhoto {\n  base64: string;\n  title: string;\n}\n\nexport default interface AuthenticationToken {\n  type: string;\n  contents: string;\n}\n\nexport interface RestorePasswordRequest {\n  email: string;\n}\n\nexport interface BeforeSubscriptionOptions {\n  firstName: string;\n  lastName: string;\n  sex: string;\n  goal: string;\n  weightGoal: string;\n  level: string;\n  type: string;\n  days: number;\n}\n\nexport interface AfterSubscriptionOptions {\n  dateOfBirth: string;\n  metricSystem: string;\n  height: string;\n  weight: string;\n}\n"],"names":[],"mappings":"AAAA,WAqLC"}
+{"version":3,"sources":["../../../src/lib/models/UserInterfaces.ts"],"sourcesContent":["import type jwt from \"jsonwebtoken\";\n\nexport interface UserTypes {\n  userUuid: string;\n  email: string;\n  firstName: string;\n  lastName: string;\n  avatar: string;\n  role: string;\n}\n\nexport interface VerificationStatus {\n  status: string;\n}\n\nexport interface TransactionsResponse {\n  revision: string;\n  bundleId: string;\n  environment: string;\n  hasMore: boolean;\n  signedTransactions: string[];\n  errorCode?: number;\n}\n\nexport interface UserInfoModel {\n  userUuid: string;\n  height: string;\n  weight: string;\n}\n\nexport interface SingleTransactionResponse {\n  revision: string;\n  bundleId: string;\n  environment: string;\n  hasMore: boolean;\n  signedTransactionInfo: string;\n  errorCode?: number;\n}\n\nexport interface SubscriptionStatus {\n  originalTransactionId: string;\n  status: number;\n  signedTransactionInfo: string;\n  signedRenewalInfo: string;\n}\n\nexport interface SubscriptionStatusResponse {\n  environment: string;\n  bundleId: string;\n  data: [\n    {\n      subscriptionGroupIdentifier: string;\n      lastTransactions: SubscriptionStatus[];\n    }\n  ];\n  errorCode?: number;\n}\n\nexport interface SubscriptionStatusResponseError {\n  errorCode: number;\n  errorMessage: string;\n}\n\nexport interface SubscriptionStatusResult {\n  originalTransactionId: string;\n  status: number;\n  signedTransactionInfo: string | jwt.JwtPayload | null;\n  signedRenewalInfo: string | jwt.JwtPayload | null;\n}\n\nexport interface SignedTransactions {\n  transactionId: string;\n  originalTransactionId: string;\n  webOrderLineItemId: string;\n  bundleId: string;\n  productId: string;\n  subscriptionGroupIdentifier: string;\n  purchaseDate: number;\n  originalPurchaseDate: number;\n  expiresDate: number;\n  quantity: number;\n  type: string;\n  inAppOwnershipType: string;\n  signedDate: number;\n  environment: string;\n  transactionReason: string;\n  storefront: string;\n  storefrontId: string;\n}\n\nexport interface Credentials {\n  refresh_token?: string | null,\n  expiry_date?: number | null,\n  access_token?: string | null,\n  token_type?: string | null ,\n  id_token?: string | null,\n  scope?: string\n}\n\n\nexport interface LoginRequest {\n  email: string;\n  password: string;\n}\n\nexport interface UserPhotoRequest {\n  base64: string;\n}\n\nexport interface ProgressPhoto {\n  date: Date;\n  progressPhoto: string;\n  userUuid: string;\n}\n\nexport interface ForgotPassword {\n  uuid: string;\n  userUuid: string;\n  token: string;\n  date: Date;\n}\n\nexport interface RefreshPayload {\n  userUuid: string;\n}\n\nexport interface TokenRequest {\n  token: string;\n}\n\nexport interface RefreshRequest {\n  refreshToken: string;\n}\n\nexport interface UuidRequest {\n  userUuid: string;\n}\n\nexport interface EmailRequest {\n  email: string;\n}\n\nexport interface TitleRequest {\n  title: string;\n}\n\nexport interface UserPhoto {\n  base64: string;\n  title: string;\n}\n\nexport default interface AuthenticationToken {\n  type: string;\n  contents: string;\n}\n\nexport interface RestorePasswordRequest {\n  email: string;\n}\n\nexport interface BeforeSubscriptionOptions {\n  firstName: string;\n  lastName: string;\n  sex: string;\n  goal: string;\n  weightGoal: string;\n  level: string;\n  type: string;\n  days: number;\n}\n\nexport interface AfterSubscriptionOptions {\n  dateOfBirth: string;\n  metricSystem: string;\n  height: string;\n  weight: string;\n}\n"],"names":[],"mappings":"AAAA,WAgLC"}

package/package.json

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

package/src/index.ts

@@ -14,6 +14,8 @@ export * from "./lib/dbmodels/program/Program"
 export * from "./lib/dbmodels/program/Workout"
 export * from "./lib/dbmodels/program/Exercise"
 export * from "./lib/dbmodels/program/Superset"
+export * from "./lib/dbmodels/Subscription"
+export * from "./lib/dbmodels/SubscriptionLog"
 
 //Utils
 export * from "./lib/utils/Logger"

package/src/lib/dbmodels/PersistedUser.ts

@@ -1,5 +1,5 @@
-import { Column, DataType, Default, Index, Model, Table } from "sequelize-typescript";
-import type { Subscription } from "../models/UserInterfaces";
+import {BelongsTo, Column, DataType, Default, HasOne, Index, Model, Table} from "sequelize-typescript";
+import type { Subscription } from "./Subscription";
 
 @Table
 export class PersistedUser extends Model {
@@ -95,6 +95,6 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.BOOLEAN, allowNull: true })
   declare changeUtilityEmail: boolean;
 
-  @Column({ type: DataType.JSONB, allowNull: true })
+  @HasOne(() => PersistedUser)
   declare subscription: Subscription;
 }

package/src/lib/dbmodels/Subscription.ts

@@ -0,0 +1,48 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  ForeignKey,
+  HasMany,
+  Model,
+  PrimaryKey,
+  Table,
+} from "sequelize-typescript";
+import { SubscriptionLog } from "./SubscriptionLog";
+import {PersistedUser} from "./PersistedUser";
+
+@Table
+export class Subscription extends Model {
+  @ForeignKey(() => PersistedUser)
+  @PrimaryKey
+  @Column({
+    type: DataType.UUID,
+    allowNull: false,
+    primaryKey: true,
+  })
+  declare userUuid: string;
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare identifier: string;
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare platform: "google" | "apple" | "mollie";
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare status: "active" | "canceled" | "expired";
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare type: string;
+
+  @Column({ type: DataType.DATE, allowNull: false })
+  declare expiresOn: Date;
+
+  @Column({ type: DataType.DATE, allowNull: false })
+  declare startDate: Date;
+
+  @BelongsTo(() => PersistedUser)
+  declare user: PersistedUser;
+
+  @HasMany(() => SubscriptionLog)
+  declare subscriptionLogs: SubscriptionLog[];
+}

package/src/lib/dbmodels/SubscriptionLog.ts

@@ -0,0 +1,35 @@
+import {
+  BelongsTo,
+  Column,
+  DataType,
+  Default,
+  ForeignKey,
+  Model,
+  Table,
+} from "sequelize-typescript";
+import { Subscription } from "./Subscription";
+
+@Table({ timestamps: true })
+export class SubscriptionLog extends Model {
+  @Default(DataType.UUIDV4)
+  @Column({
+    type: DataType.UUID,
+    defaultValue: DataType.UUID,
+    allowNull: false,
+    primaryKey: true,
+  })
+  declare uuid: string;
+
+  @ForeignKey(() => Subscription)
+  @Column({
+    type: DataType.UUID,
+    allowNull: false,
+  })
+  declare subscriptionUuid: string;
+
+  @Column({ type: DataType.TEXT, allowNull: false })
+  declare action: string;
+
+  @BelongsTo(() => Subscription)
+  declare subscription: Subscription;
+}

package/src/lib/models/UserInterfaces.ts

@@ -28,11 +28,6 @@ export interface UserInfoModel {
   weight: string;
 }
 
-export interface Subscription {
-  type: "android" | "ios",
-  [key: string]: string;
-}
-
 export interface SingleTransactionResponse {
   revision: string;
   bundleId: string;