Merge pull request #29 from kirannagarakanti369-glitch/main

Critical Bug Fixes: Resolved Application Homepage loading error

Author: Kuzma02

package.json

@@ -3,10 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
-    "build": "next build",
+    "dev": "prisma generate && next dev",       
+    "build": "prisma generate && next build",   
     "start": "next start",
-    "lint": "next lint"
+    "lint": "next lint",
+    "db:generate": "prisma generate",
+    "db:push": "prisma db push",
+    "db:studio": "prisma studio"
   },
   "dependencies": {
     "@headlessui/react": "^1.7.18",

server/middleware/requestLogger.js

@@ -29,10 +29,19 @@ const errorLogStream = fs.createWriteStream(
 );
 
 // Middleware to add request ID
-const addRequestId = (req, res, next) => {
-  req.reqId = require('nanoid').nanoid(8);
-  res.setHeader('X-Request-ID', req.reqId);
-  next();
+const addRequestId = async (req, res, next) => {
+  try {
+    const { nanoid } = await import('nanoid');
+    req.reqId = nanoid(8);
+    res.setHeader('X-Request-ID', req.reqId);
+    next();
+  } catch (error) {
+    console.error('Error generating request ID:', error);
+    // Fallback ID
+    req.reqId = Math.random().toString(36).substr(2, 8);
+    res.setHeader('X-Request-ID', req.reqId);
+    next();
+  }
 };
 
 // Standard request logger

server/utills/notificationHelpers.js

@@ -1,8 +1,21 @@
 const { PrismaClient } = require('@prisma/client');
-const { nanoid } = require('nanoid');
 
 const prisma = new PrismaClient();
 
+/**
+ * Generate ID using nanoid with dynamic import
+ */
+const generateId = async () => {
+  try {
+    const { nanoid } = await import('nanoid');
+    return nanoid();
+  } catch (error) {
+    console.error('Error generating nanoid:', error);
+    // Fallback ID generation
+    return Math.random().toString(36).substr(2, 10);
+  }
+};
+
 /**
  * Create an order update notification
  */
@@ -47,9 +60,11 @@ const createOrderUpdateNotification = async (userId, orderStatus, orderId, total
       priority: 'NORMAL'
     };
 
+    const notificationId = await generateId();
+
     const notification = await prisma.notification.create({
       data: {
-        id: nanoid(),
+        id: notificationId,
         userId: userId,
         title: statusInfo.title,
         message: statusInfo.message,
@@ -101,9 +116,11 @@ const createPaymentNotification = async (userId, paymentStatus, amount, orderId)
       priority: 'NORMAL'
     };
 
+    const notificationId = await generateId();
+
     const notification = await prisma.notification.create({
       data: {
-        id: nanoid(),
+        id: notificationId,
         userId: userId,
         title: statusInfo.title,
         message: statusInfo.message,
@@ -131,9 +148,11 @@ const createPaymentNotification = async (userId, paymentStatus, amount, orderId)
  */
 const createPromotionNotification = async (userId, title, message, promoCode = null, discount = null) => {
   try {
+    const notificationId = await generateId();
+
     const notification = await prisma.notification.create({
       data: {
-        id: nanoid(),
+        id: notificationId,
         userId: userId,
         title: title,
         message: message,
@@ -160,9 +179,11 @@ const createPromotionNotification = async (userId, title, message, promoCode = n
  */
 const createSystemAlertNotification = async (userId, title, message, priority = 'HIGH') => {
   try {
+    const notificationId = await generateId();
+
     const notification = await prisma.notification.create({
       data: {
-        id: nanoid(),
+        id: notificationId,
         userId: userId,
         title: title,
         message: message,
@@ -188,23 +209,29 @@ const createSystemAlertNotification = async (userId, title, message, priority =
  */
 const createBulkNotifications = async (userIds, title, message, type = 'SYSTEM_ALERT', priority = 'NORMAL', metadata = {}) => {
   try {
-    const notifications = userIds.map(userId => ({
-      id: nanoid(),
-      userId: userId,
-      title: title,
-      message: message,
-      type: type,
-      priority: priority,
-      isRead: false,
-      metadata: metadata
-    }));
+    // Generate all IDs first
+    const notificationData = await Promise.all(
+      userIds.map(async (userId) => {
+        const notificationId = await generateId();
+        return {
+          id: notificationId,
+          userId: userId,
+          title: title,
+          message: message,
+          type: type,
+          priority: priority,
+          isRead: false,
+          metadata: metadata
+        };
+      })
+    );
 
     await prisma.notification.createMany({
-      data: notifications
+      data: notificationData
     });
 
     console.log(`✅ Bulk notifications created for ${userIds.length} users: ${title}`);
-    return notifications.length;
+    return notificationData.length;
   } catch (error) {
     console.error('❌ Error creating bulk notifications:', error);
     throw error;
@@ -217,4 +244,4 @@ module.exports = {
   createPromotionNotification,
   createSystemAlertNotification,
   createBulkNotifications
-};
+};