@saltcorn/data 1.4.1-beta.2 → 1.4.1

package/dist/tests/mail_queue.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail_queue.test.d.ts","sourceRoot":"","sources":["../../tests/mail_queue.test.ts"],"names":[],"mappings":""}

package/dist/tests/mail_queue.test.js

@@ -0,0 +1,122 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const notification_1 = __importDefault(require("../models/notification"));
+const user_1 = __importDefault(require("../models/user"));
+const globals_1 = require("@jest/globals");
+const nodemailer_1 = require("nodemailer");
+const mocks_1 = __importDefault(require("./mocks"));
+const { sleep } = mocks_1.default;
+const assertions_1 = require("./assertions");
+const { getState } = require("../db/state");
+const db = require("../db");
+afterAll(db.close);
+beforeAll(async () => {
+    await require("../db/reset_schema")();
+    await require("../db/fixtures")();
+    const admin = await user_1.default.findOne({ email: "admin@foo.com" });
+    if (admin) {
+        await admin.update({ _attributes: { notify_email: true } });
+    }
+    await getState().setConfig("mail_throttle_per_user", 2);
+    await getState().refresh_config();
+});
+globals_1.jest.mock("nodemailer");
+globals_1.jest.setTimeout(600 * 1000);
+const emptyNotificationsTable = async () => {
+    await db.deleteWhere("_sc_notifications", {});
+};
+(0, globals_1.describe)("Mail queue", () => {
+    (0, globals_1.it)("should send when there are no previous mails", async () => {
+        let sentEmail;
+        // @ts-ignore
+        nodemailer_1.createTransport.mockReturnValue({
+            sendMail: (email) => {
+                sentEmail = email;
+                return new Promise((resolve) => resolve(true));
+            },
+        });
+        const notification = await notification_1.default.create({
+            title: "test A",
+            created: new Date(),
+            user_id: 1,
+        });
+        (0, assertions_1.assertIsSet)(notification.id);
+        (0, globals_1.expect)(nodemailer_1.createTransport).toHaveBeenCalledTimes(1);
+        const fromDb = await notification_1.default.findOne({ id: notification.id });
+        (0, globals_1.expect)(fromDb?.send_status).toBe("sent");
+    });
+    (0, globals_1.it)("should schedule when the min interval has not passed", async () => {
+        await emptyNotificationsTable();
+        let sentEmail;
+        // @ts-ignore
+        nodemailer_1.createTransport.mockClear();
+        // @ts-ignore
+        nodemailer_1.createTransport.mockReturnValue({
+            sendMail: (email) => {
+                sentEmail = email;
+                return new Promise((resolve) => resolve(true));
+            },
+        });
+        const minDelay = getState().getConfig("mail_throttle_per_user", 30) * 1000;
+        (0, globals_1.expect)(minDelay).toBe(2000);
+        const notificationA = await notification_1.default.create({
+            title: "title A",
+            created: new Date(),
+            user_id: 1,
+        });
+        (0, assertions_1.assertIsSet)(notificationA.id);
+        const fromDbA = await notification_1.default.findOne({ id: notificationA.id });
+        (0, globals_1.expect)(fromDbA?.send_status).toBe("sent");
+        (0, globals_1.expect)(nodemailer_1.createTransport).toHaveBeenCalledTimes(1);
+        const notificationB = await notification_1.default.create({
+            title: "title B",
+            created: new Date(),
+            user_id: 1,
+        });
+        (0, assertions_1.assertIsSet)(notificationB.id);
+        let fromDbB = await notification_1.default.findOne({ id: notificationB.id });
+        (0, globals_1.expect)(fromDbB?.send_status).toBe("pending");
+        await sleep(minDelay + 500);
+        fromDbB = await notification_1.default.findOne({ id: notificationB.id });
+        (0, globals_1.expect)(fromDbB?.send_status).toBe("sent");
+        (0, globals_1.expect)(nodemailer_1.createTransport).toHaveBeenCalledTimes(2);
+    });
+    (0, globals_1.it)("should send when the min interval has passed", async () => {
+        await emptyNotificationsTable();
+        let sentEmail;
+        // @ts-ignore
+        nodemailer_1.createTransport.mockClear();
+        // @ts-ignore
+        nodemailer_1.createTransport.mockReturnValue({
+            sendMail: (email) => {
+                sentEmail = email;
+                return new Promise((resolve) => resolve(true));
+            },
+        });
+        const minDelay = getState().getConfig("mail_throttle_per_user", 30) * 1000;
+        (0, globals_1.expect)(minDelay).toBe(2000);
+        const notificationA = await notification_1.default.create({
+            title: "title A",
+            created: new Date(Date.now() - minDelay - 1000),
+            user_id: 1,
+        });
+        (0, assertions_1.assertIsSet)(notificationA.id);
+        const fromDbA = await notification_1.default.findOne({ id: notificationA.id });
+        (0, globals_1.expect)(fromDbA?.send_status).toBe("sent");
+        (0, globals_1.expect)(nodemailer_1.createTransport).toHaveBeenCalledTimes(1);
+        await sleep(minDelay + 1);
+        const notificationB = await notification_1.default.create({
+            title: "title B",
+            created: new Date(),
+            user_id: 1,
+        });
+        (0, assertions_1.assertIsSet)(notificationB.id);
+        let fromDbB = await notification_1.default.findOne({ id: notificationB.id });
+        (0, globals_1.expect)(fromDbB?.send_status).toBe("sent");
+        (0, globals_1.expect)(nodemailer_1.createTransport).toHaveBeenCalledTimes(2);
+    });
+});
+//# sourceMappingURL=mail_queue.test.js.map

package/dist/tests/mail_queue.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mail_queue.test.js","sourceRoot":"","sources":["../../tests/mail_queue.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/data",
-  "version": "1.4.1-beta.2",
+  "version": "1.4.1",
   "description": "Data models for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -37,15 +37,15 @@
     "!dist/tsconfig.ref.tsbuildinfo"
   ],
   "optionalDependencies": {
-    "@saltcorn/postgres": "1.4.1-beta.2",
-    "@saltcorn/sqlite": "1.4.1-beta.2"
+    "@saltcorn/postgres": "1.4.1",
+    "@saltcorn/sqlite": "1.4.1"
   },
   "dependencies": {
-    "@saltcorn/types": "1.4.1-beta.2",
-    "@saltcorn/markup": "1.4.1-beta.2",
-    "@saltcorn/common-code": "1.4.1-beta.2",
-    "@saltcorn/db-common": "1.4.1-beta.2",
-    "@saltcorn/sqlite-mobile": "1.4.1-beta.2",
+    "@saltcorn/types": "1.4.1",
+    "@saltcorn/markup": "1.4.1",
+    "@saltcorn/common-code": "1.4.1",
+    "@saltcorn/db-common": "1.4.1",
+    "@saltcorn/sqlite-mobile": "1.4.1",
     "@saltcorn/plain-date": "0.2.5",
     "acorn": "^8.14.0",
     "assert": "^2.1.0",