Merge branch 'main' of ssh://gits.techvanguard.vn:8822/UKSOURCE/cms.hailearning.edu.vn into main

controllers/auditLogController.js

@@ -26,6 +26,9 @@ exports.index = async (req, res) => {
     if (req.query.dateFrom || req.query.dateTo) {
       filter.createdAt = {};
       if (req.query.dateFrom) {
+        filter.createdAt.$gte = new Date(req.query.dateFrom);
+      }
+
       if (req.query.dateTo) {
         const dateTo = new Date(req.query.dateTo);
         dateTo.setHours(23, 59, 59, 999); // End of day

controllers/headerController.js

@@ -1,5 +1,5 @@
 const Header = require("../models/header");
-const HeaderMenu = require("../models/HeaderMenu");
+const HeaderMenu = require("../models/headerMenu");
 const writeAuditLog = require("../audit/writeAuditLog");
 const diffObject = require("../audit/diffObject");
 const AUDIT_ACTIONS = require("../constants/auditAction");

controllers/headerMenuController.js

@@ -1,4 +1,4 @@
-const HeaderMenu = require("../models/HeaderMenu");
+const HeaderMenu = require("../models/headerMenu");
 const slugify = require("slugify");
 
 /**

models/auditLog.js

@@ -61,4 +61,4 @@ const auditLogSchema = new mongoose.Schema({
   },
 });
 
-module.exports = mongoose.model("AuditLog", auditLogSchema);
+module.exports = mongoose.model("AuditLog", auditLogSchema); // Index for faster queries

models/headerMenu.js

@@ -43,6 +43,6 @@ const HeaderMenuSchema = new mongoose.Schema({
 // Indexes for optimization
 HeaderMenuSchema.index({ order: 1 });
 HeaderMenuSchema.index({ status: 1 });
-HeaderMenuSchema.index({ parentId: 1, order: 1 }); // Useful for fetching children in order
+HeaderMenuSchema.index({ parentId: 1, order: 1 });
 
 module.exports = mongoose.model('HeaderMenu', HeaderMenuSchema);

scripts/migrate-header-menu.js

@@ -2,7 +2,7 @@ const mongoose = require('mongoose');
 const fs = require('fs');
 const path = require('path');
 const dotenv = require('dotenv');
-const HeaderMenu = require('../models/HeaderMenu');
+const HeaderMenu = require('../models/headerMenu');
 
 dotenv.config();