fix: resolve merge conflicts

Author: rohitbytecode

src/controllers/patient.js

@@ -1,25 +1,16 @@
 import Patient from '../models/patient.js';
-<<<<<<< HEAD
 import { createPatientPortalAccount } from '../services/patientPortal.service.js';
-=======
-import User from '../models/User.js';
-import bcrypt from 'bcrypt';
-import * as emailService from '../services/email.service.js';
->>>>>>> recovery-branch
 
 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();
 
-<<<<<<< HEAD
-    const { email, paymentMethod } = req.body;
-
-    if (paymentMethod === "online" && email) {
+    if (paymentMode === "online" && email) {
       await createPatientPortalAccount(email);
     }
 
@@ -28,42 +19,6 @@ const createPatient = async (req, res, next) => {
       patient
     });
 
-=======
-    // 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.`);
-    }
-
-    res.status(201).json(patient);
->>>>>>> recovery-branch
   } catch (err) {
     console.error(`Error in createPatient: ${err.message}`);
     next(err);

src/models/User.js

@@ -90,11 +90,7 @@ const userSchema = new mongoose.Schema({
   role: { 
     type: String, 
     required: true, 
-<<<<<<< HEAD
     enum: ['admin', 'doctor','receptionist','billing','patient'] 
-=======
-    enum: ['admin', 'doctor','receptionist','billing', 'patient'] 
->>>>>>> recovery-branch
   },
 
   name: { type: String },

src/services/email.service.js

@@ -62,7 +62,6 @@ export const sendOTPEmail = async (email, otp) => {
   });
 };
 
-<<<<<<< HEAD
 export const sendCredentialsEmail = async (email, password) => {
   await transporter.sendMail({
     from: `"HMS Team" <${process.env.GMAIL_EMAIL}>`,
@@ -87,22 +86,6 @@ export const sendCredentialsEmail = async (email, password) => {
         <p style="font-size:12px;color:#888;">
         This email was generated automatically.
         </p>
-=======
-export const sendPortalCredentials = async (email, name, password) => {
-  await transporter.sendMail({
-    from: `"HMS Team" <${process.env.GMAIL_EMAIL}>`,
-    to: email,
-    subject: 'Your HMS Patient Portal Account Details',
-    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>
->>>>>>> recovery-branch
       </div>
     `
   });