pangea-server 3.2.4 → 3.3.0

package/dist/database/decorators/columns/json.columns.d.ts

@@ -1,2 +1,3 @@
-export declare function ColJson(): (target: any, propertyName: string) => void;
+import type { ColGeneralOptions } from '../../../database/database.types';
+export declare function ColJson(options?: ColGeneralOptions): (target: any, propertyName: string) => void;
 export declare function ColStrArray(): (target: any, propertyName: string) => void;

package/dist/database/decorators/columns/json.columns.js

@@ -26,26 +26,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColStrArray = exports.ColJson = void 0;
 const seq = __importStar(require("sequelize-typescript"));
 const column_1 = require("./column");
-function ColJson() {
-    return (0, column_1.Column)('JSON', { defaultValue: {} });
+function ColJson(options) {
+    return function (target, propertyName) {
+        (0, column_1.Column)(seq.DataType.TEXT('long'), {
+            ...options,
+            defaultValue: options?.defaultValue !== undefined ? JSON.stringify(options.defaultValue) : undefined,
+            get() {
+                const val = this.getDataValue(propertyName);
+                return val ? JSON.parse(val) : null;
+            },
+            set(val) {
+                this.setDataValue(propertyName, val ? JSON.stringify(val) : null);
+            },
+        })(target, propertyName);
+    };
 }
 exports.ColJson = ColJson;
 function ColStrArray() {
     return function (target, propertyName) {
         (0, column_1.Column)(seq.DataType.TEXT('long'), {
-            nullable: true,
-            defaultValue: null,
+            defaultValue: '',
             get() {
-                console.log('get: ', propertyName);
                 const val = this.getDataValue(propertyName);
-                console.log('val: ', val);
-                console.log('type: ', typeof val);
-                return typeof val === 'string' && val.length > 0 ? val.split(',') : [];
+                return val.length ? val.split(',') : [];
             },
             set(val) {
-                console.log('set: ', propertyName);
-                console.log('val: ', val);
-                console.log('type: ', typeof val);
                 this.setDataValue(propertyName, val.join(','));
             },
         })(target, propertyName);

package/dist/helpers/job.helpers.d.ts

@@ -1,7 +1,15 @@
 import { Db } from '../database';
-type RunFn = (db: Db) => Promise<void>;
+type TaskFn = (db: Db) => Promise<void>;
+type Timezone = 'UTC' | 'America/New_York' | 'America/Los_Angeles' | 'America/Argentina/Buenos_Aires' | 'America/Sao_Paulo' | 'Europe/London' | 'Europe/Madrid' | 'Africa/Johannesburg' | 'Asia/Tokyo' | 'Australia/Sydney';
+type ScheduleConfig = {
+    expression: string;
+    taskFn: TaskFn;
+    timezone?: Timezone;
+    runOnInit?: boolean;
+};
 export declare abstract class Job {
-    static Run(runFn: RunFn): () => Promise<void>;
+    static Schedule(config: ScheduleConfig): void;
+    private static __Run;
 }
 export interface JobCtor {
     Init(): void;

package/dist/helpers/job.helpers.js

@@ -1,21 +1,27 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Job = void 0;
+const node_cron_1 = __importDefault(require("node-cron"));
 const database_1 = require("../database");
 class Job {
-    static Run(runFn) {
-        return async () => {
-            const tx = await (0, database_1.getDbClient)().transaction();
-            const db = new database_1.Db(tx);
-            try {
-                await runFn(db);
-                await tx.commit();
-            }
-            catch (err) {
-                await tx.rollback();
-                throw err;
-            }
-        };
+    static Schedule(config) {
+        const { expression, taskFn, timezone = 'UTC', runOnInit = false } = config;
+        node_cron_1.default.schedule(expression, () => this.__Run(taskFn), { timezone, runOnInit });
+    }
+    static async __Run(taskFn) {
+        const tx = await (0, database_1.getDbClient)().transaction();
+        const db = new database_1.Db(tx);
+        try {
+            await taskFn(db);
+            await tx.commit();
+        }
+        catch (err) {
+            await tx.rollback();
+            throw err;
+        }
     }
 }
 exports.Job = Job;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.2.4",
+  "version": "3.3.0",
   "files": [
     "dist"
   ],
@@ -49,6 +49,7 @@
     "morgan": "1.10.0",
     "multer": "1.4.5-lts.2",
     "mysql2": "3.14.0",
+    "node-cron": "3.0.3",
     "nodemailer": "6.10.0",
     "pangea-helpers": "1.3.85",
     "reflect-metadata": "0.2.2",
@@ -71,6 +72,7 @@
     "@types/morgan": "1.9.9",
     "@types/multer": "1.4.12",
     "@types/node": "20.2.5",
+    "@types/node-cron": "3.0.11",
     "@types/nodemailer": "6.4.17",
     "tsc-alias": "1.8.15",
     "typescript": "5.2.2",