Merge branch 'main' into dev-rohit

Author: rohitbytecode

src/config/db.js

@@ -3,7 +3,6 @@ import mongoose from 'mongoose';
 const connectDB = async () => {
   try {
     await mongoose.connect(process.env.MONGO_URI);
-    console.log('MongoDB connected');
   } catch (error) {
     console.error('DB connection failed', error);
     process.exit(1);

src/controllers/patient.js

@@ -1,51 +1,24 @@
 import Patient from '../models/patient.js';
-import User from '../models/User.js';
-import bcrypt from 'bcrypt';
-import * as emailService from '../services/email.service.js';
+import { createPatientPortalAccount } from '../services/patientPortal.service.js';
 
 const createPatient = async (req, res, next) => {
   try {
     const { name, email, phno, paymentMode } = req.body;
+
     console.log(`Creating patient: ${name}, Email: ${email}, PaymentMode: ${paymentMode}`);
 
-    // Create the patient record
     const patient = new Patient(req.body);
     await patient.save();
 
-    // If online payment, create a patient portal account
-    if (paymentMode === 'online') {
-      console.log(`Online payment mode detected for ${email}. Processing portal creation...`);
-      const existingUser = await User.findOne({ email });
-      if (!existingUser) {
-        // Use phone number as default password
-        const password = phno; // Plain text for the email
-        const hashedPassword = await bcrypt.hash(password, 10);
-        
-        await User.create({
-          name,
-          email,
-          password: hashedPassword,
-          role: 'patient',
-          status: 'Active',
-          phno
-        });
-        console.log(`Patient portal User record created for: ${email}`);
-
-        // Send credentials email
-        try {
-          await emailService.sendPortalCredentials(email, name, password);
-          console.log(`Portal credentials email sent to: ${email}`);
-        } catch (mailErr) {
-          console.error(`Failed to send portal credentials email: ${mailErr.message}`);
-        }
-      } else {
-        console.log(`User account already exists for: ${email}. Skipping portal creation.`);
-      }
-    } else {
-      console.log(`Payment mode is '${paymentMode}'. Skipping portal creation.`);
+    if (paymentMode === "online" && email) {
+      await createPatientPortalAccount(email);
     }
 
-    res.status(201).json(patient);
+    res.status(201).json({
+      success: true,
+      patient
+    });
+
   } catch (err) {
     console.error(`Error in createPatient: ${err.message}`);
     next(err);

src/models/patient.js

@@ -32,6 +32,11 @@ status:{
     default:'active',
     required:true
 },
+  paymentMethod: {
+    type: String,
+    enum: ['cash', 'online'],
+    default: 'cash'
+  },
 bg:{
     type: String,
     enum:['A+','A-','B+','B-','AB+','AB-','O+','O-']

src/services/email.service.js

@@ -62,20 +62,30 @@ export const sendOTPEmail = async (email, otp) => {
   });
 };
 
-export const sendPortalCredentials = async (email, name, password) => {
+export const sendCredentialsEmail = async (email, password) => {
   await transporter.sendMail({
     from: `"HMS Team" <${process.env.GMAIL_EMAIL}>`,
     to: email,
-    subject: 'Your HMS Patient Portal Account Details',
+    subject: "Your HMS Patient Portal Login Credentials",
+
     html: `
-      <div style="font-family: Arial, sans-serif; padding: 20px;">
-        <h2>Welcome to HMS, ${name}!</h2>
-        <p>Your patient portal account has been created successfully.</p>
-        <p><strong>Username/Email:</strong> ${email}</p>
-        <p><strong>Temporary Password:</strong> ${password}</p>
-        <p style="color: #555;">Please log in to the portal and change your password for security.</p>
-        <hr />
-        <p style="font-size: 12px; color: #888;">© ${new Date().getFullYear()} HMS Team.</p>
+      <div style="font-family: Arial; padding:20px;">
+        <h2>Welcome to HMS Portal</h2>
+
+        <p>Your account has been created successfully.</p>
+
+        <p><b>Email:</b> ${email}</p>
+        <p><b>Password:</b> ${password}</p>
+
+        <p>Please login and change your password immediately.</p>
+
+        <p>Login Link: <a href="https://hms-app/login">Login</a></p>
+
+        <hr/>
+
+        <p style="font-size:12px;color:#888;">
+        This email was generated automatically.
+        </p>
       </div>
     `
   });

src/services/patientPortal.service.js

@@ -0,0 +1,32 @@
+import bcrypt from 'bcrypt';
+import User from '../models/User.js';
+import { generateRandomPassword } from '../utils/password.utils.js';
+import { sendCredentialsEmail } from './email.service.js';
+
+export const createPatientPortalAccount = async (email) => {
+
+  try {const existingUser = await User.findOne({ email });
+
+  if (existingUser) {
+    return;
+  }
+
+  const rawPassword = generateRandomPassword(10);
+
+  const hashedPassword = await bcrypt.hash(rawPassword, 10);
+
+  const user = new User({
+    email,
+    password: hashedPassword,
+    role: "patient",
+    status: "Active",
+    mustChangePassword: true
+  });
+
+  await user.save();
+
+  await sendCredentialsEmail(email, rawPassword);
+} catch (err) {
+  console.error("Patient pirtal account creation failed:", err);
+}
+};

src/utils/password.utils.js

@@ -0,0 +1,8 @@
+import crypto from 'crypto';
+
+export const generateRandomPassword = (length = 10) => {
+  return crypto
+    .randomBytes(length)
+    .toString('base64')
+    .slice(0, length);
+};