migrate to esm

This commit is contained in:
Alex Holliday committed 2024-10-15 11:57:37 +08:00
1 parent c2e00375c1
commit f057807b56
52 files changed
+296 -302

No files matched your search

+2 -2
View File
@@ -1,4 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const AppSettingsSchema = mongoose.Schema(
{
@@ -78,4 +78,4 @@ const AppSettingsSchema = mongoose.Schema(
}
);
module.exports = mongoose.model("AppSettings", AppSettingsSchema);
export default mongoose.model("AppSettings", AppSettingsSchema);
+4 -5
View File
@@ -1,6 +1,6 @@
const mongoose = require("mongoose");
const EmailService = require("../../service/emailService");
const Notification = require("./Notification");
import mongoose from "mongoose";
import EmailService from "../../service/emailService.js";
import Notification from "./Notification.js";
/**
* Check Schema for MongoDB collection.
@@ -73,5 +73,4 @@ const CheckSchema = mongoose.Schema(
);
CheckSchema.index({ createdAt: 1 });
module.exports = mongoose.model("Check", CheckSchema);
export default mongoose.model("Check", CheckSchema);
+2 -3
View File
@@ -1,5 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const InviteTokenSchema = mongoose.Schema(
{
email: {
@@ -32,4 +31,4 @@ const InviteTokenSchema = mongoose.Schema(
}
);
module.exports = mongoose.model("InviteToken", InviteTokenSchema);
export default mongoose.model("InviteToken", InviteTokenSchema);
+2 -3
View File
@@ -1,5 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
/**
* MaintenanceWindow Schema
* @module MaintenanceWindow
@@ -66,4 +65,4 @@ const MaintenanceWindow = mongoose.Schema(
}
);
module.exports = mongoose.model("MaintenanceWindow", MaintenanceWindow);
export default mongoose.model("MaintenanceWindow", MaintenanceWindow);
+3 -3
View File
@@ -1,5 +1,5 @@
const mongoose = require("mongoose");
const Notification = require("./Notification");
import mongoose from "mongoose";
import Notification from "./Notification.js";
const MonitorSchema = mongoose.Schema(
{
@@ -60,4 +60,4 @@ const MonitorSchema = mongoose.Schema(
}
);
module.exports = mongoose.model("Monitor", MonitorSchema);
export default mongoose.model("Monitor", MonitorSchema);
+2 -4
View File
@@ -1,5 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const NotificationSchema = mongoose.Schema(
{
monitorId: {
@@ -22,5 +21,4 @@ const NotificationSchema = mongoose.Schema(
timestamps: true,
}
);
module.exports = mongoose.model("Notification", NotificationSchema);
export default mongoose.model("Notification", NotificationSchema);
+2 -3
View File
@@ -1,5 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const AuditSchema = mongoose.Schema({
id: { type: String, required: true },
title: { type: String, required: true },
@@ -109,4 +108,4 @@ PageSpeedCheck.pre("save", async function (next) {
}
});
module.exports = mongoose.model("PageSpeedCheck", PageSpeedCheck);
export default mongoose.model("PageSpeedCheck", PageSpeedCheck);
+2 -2
View File
@@ -1,4 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const RecoveryTokenSchema = mongoose.Schema(
{
@@ -22,4 +22,4 @@ const RecoveryTokenSchema = mongoose.Schema(
}
);
module.exports = mongoose.model("RecoveryToken", RecoveryTokenSchema);
export default mongoose.model("RecoveryToken", RecoveryTokenSchema);
+2 -4
View File
@@ -1,5 +1,4 @@
const mongoose = require("mongoose");
import mongoose from "mongoose";
const TeamSchema = mongoose.Schema(
{
email: {
@@ -12,5 +11,4 @@ const TeamSchema = mongoose.Schema(
timestamps: true,
}
);
module.exports = mongoose.model("Team", TeamSchema);
export default mongoose.model("Team", TeamSchema);
+3 -3
View File
@@ -1,5 +1,5 @@
const mongoose = require("mongoose");
const bcrypt = require("bcrypt");
import mongoose from "mongoose";
import bcrypt from "bcrypt";
const UserSchema = mongoose.Schema(
{
@@ -84,4 +84,4 @@ User.init().then(() => {
console.log("User model initialized");
});
module.exports = mongoose.model("User", UserSchema);
export default mongoose.model("User", UserSchema);
+21 -24
View File
@@ -1,6 +1,6 @@
const mongoose = require("mongoose");
const UserModel = require("../models/User");
const AppSettings = require("../models/AppSettings");
import mongoose from "mongoose";
import UserModel from "../models/User.js";
import AppSettings from "../models/AppSettings.js";
//****************************************
// DB Connection
@@ -41,7 +41,7 @@ const checkSuperadmin = async (req, res) => {
// User Operations
//****************************************
const {
import {
insertUser,
getUserByEmail,
updateUser,
@@ -50,32 +50,32 @@ const {
deleteAllOtherUsers,
getAllUsers,
logoutUser,
} = require("./modules/userModule");
} from "./modules/userModule.js";
//****************************************
// Invite Token Operations
//****************************************
const {
import {
requestInviteToken,
getInviteToken,
getInviteTokenAndDelete,
} = require("./modules/inviteModule");
} from "./modules/inviteModule.js";
//****************************************
// Recovery Operations
//****************************************
const {
import {
requestRecoveryToken,
validateRecoveryToken,
resetPassword,
} = require("./modules/recoveryModule");
} from "./modules/recoveryModule.js";
//****************************************
// Monitors
//****************************************
const {
import {
getAllMonitors,
getMonitorStatsById,
getMonitorById,
@@ -87,23 +87,23 @@ const {
deleteMonitorsByUserId,
editMonitor,
addDemoMonitors,
} = require("./modules/monitorModule");
} from "./modules/monitorModule.js";
//****************************************
// Page Speed Checks
//****************************************
const {
import {
createPageSpeedCheck,
getPageSpeedChecks,
deletePageSpeedChecksByMonitorId,
} = require("./modules/pageSpeedCheckModule");
} from "./modules/pageSpeedCheckModule.js";
//****************************************
// Checks
//****************************************
const {
import {
createCheck,
getChecksCount,
getChecks,
@@ -111,12 +111,12 @@ const {
deleteChecks,
deleteChecksByTeamId,
updateChecksTTL,
} = require("./modules/checkModule");
} from "./modules/checkModule.js";
//****************************************
// Maintenance Window
//****************************************
const {
import {
createMaintenanceWindow,
getMaintenanceWindowById,
getMaintenanceWindowsByTeamId,
@@ -125,26 +125,23 @@ const {
deleteMaintenanceWindowByMonitorId,
deleteMaintenanceWindowByUserId,
editMaintenanceWindowById,
} = require("./modules/maintenanceWindowModule");
} from "./modules/maintenanceWindowModule.js";
//****************************************
// Notifications
//****************************************
const {
import {
createNotification,
getNotificationsByMonitorId,
deleteNotificationsByMonitorId,
} = require("./modules/notificationModule");
} from "./modules/notificationModule.js";
//****************************************
// AppSettings
//****************************************
const {
getAppSettings,
updateAppSettings,
} = require("./modules/settingsModule");
import { getAppSettings, updateAppSettings } from "./modules/settingsModule.js";
module.exports = {
export default {
connect,
insertUser,
getUserByEmail,
+5 -5
View File
@@ -1,7 +1,7 @@
const Check = require("../../models/Check");
const Monitor = require("../../models/Monitor");
const User = require("../../models/User");
const logger = require("../../../utils/logger");
import Check from "../../models/Check.js";
import Monitor from "../../models/Monitor.js";
import User from "../../models/User.js";
import logger from "../../../utils/logger.js";
const SERVICE_NAME = "checkModule";
const dateRangeLookup = {
day: new Date(new Date().setDate(new Date().getDate() - 1)),
@@ -274,7 +274,7 @@ const updateChecksTTL = async (teamId, ttl) => {
}
};
module.exports = {
export {
createCheck,
getChecksCount,
getChecks,
+5 -9
View File
@@ -1,8 +1,8 @@
const InviteToken = require("../../models/InviteToken");
const crypto = require("crypto");
const { errorMessages } = require("../../../utils/messages");
const SERVICE_NAME = "inviteModule";
import InviteToken from "../../models/InviteToken.js";
import crypto from "crypto";
import { errorMessages } from "../../../utils/messages.js";
const SERVICE_NAME = "inviteModule";
/**
* Request an invite token for a user.
*
@@ -83,8 +83,4 @@ const getInviteTokenAndDelete = async (token) => {
}
};
module.exports = {
requestInviteToken,
getInviteToken,
getInviteTokenAndDelete,
};
export { requestInviteToken, getInviteToken, getInviteTokenAndDelete };
@@ -1,4 +1,4 @@
const MaintenanceWindow = require("../../models/MaintenanceWindow");
import MaintenanceWindow from "../../models/MaintenanceWindow.js";
const SERVICE_NAME = "maintenanceWindowModule";
/**
@@ -220,7 +220,7 @@ const editMaintenanceWindowById = async (
}
};
module.exports = {
export {
createMaintenanceWindow,
getMaintenanceWindowById,
getMaintenanceWindowsByTeamId,
+20 -8
View File
@@ -1,10 +1,22 @@
const Monitor = require("../../models/Monitor");
const Check = require("../../models/Check");
const PageSpeedCheck = require("../../models/PageSpeedCheck");
const { errorMessages } = require("../../../utils/messages");
const Notification = require("../../models/Notification");
const { NormalizeData } = require("../../../utils/dataUtils");
const demoMonitors = require("../../../utils/demoMonitors.json");
import Monitor from "../../models/Monitor.js";
import Check from "../../models/Check.js";
import PageSpeedCheck from "../../models/PageSpeedCheck.js";
import { errorMessages } from "../../../utils/messages.js";
import Notification from "../../models/Notification.js";
import { NormalizeData } from "../../../utils/dataUtils.js";
import fs from "fs";
import path from "path";
import { fileURLToPath } from "url";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const demoMonitorsPath = path.resolve(
__dirname,
"../../../utils/demoMonitors.json"
);
const demoMonitors = JSON.parse(fs.readFileSync(demoMonitorsPath, "utf8"));
const SERVICE_NAME = "monitorModule";
/**
@@ -572,7 +584,7 @@ const addDemoMonitors = async (userId, teamId) => {
}
};
module.exports = {
export {
getAllMonitors,
getMonitorStatsById,
getMonitorById,
@@ -1,4 +1,4 @@
const Notification = require("../../models/Notification");
import Notification from "../../models/Notification.js";
const SERVICE_NAME = "notificationModule";
/**
* Creates a new notification.
@@ -49,7 +49,7 @@ const deleteNotificationsByMonitorId = async (monitorId) => {
}
};
module.exports = {
export {
createNotification,
getNotificationsByMonitorId,
deleteNotificationsByMonitorId,
@@ -1,4 +1,4 @@
const PageSpeedCheck = require("../../models/PageSpeedCheck");
import PageSpeedCheck from "../../models/PageSpeedCheck.js";
const SERVICE_NAME = "pageSpeedCheckModule";
/**
* Create a PageSpeed check for a monitor
@@ -63,7 +63,7 @@ const deletePageSpeedChecksByMonitorId = async (monitorId) => {
}
};
module.exports = {
export {
createPageSpeedCheck,
getPageSpeedChecks,
deletePageSpeedChecksByMonitorId,
+6 -9
View File
@@ -1,7 +1,8 @@
const UserModel = require("../../models/User");
const RecoveryToken = require("../../models/RecoveryToken");
const crypto = require("crypto");
const { errorMessages } = require("../../../utils/messages");
import UserModel from "../../models/User.js";
import RecoveryToken from "../../models/RecoveryToken.js";
import crypto from "crypto";
import { errorMessages } from "../../../utils/messages.js";
const SERVICE_NAME = "recoveryModule";
/**
@@ -81,8 +82,4 @@ const resetPassword = async (req, res) => {
}
};
module.exports = {
requestRecoveryToken,
validateRecoveryToken,
resetPassword,
};
export { requestRecoveryToken, validateRecoveryToken, resetPassword };
+2 -5
View File
@@ -1,4 +1,4 @@
const AppSettings = require("../../models/AppSettings");
import AppSettings from "../../models/AppSettings.js";
const SERVICE_NAME = "SettingsModule";
const getAppSettings = async () => {
@@ -27,7 +27,4 @@ const updateAppSettings = async (newSettings) => {
}
};
module.exports = {
getAppSettings,
updateAppSettings,
};
export { getAppSettings, updateAppSettings };
+7 -7
View File
@@ -1,11 +1,11 @@
const UserModel = require("../../models/User");
const TeamModel = require("../../models/Team");
const { errorMessages } = require("../../../utils/messages");
const { GenerateAvatarImage } = require("../../../utils/imageProcessing");
import UserModel from "../../models/User.js";
import TeamModel from "../../models/Team.js";
import { errorMessages } from "../../../utils/messages.js";
import { GenerateAvatarImage } from "../../../utils/imageProcessing.js";
const DUPLICATE_KEY_CODE = 11000; // MongoDB error code for duplicate key
const { ParseBoolean } = require("../../../utils/utils");
SERVICE_NAME = "userModule";
import { ParseBoolean } from "../../../utils/utils.js";
const SERVICE_NAME = "userModule";
/**
* Insert a User
@@ -208,7 +208,7 @@ const logoutUser = async (userId) => {
}
};
module.exports = {
export {
insertUser,
getUserByEmail,
updateUser,