90dc-core 1.2.15 → 1.2.17

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

@@ -1,15 +1,17 @@
-import { Model } from "sequelize-typescript";
+import { Model } from 'sequelize-typescript';
 export declare class PersistedUser extends Model {
     userUuid: string;
     email: string;
     password: string;
-    firstName: string;
-    lastName: string;
+    firstName?: string;
+    lastName?: string;
     avatar: string;
     sex: string;
     goal: string;
+    isFreeVersion: boolean;
+    allowsEmail: boolean;
     weightGoal: string;
-    role: "default" | "admin";
+    role: 'default' | 'admin';
     level: string;
     type: string;
     days: number;
@@ -19,12 +21,11 @@ export declare class PersistedUser extends Model {
     weight: string;
     activeProgramId: string;
     registrationDate: string;
-    registrationService: "apple" | "google" | "facebook" | "native";
+    registrationService: 'apple' | 'google' | 'facebook' | 'native';
     utilityEmail: string;
     emailConfirmed: boolean;
     utilityEmailConfirmed: boolean;
     changeEmail: boolean;
-    allowsEmail: boolean;
     changeUtilityEmail: boolean;
     subscription: object;
     $addFriend(friendUuid: string): Promise<void>;

package/dist/lib/dbmodels/PersistedUser.js

@@ -7,19 +7,19 @@ 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, Model, Table } from 'sequelize-typescript';
+import { UsersFriends } from './UsersFriends';
 let PersistedUser = class PersistedUser extends Model {
     async $addFriend(friendUuid) {
         await UsersFriends.create({
             userId: this.userUuid,
             friendId: friendUuid,
-            createDate: new Date(),
+            createDate: new Date()
         });
         await UsersFriends.create({
             userId: friendUuid,
             friendId: this.userUuid,
-            createDate: new Date(),
+            createDate: new Date()
         });
     }
 };
@@ -29,7 +29,7 @@ __decorate([
         type: DataType.UUID,
         defaultValue: DataType.UUID,
         allowNull: false,
-        primaryKey: true,
+        primaryKey: true
     }),
     __metadata("design:type", String)
 ], PersistedUser.prototype, "userUuid", void 0);
@@ -61,6 +61,14 @@ __decorate([
     Column({ type: DataType.TEXT, allowNull: true }),
     __metadata("design:type", String)
 ], PersistedUser.prototype, "goal", void 0);
+__decorate([
+    Column({ type: DataType.BOOLEAN, allowNull: true }),
+    __metadata("design:type", Boolean)
+], PersistedUser.prototype, "isFreeVersion", void 0);
+__decorate([
+    Column({ type: DataType.BOOLEAN, allowNull: true }),
+    __metadata("design:type", Boolean)
+], PersistedUser.prototype, "allowsEmail", void 0);
 __decorate([
     Column({ type: DataType.TEXT, allowNull: true }),
     __metadata("design:type", String)
@@ -125,10 +133,6 @@ __decorate([
     Column({ type: DataType.BOOLEAN, allowNull: true }),
     __metadata("design:type", Boolean)
 ], PersistedUser.prototype, "changeEmail", void 0);
-__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)

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.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 allowsEmail: 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, 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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"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "90dc-core",
-  "version": "1.2.15",
+  "version": "1.2.17",
   "description": "A package that contains utils and interfaces used to create 90dc",
   "main": "dist/index.js",
   "type": "module",
   "devDependencies": {
     "@swc/cli": "^0.1.62",
     "@swc/core": "^1.3.36",
+    "@types/debug": "^4.1.12",
     "@types/jest": "^29.4.0",
     "@types/node": "^18.14.1",
     "@types/validator": "^13.7.12",
@@ -20,6 +21,8 @@
   },
   "dependencies": {
     "@typescript-eslint/parser": "^5.53.0",
+    "axios": "^1.6.2",
+    "debug": "^4.3.4",
     "eslint": "^8.34.0",
     "sequelize-typescript": "^2.1.5",
     "winston": "^3.8.2"

package/src/lib/dbmodels/PersistedUser.ts

@@ -1,14 +1,15 @@
-import { Column, DataType, Default, Model, Table } from "sequelize-typescript";
-import { UsersFriends } from "./UsersFriends";
+import { Column, DataType, Default, Index, Model, Table } from "sequelize-typescript";
 
 @Table
 export class PersistedUser extends Model {
+
+  @Index
   @Default(DataType.UUIDV4)
   @Column({
     type: DataType.UUID,
     defaultValue: DataType.UUID,
     allowNull: false,
-    primaryKey: true,
+    primaryKey: true
   })
   declare userUuid: string;
 
@@ -19,10 +20,10 @@ export class PersistedUser extends Model {
   declare password: string;
 
   @Column({ type: DataType.TEXT, allowNull: true })
-  declare firstName: string;
+  declare firstName?: string;
 
   @Column({ type: DataType.TEXT, allowNull: true })
-  declare lastName: string;
+  declare lastName?: string;
 
   @Column({ type: DataType.TEXT, allowNull: true })
   declare avatar: string;
@@ -33,11 +34,17 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.TEXT, allowNull: true })
   declare goal: string;
 
+  @Column({ type: DataType.BOOLEAN, allowNull: true })
+  declare isFreeVersion: boolean;
+
+  @Column({ type: DataType.BOOLEAN, allowNull: true })
+  declare allowsEmail: boolean;
+
   @Column({ type: DataType.TEXT, allowNull: true })
   declare weightGoal: string;
 
   @Column({ type: DataType.TEXT, allowNull: true })
-  declare role: "default" | "admin";
+  declare role: 'default' | 'admin';
 
   @Column({ type: DataType.TEXT, allowNull: true })
   declare level: string;
@@ -67,7 +74,7 @@ export class PersistedUser extends Model {
   declare registrationDate: string;
 
   @Column({ type: DataType.TEXT, allowNull: true })
-  declare registrationService: "apple" | "google" | "facebook" | "native";
+  declare registrationService: 'apple' | 'google' | 'facebook' | 'native';
 
   @Column({ type: DataType.TEXT, allowNull: true })
   declare utilityEmail: string;
@@ -81,26 +88,10 @@ export class PersistedUser extends Model {
   @Column({ type: DataType.BOOLEAN, allowNull: true })
   declare changeEmail: boolean;
 
-  @Column({ type: DataType.BOOLEAN, allowNull: true })
-  declare allowsEmail: boolean;
-
   @Column({ type: DataType.BOOLEAN, allowNull: true })
   declare changeUtilityEmail: boolean;
 
   @Column({ type: DataType.JSONB, allowNull: true })
   declare subscription: object;
 
-  async $addFriend(friendUuid: string) {
-    await UsersFriends.create({
-      userId: this.userUuid,
-      friendId: friendUuid,
-      createDate: new Date(),
-    });
-
-    await UsersFriends.create({
-      userId: friendUuid,
-      friendId: this.userUuid,
-      createDate: new Date(),
-    });
-  }
 }

package/src/lib/utils/Logger.ts

@@ -1,54 +1,78 @@
-import winston from 'winston'
+/* eslint-disable @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access */
+import axios from "axios";
+import Debug, { Debugger } from "debug";
+import * as crypto from "crypto";
 
-class Logger {
+export class Log {
+  private static instance: Log | null = null;
+  private readonly debugLib: Debugger;
 
-  public static getLogger(serviceName: string){
-    const levels = {
-      error: 0,
-      warn: 1,
-      info: 2,
-      http: 3,
-      debug: 4,
-    }
+  constructor(debug: Debugger) {
+    this.debugLib = debug;
+  }
 
-    const level = () => {
-      const env = process.env.NODE_ENV || 'development'
-      const isDevelopment = env === 'development'
-      return isDevelopment ? 'debug' : 'warn'
+  public static getInstance(): Log {
+    if (!Log.instance) {
+      const debug: Debugger = Debug(
+        "@swish:" + (process.env.npm_package_name || "package-name-not-specified")
+      );
+      Log.instance = new Log(debug);
     }
 
-    const colors = {
-      error: 'red',
-      warn: 'yellow',
-      info: 'magenta',
-      http: 'magenta',
-      debug: 'white',
-      serviceName: 'magenta'
-    }
+    return Log.instance;
+  }
+
+  public static extendInstance(name: string) {
+    return this.getInstance().extend(name);
+  }
+
+  public debug(message: string): void {
+    this.debugLib(message);
+  }
 
-    winston.addColors(colors)
+  public info(message: string): void {
+    // eslint-disable-next-line no-console
+    this.debugLib.log = console.info.bind(console);
+    this.debugLib(message);
+  }
 
-    const format: winston.Logform.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`,
-      ),
-    )
+  public warn(message: string): void {
+    const warnDebug: Debugger = this.debugLib.extend("warning");
+    // eslint-disable-next-line no-console
+    warnDebug.log = console.warn.bind(console);
+    warnDebug(message);
+  }
 
-    const transports = [
-      new winston.transports.Console(),
-    ]
-    return winston.createLogger({
-      level: level(),
-      levels,
-      format,
-      transports,
-    })
+  public error(message: string | unknown, error?: unknown): void {
+    const errorDebug: Debugger = this.debugLib.extend("error");
+    // eslint-disable-next-line no-console
+    errorDebug.log = console.error.bind(console);
+    errorDebug(message, error);
+  }
 
+  public catchError(error: unknown): void {
+    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);
+    }
   }
-}
 
+  public catchErrorAndLogUuid(error: unknown): string {
+    const uuid: string = crypto.randomUUID();
+    this.error(`ERROR UUID: ${uuid}`);
+    this.catchError(error);
+
+    return uuid;
+  }
 
-export default Logger
+  public extend(extensionName: string): Log {
+    const debugExtension: Debugger = this.debugLib.extend(extensionName);
+    return new Log(debugExtension);
+  }
+}