tash apply stash@{0}

diff --git a/hms/backend/instance/hms.db b/hms/backend/instance/hms.db
index d22af58..a456dad 100644
Binary files a/hms/backend/instance/hms.db and b/hms/backend/instance/hms.db differ
diff --git a/hms/backend/models/__pycache__/models.cpython-311.pyc b/hms/backend/models/__pycache__/models.cpython-311.pyc
index 2a923c6..efdd88d 100644
Binary files a/hms/backend/models/__pycache__/models.cpython-311.pyc and b/hms/backend/models/__pycache__/models.cpython-311.pyc differ
diff --git a/hms/backend/user/__pycache__/routes.cpython-311.pyc b/hms/backend/user/__pycache__/routes.cpython-311.pyc
index 15666b6..7143301 100644
Binary files a/hms/backend/user/__pycache__/routes.cpython-311.pyc and b/hms/backend/user/__pycache__/routes.cpython-311.pyc differ
diff --git a/hms/backend/user/routes.py b/hms/backend/user/routes.py
index 5228acc..02a79bf 100644
--- a/hms/backend/user/routes.py
+++ b/hms/backend/user/routes.py
@@ -8,6 +8,7 @@ ALLOWED_ROOM_TYPES = {"Deluxe", "Suite", "Standard"}
 
 user_bp = Blueprint('user_bp', __name__)
 
+# ------------------- Edit Profile -------------------
 @user_bp.route('/profile/edit', methods=['PUT'])
 @jwt_required()
 def edit_profile():
@@ -16,7 +17,7 @@ def edit_profile():
 
     # Extract new data
     new_fullname = data.get('fullname')
-    # new_email = data.get('email')  <-- No longer needed
+    new_email = data.get('email')
 
     # Find the user
     user = User.query.filter_by(email=current_user_email).first()
@@ -26,16 +27,21 @@ def edit_profile():
     # Update profile data
     if new_fullname:
         user.username = new_fullname
-
-    # Remove or comment out the email update block
-    # if new_email:
-    #     existing_user = User.query.filter_by(email=new_email).first()
-    #     if existing_user and existing_user.id != user.id:
-    #         return jsonify({"error": "Email already exists!"}), 409
-    #     user.email = new_email
+    if new_email:
+        existing_user = User.query.filter_by(email=new_email).first()
+        if existing_user and existing_user.id != user.id:
+            return jsonify({"error": "Email already exists!"}), 409
+        user.email = new_email
 
     db.session.commit()
 
+    return jsonify({
+        "message": "Profile updated successfully!",
+        "new_fullname": user.username,
+        "new_email": user.email
+    })
+
+
 # ------------------- Get User Dashboard -------------------
 @user_bp.route('/dashboard', methods=['GET'])
 @jwt_required()
@@ -89,10 +95,15 @@ def cancel_booking(booking_id):
     if not booking:
         return jsonify({"error": "Booking not found!"}), 404
 
-    # Delete the booking completely from the database
-    db.session.delete(booking)
-    db.session.commit()
-    return jsonify({"message": "Booking cancelled and deleted successfully!"})
+    if booking.booking_status == "Cancelled":
+        return jsonify({"message": "Booking is already cancelled."})
+
+    if booking.check_in_date > datetime.now(timezone.utc).date():
+        booking.booking_status = "Cancelled"
+        db.session.commit()
+        return jsonify({"message": "Booking cancelled successfully!"})
+    else:
+        return jsonify({"error": "Cancellation not allowed after check-in date."}), 403
 
 
 # ------------------- Make a New Booking -------------------
@@ -118,6 +129,11 @@ def new_booking():
 
     hotel_id = room.hotel_id
 
+    # Ensure the hotel is approved before proceeding with booking
+    hotel = Hotel.query.filter_by(id=hotel_id).first()
+    if hotel and hotel.status not in ["Approved"]:
+        return jsonify({"error": "Hotel is not approved for booking."}), 400
+
     try:
         check_in_date = datetime.strptime(check_in, '%Y-%m-%d').date()
         check_out_date = datetime.strptime(check_out, '%Y-%m-%d').date()
@@ -148,84 +164,13 @@ def new_booking():
         hotel_id=hotel_id,
         check_in_date=check_in_date,
         check_out_date=check_out_date,
-        booking_status="Pending"  # Set status to Pending
+        booking_status="Confirmed"
     )
     db.session.add(new_booking)
     db.session.commit()
 
     return jsonify({"message": "Booking created successfully!", "booking_id": new_booking.id})
 
-
-# ------------------- Update Booking -------------------
-@user_bp.route('/booking/update/<int:booking_id>', methods=['PUT'])
-@jwt_required()
-def update_booking(booking_id):
-    current_user_email = get_jwt_identity()
-    user = User.query.filter_by(email=current_user_email).first()
-    if not user:
-        return jsonify({"error": "User not found!"}), 404
-
-    booking = Booking.query.filter_by(id=booking_id, user_id=user.id).first()
-    if not booking:
-        return jsonify({"error": "Booking not found!"}), 404
-
-    # Prevent modification if check-in has already started
-    if booking.check_in_date <= datetime.utcnow().date():
-        return jsonify({"error": "Cannot modify booking after check-in date."}), 403
-
-    data = request.json
-    new_room_type = data.get('room_type')
-    new_check_in = data.get('check_in')
-    new_check_out = data.get('check_out')
-
-    # Validate room type if provided
-    if new_room_type and new_room_type not in ALLOWED_ROOM_TYPES:
-        return jsonify({"error": f"Invalid room type. Allowed values: {', '.join(ALLOWED_ROOM_TYPES)}."}), 400
-
-    new_check_in_date = booking.check_in_date
-    new_check_out_date = booking.check_out_date
-    if new_check_in:
-        try:
-            new_check_in_date = datetime.strptime(new_check_in, '%Y-%m-%d').date()
-        except ValueError:
-            return jsonify({"error": "Invalid check-in date format. Please use YYYY-MM-DD."}), 400
-    if new_check_out:
-        try:
-            new_check_out_date = datetime.strptime(new_check_out, '%Y-%m-%d').date()
-        except ValueError:
-            return jsonify({"error": "Invalid check-out date format. Please use YYYY-MM-DD."}), 400
-
-    # Ensure new check-in date is not in the past
-    today = datetime.utcnow().date()
-    if new_check_in_date < today:
-        return jsonify({"error": "Check-in date cannot be in the past."}), 400
-
-    if new_check_in_date >= new_check_out_date:
-        return jsonify({"error": "Check-out date must be after check-in date."}), 400
-
-    overlapping_booking = Booking.query.filter(
-        Booking.room_id == booking.room_id,
-        Booking.id != booking.id,
-        Booking.booking_status == "Confirmed",
-        Booking.check_in_date < new_check_out_date,
-        Booking.check_out_date > new_check_in_date
-    ).first()
-
-    if overlapping_booking:
-        return jsonify({"error": "The new dates clash with an existing booking for this room."}), 400
-
-    if new_room_type:
-        booking.room_type = new_room_type
-    booking.check_in_date = new_check_in_date
-    booking.check_out_date = new_check_out_date
-
-    # Set status to Pending after update
-    booking.booking_status = "Pending"
-
-    db.session.commit()
-    return jsonify({"message": "Booking updated successfully!"})
-
-
 # ------------------- Submit Booking Review -------------------
 @user_bp.route('/booking/review/<int:booking_id>', methods=['POST'])
 @jwt_required()
@@ -262,7 +207,7 @@ def submit_review(booking_id):
 @user_bp.route('/hotels/search', methods=['GET'])
 def search_hotels():
     location = request.args.get('location', type=str)
-    hotel_name = request.args.get('hotel_name', type=str)  # <-- Extract hotel name
+    hotel_name = request.args.get('hotel_name', type=str)
     required_capacity = request.args.get('guests', default=1, type=int)
     check_in = request.args.get('check_in')
     check_out = request.args.get('check_out')
@@ -271,19 +216,23 @@ def search_hotels():
     min_rating = request.args.get('min_rating', type=float)
     room_type = request.args.get('room_type', type=str)
 
-    # If a room type filter is provided, validate it.
+    # Validate room type filter if provided
     if room_type and room_type not in ALLOWED_ROOM_TYPES:
         return jsonify({"error": f"Invalid room type filter. Allowed values: {', '.join(ALLOWED_ROOM_TYPES)}."}), 400
 
-    query = Hotel.query
+    # Start with filtering only approved hotels
+    query = Hotel.query.filter(Hotel.status == "Approved")
+    
+    # Apply additional filters if provided
     if location:
         query = query.filter(Hotel.location.ilike(f"%{location}%"))
-    if hotel_name:  # <-- Add filtering for hotel name
+    if hotel_name:
         query = query.filter(Hotel.hotel_name.ilike(f"%{hotel_name}%"))
     if min_rating is not None:
         query = query.filter(Hotel.rating >= min_rating)
     
-    hotels = query.all()
+    hotels = query.all()  # Fetch the approved hotels with all applied filters
+
     available_hotels = []
 
     for hotel in hotels:
@@ -296,28 +245,32 @@ def search_hotels():
             except ValueError:
                 return jsonify({"error": "Invalid date format. Use YYYY-MM-DD."}), 400
 
+            # Filter rooms based on booking status and date range
             free_rooms_query = (
                 Room.query
                 .filter(Room.hotel_id == hotel.id)
                 .filter(~Room.bookings.any(
-                    (Booking.booking_status == "Confirmed") &
-                    (Booking.check_in_date < check_out_date) &
+                    (Booking.booking_status == "Confirmed") & 
+                    (Booking.check_in_date < check_out_date) & 
                     (Booking.check_out_date > check_in_date)
                 ))
             )
         else:
             free_rooms_query = Room.query.filter(Room.hotel_id == hotel.id)
         
+        # Apply price range filter
         if min_price is not None:
             free_rooms_query = free_rooms_query.filter(Room.price_per_night >= min_price)
         if max_price is not None:
             free_rooms_query = free_rooms_query.filter(Room.price_per_night <= max_price)
 
+        # Filter by room type if provided
         if room_type:
             free_rooms_query = free_rooms_query.filter(Room.room_type == room_type)
 
         free_rooms = free_rooms_query.all()
 
+        # Further filter based on capacity
         matching_rooms = [room for room in free_rooms if room.capacity >= required_capacity]
 
         if matching_rooms:
@@ -340,3 +293,4 @@ def search_hotels():
         return jsonify({"message": "No available hotels match your criteria."}), 404
 
     return jsonify({"results": available_hotels})
+