90dc-core 1.3.0 → 1.3.1

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

@@ -1,4 +1,4 @@
-import { Model } from 'sequelize-typescript';
+import { Model } from "sequelize-typescript";
 export declare class PersistedUser extends Model {
     userUuid: string;
     email: string;
@@ -10,6 +10,7 @@ export declare class PersistedUser extends Model {
     goal: string;
     isFreeVersion: boolean;
     allowsEmail: boolean;
+    gotParentalConsent: boolean;
     weightGoal: string;
     role: 'default' | 'admin';
     level: string;
@@ -28,5 +29,4 @@ export declare class PersistedUser extends Model {
     changeEmail: boolean;
     changeUtilityEmail: boolean;
     subscription: object;
-    $addFriend(friendUuid: string): Promise<void>;
 }

package/dist/lib/dbmodels/PersistedUser.js

@@ -7,21 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Column, DataType, Default, Model, Table } from 'sequelize-typescript';
-import { UsersFriends } from './UsersFriends';
+import { Column, DataType, Default, Index, Model, Table } from "sequelize-typescript";
 let PersistedUser = class PersistedUser extends Model {
-    async $addFriend(friendUuid) {
-        await UsersFriends.create({
-            userId: this.userUuid,
-            friendId: friendUuid,
-            createDate: new Date()
-        });
-        await UsersFriends.create({
-            userId: friendUuid,
-            friendId: this.userUuid,
-            createDate: new Date()
-        });
-    }
 };
 __decorate([
     Default(DataType.UUIDV4),
@@ -34,6 +21,7 @@ __decorate([
     __metadata("design:type", String)
 ], PersistedUser.prototype, "userUuid", void 0);
 __decorate([
+    Index,
     Column({ type: DataType.TEXT, allowNull: false, unique: false }),
     __metadata("design:type", String)
 ], PersistedUser.prototype, "email", void 0);
@@ -69,6 +57,10 @@ __decorate([
     Column({ type: DataType.BOOLEAN, allowNull: true }),
     __metadata("design:type", Boolean)
 ], PersistedUser.prototype, "allowsEmail", void 0);
+__decorate([
+    Column({ type: DataType.BOOLEAN, allowNull: true }),
+    __metadata("design:type", Boolean)
+], PersistedUser.prototype, "gotParentalConsent", void 0);
 __decorate([
     Column({ type: DataType.TEXT, allowNull: true }),
     __metadata("design:type", String)

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/dbmodels/PersistedUser.ts"],"sourcesContent":["import { Column, DataType, Default, Model, Table } from 'sequelize-typescript';\nimport { UsersFriends } from './UsersFriends';\n\n@Table\nexport class PersistedUser 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 userUuid: string;\n\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.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: object;\n\n  async $addFriend(friendUuid: string) {\n    await UsersFriends.create({\n      userId: this.userUuid,\n      friendId: friendUuid,\n      createDate: new Date()\n    });\n\n    await UsersFriends.create({\n      userId: friendUuid,\n      friendId: this.userUuid,\n      createDate: new Date()\n    });\n  }\n}\n"],"names":["Column","DataType","Default","Model","Table","UsersFriends","PersistedUser","$addFriend","friendUuid","create","userId","userUuid","friendId","createDate","Date","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 { Column, DataType, Default, Index, Model, Table } from \"sequelize-typescript\";\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: object;\n\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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"}

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

@@ -1,5 +1,15 @@
-import winston from 'winston';
-declare class Logger {
-    static getLogger(serviceName: string): winston.Logger;
+import { Debugger } from "debug";
+export declare class Log {
+    private static instance;
+    private readonly debugLib;
+    constructor(debug: Debugger);
+    static getInstance(): Log;
+    static extendInstance(name: string): Log;
+    debug(message: string): void;
+    info(message: string): void;
+    warn(message: string): void;
+    error(message: string | unknown, error?: unknown): void;
+    catchError(error: unknown): void;
+    catchErrorAndLogUuid(error: unknown): string;
+    extend(extensionName: string): Log;
 }
-export default Logger;

package/dist/lib/utils/Logger.js

@@ -1,39 +1,64 @@
-import winston from 'winston';
-class Logger {
-    static getLogger(serviceName) {
-        const levels = {
-            error: 0,
-            warn: 1,
-            info: 2,
-            http: 3,
-            debug: 4,
-        };
-        const level = () => {
-            const env = process.env.NODE_ENV || 'development';
-            const isDevelopment = env === 'development';
-            return isDevelopment ? 'debug' : 'warn';
-        };
-        const colors = {
-            error: 'red',
-            warn: 'yellow',
-            info: 'magenta',
-            http: 'magenta',
-            debug: 'white',
-            serviceName: 'magenta'
-        };
-        winston.addColors(colors);
-        const format = winston.format.combine(winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss:ms' }), winston.format.colorize({ all: true }), winston.format.printf(
-        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-        (info) => `\n        @${serviceName.toUpperCase()}: ${info.message}\n`));
-        const transports = [
-            new winston.transports.Console(),
-        ];
-        return winston.createLogger({
-            level: level(),
-            levels,
-            format,
-            transports,
-        });
+/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access */
+import axios from "axios";
+import Debug from "debug";
+import * as crypto from "crypto";
+export class Log {
+    static instance = null;
+    debugLib;
+    constructor(debug) {
+        this.debugLib = debug;
+    }
+    static getInstance() {
+        if (!Log.instance) {
+            const debug = Debug("@swish:" + (process.env.npm_package_name || "package-name-not-specified"));
+            Log.instance = new Log(debug);
+        }
+        return Log.instance;
+    }
+    static extendInstance(name) {
+        return this.getInstance().extend(name);
+    }
+    debug(message) {
+        this.debugLib(message);
+    }
+    info(message) {
+        // eslint-disable-next-line no-console
+        this.debugLib.log = console.info.bind(console);
+        this.debugLib(message);
+    }
+    warn(message) {
+        const warnDebug = this.debugLib.extend("warning");
+        // eslint-disable-next-line no-console
+        warnDebug.log = console.warn.bind(console);
+        warnDebug(message);
+    }
+    error(message, error) {
+        const errorDebug = this.debugLib.extend("error");
+        // eslint-disable-next-line no-console
+        errorDebug.log = console.error.bind(console);
+        errorDebug(message, error);
+    }
+    catchError(error) {
+        if (axios.isAxiosError(error)) {
+            this.error(error.toJSON());
+        }
+        if (typeof error === "string") {
+            error.toUpperCase(); // works, `e` narrowed to string
+            this.error(error);
+        }
+        else if (error instanceof Error) {
+            error.message; // works, `e` narrowed to Error
+            this.error(error.message);
+        }
+    }
+    catchErrorAndLogUuid(error) {
+        const uuid = crypto.randomUUID();
+        this.error(`ERROR UUID: ${uuid}`);
+        this.catchError(error);
+        return uuid;
+    }
+    extend(extensionName) {
+        const debugExtension = this.debugLib.extend(extensionName);
+        return new Log(debugExtension);
     }
 }
-export default Logger;

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/Logger.ts"],"sourcesContent":["import winston from 'winston'\n\nclass Logger {\n\n  public static getLogger(serviceName: string){\n    const levels = {\n      error: 0,\n      warn: 1,\n      info: 2,\n      http: 3,\n      debug: 4,\n    }\n\n    const level = () => {\n      const env = process.env.NODE_ENV || 'development'\n      const isDevelopment = env === 'development'\n      return isDevelopment ? 'debug' : 'warn'\n    }\n\n    const colors = {\n      error: 'red',\n      warn: 'yellow',\n      info: 'magenta',\n      http: 'magenta',\n      debug: 'white',\n      serviceName: 'magenta'\n    }\n\n    winston.addColors(colors)\n\n    const format: winston.Logform.Format = winston.format.combine(\n      winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss:ms' }),\n      winston.format.colorize({ all: true }),\n      winston.format.printf(\n        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions\n       (info) => `\\n        @${serviceName.toUpperCase()}: ${info.message}\\n`,\n      ),\n    )\n\n    const transports = [\n      new winston.transports.Console(),\n    ]\n    return winston.createLogger({\n      level: level(),\n      levels,\n      format,\n      transports,\n    })\n\n  }\n}\n\n\nexport default Logger"],"names":["winston","Logger","getLogger","serviceName","levels","error","warn","info","http","debug","level","env","process","NODE_ENV","isDevelopment","colors","addColors","format","combine","timestamp","colorize","all","printf","toUpperCase","message","transports","Console","createLogger"],"mappings":"AAAA,OAAOA,aAAa,UAAS;AAE7B,MAAMC;IAEJ,OAAcC,UAAUC,WAAmB,EAAC;QAC1C,MAAMC,SAAS;YACbC,OAAO;YACPC,MAAM;YACNC,MAAM;YACNC,MAAM;YACNC,OAAO;QACT;QAEA,MAAMC,QAAQ,IAAM;YAClB,MAAMC,MAAMC,QAAQD,GAAG,CAACE,QAAQ,IAAI;YACpC,MAAMC,gBAAgBH,QAAQ;YAC9B,OAAOG,gBAAgB,UAAU,MAAM;QACzC;QAEA,MAAMC,SAAS;YACbV,OAAO;YACPC,MAAM;YACNC,MAAM;YACNC,MAAM;YACNC,OAAO;YACPN,aAAa;QACf;QAEAH,QAAQgB,SAAS,CAACD;QAElB,MAAME,SAAiCjB,QAAQiB,MAAM,CAACC,OAAO,CAC3DlB,QAAQiB,MAAM,CAACE,SAAS,CAAC;YAAEF,QAAQ;QAAyB,IAC5DjB,QAAQiB,MAAM,CAACG,QAAQ,CAAC;YAAEC,KAAK,IAAI;QAAC,IACpCrB,QAAQiB,MAAM,CAACK,MAAM,CACnB,4EAA4E;QAC7E,CAACf,OAAS,CAAC,WAAW,EAAEJ,YAAYoB,WAAW,GAAG,EAAE,EAAEhB,KAAKiB,OAAO,CAAC,EAAE,CAAC;QAIzE,MAAMC,aAAa;YACjB,IAAIzB,QAAQyB,UAAU,CAACC,OAAO;SAC/B;QACD,OAAO1B,QAAQ2B,YAAY,CAAC;YAC1BjB,OAAOA;YACPN;YACAa;YACAQ;QACF;IAEF;AACF;AAGA,eAAexB,OAAM"}
+{"version":3,"sources":["../../../src/lib/utils/Logger.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access */\nimport axios from \"axios\";\nimport Debug, { Debugger } from \"debug\";\nimport * as crypto from \"crypto\";\n\nexport class Log {\n  private static instance: Log | null = null;\n  private readonly debugLib: Debugger;\n\n  constructor(debug: Debugger) {\n    this.debugLib = debug;\n  }\n\n  public static getInstance(): Log {\n    if (!Log.instance) {\n      const debug: Debugger = Debug(\n        \"@swish:\" + (process.env.npm_package_name || \"package-name-not-specified\")\n      );\n      Log.instance = new Log(debug);\n    }\n\n    return Log.instance;\n  }\n\n  public static extendInstance(name: string) {\n    return this.getInstance().extend(name);\n  }\n\n  public debug(message: string): void {\n    this.debugLib(message);\n  }\n\n  public info(message: string): void {\n    // eslint-disable-next-line no-console\n    this.debugLib.log = console.info.bind(console);\n    this.debugLib(message);\n  }\n\n  public warn(message: string): void {\n    const warnDebug: Debugger = this.debugLib.extend(\"warning\");\n    // eslint-disable-next-line no-console\n    warnDebug.log = console.warn.bind(console);\n    warnDebug(message);\n  }\n\n  public error(message: string | unknown, error?: unknown): void {\n    const errorDebug: Debugger = this.debugLib.extend(\"error\");\n    // eslint-disable-next-line no-console\n    errorDebug.log = console.error.bind(console);\n    errorDebug(message, error);\n  }\n\n  public catchError(error: unknown): void {\n    if (axios.isAxiosError(error)) {\n      this.error(error.toJSON());\n    }\n    if (typeof error === \"string\") {\n      error.toUpperCase(); // works, `e` narrowed to string\n      this.error(error);\n    } else if (error instanceof Error) {\n      error.message; // works, `e` narrowed to Error\n      this.error(error.message);\n    }\n  }\n\n  public catchErrorAndLogUuid(error: unknown): string {\n    const uuid: string = crypto.randomUUID();\n    this.error(`ERROR UUID: ${uuid}`);\n    this.catchError(error);\n\n    return uuid;\n  }\n\n  public extend(extensionName: string): Log {\n    const debugExtension: Debugger = this.debugLib.extend(extensionName);\n    return new Log(debugExtension);\n  }\n}"],"names":["axios","Debug","crypto","Log","instance","constructor","debug","debugLib","getInstance","process","env","npm_package_name","extendInstance","name","extend","message","info","log","console","bind","warn","warnDebug","error","errorDebug","catchError","isAxiosError","toJSON","toUpperCase","Error","catchErrorAndLogUuid","uuid","randomUUID","extensionName","debugExtension"],"mappings":"AAAA,uIAAuI,GACvI,OAAOA,WAAW,QAAQ;AAC1B,OAAOC,WAAyB,QAAQ;AACxC,YAAYC,YAAY,SAAS;AAEjC,OAAO,MAAMC;IACX,OAAeC,WAAuB,IAAI,CAAC;IAG3CC,YAAYC,KAAe,CAAE;QAC3B,IAAI,CAACC,QAAQ,GAAGD;IAClB;IAEA,OAAcE,cAAmB;QAC/B,IAAI,CAACL,IAAIC,QAAQ,EAAE;YACjB,MAAME,QAAkBL,MACtB,YAAaQ,CAAAA,QAAQC,GAAG,CAACC,gBAAgB,IAAI,4BAA2B;YAE1ER,IAAIC,QAAQ,GAAG,IAAID,IAAIG;QACzB,CAAC;QAED,OAAOH,IAAIC,QAAQ;IACrB;IAEA,OAAcQ,eAAeC,IAAY,EAAE;QACzC,OAAO,IAAI,CAACL,WAAW,GAAGM,MAAM,CAACD;IACnC;IAEOP,MAAMS,OAAe,EAAQ;QAClC,IAAI,CAACR,QAAQ,CAACQ;IAChB;IAEOC,KAAKD,OAAe,EAAQ;QACjC,sCAAsC;QACtC,IAAI,CAACR,QAAQ,CAACU,GAAG,GAAGC,QAAQF,IAAI,CAACG,IAAI,CAACD;QACtC,IAAI,CAACX,QAAQ,CAACQ;IAChB;IAEOK,KAAKL,OAAe,EAAQ;QACjC,MAAMM,YAAsB,IAAI,CAACd,QAAQ,CAACO,MAAM,CAAC;QACjD,sCAAsC;QACtCO,UAAUJ,GAAG,GAAGC,QAAQE,IAAI,CAACD,IAAI,CAACD;QAClCG,UAAUN;IACZ;IAEOO,MAAMP,OAAyB,EAAEO,KAAe,EAAQ;QAC7D,MAAMC,aAAuB,IAAI,CAAChB,QAAQ,CAACO,MAAM,CAAC;QAClD,sCAAsC;QACtCS,WAAWN,GAAG,GAAGC,QAAQI,KAAK,CAACH,IAAI,CAACD;QACpCK,WAAWR,SAASO;IACtB;IAEOE,WAAWF,KAAc,EAAQ;QACtC,IAAItB,MAAMyB,YAAY,CAACH,QAAQ;YAC7B,IAAI,CAACA,KAAK,CAACA,MAAMI,MAAM;QACzB,CAAC;QACD,IAAI,OAAOJ,UAAU,UAAU;YAC7BA,MAAMK,WAAW,IAAI,gCAAgC;YACrD,IAAI,CAACL,KAAK,CAACA;QACb,OAAO,IAAIA,iBAAiBM,OAAO;YACjCN,MAAMP,OAAO,EAAE,+BAA+B;YAC9C,IAAI,CAACO,KAAK,CAACA,MAAMP,OAAO;QAC1B,CAAC;IACH;IAEOc,qBAAqBP,KAAc,EAAU;QAClD,MAAMQ,OAAe5B,OAAO6B,UAAU;QACtC,IAAI,CAACT,KAAK,CAAC,CAAC,YAAY,EAAEQ,KAAK,CAAC;QAChC,IAAI,CAACN,UAAU,CAACF;QAEhB,OAAOQ;IACT;IAEOhB,OAAOkB,aAAqB,EAAO;QACxC,MAAMC,iBAA2B,IAAI,CAAC1B,QAAQ,CAACO,MAAM,CAACkB;QACtD,OAAO,IAAI7B,IAAI8B;IACjB;AACF,CAAC"}

package/package.json

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

package/src/lib/dbmodels/PersistedUser.ts

@@ -40,6 +40,9 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.BOOLEAN, allowNull: true })
   declare allowsEmail: boolean;
 
+  @Column({ type: DataType.BOOLEAN, allowNull: true })
+  declare gotParentalConsent: boolean;
+
   @Column({ type: DataType.TEXT, allowNull: true })
   declare weightGoal: string;