room notifications

routes/rooms.py

@@ -4,9 +4,10 @@ from models import db, Room, User, RoomMemberPermission, RoomFile
 from forms import RoomForm
 from routes.room_files import user_has_permission
 from routes.auth import require_password_change
-from utils import log_event
+from utils import log_event, create_notification
 import os
 import shutil
+from datetime import datetime
 
 rooms_bp = Blueprint('rooms', __name__, url_prefix='/rooms')
 
@@ -148,21 +149,49 @@ def add_member(room_id):
         # Ensure user is added to the room.members relationship
         if user not in room.members:
             room.members.append(user)
-        db.session.commit()
         
-        log_event(
-            event_type='room_member_add',
-            details={
-                'room_id': room_id,
-                'room_name': room.name,
-                'added_user': f"{user.username} {user.last_name}",
-                'added_by': f"{current_user.username} {current_user.last_name}"
-            },
-            user_id=current_user.id
-        )
-        db.session.commit()
-        
-        flash(f'{user.username} has been added to the room.', 'success')
+        try:
+            # Create notification for the invited user
+            create_notification(
+                notif_type='room_invite',
+                user_id=user.id,
+                sender_id=current_user.id,
+                details={
+                    'message': f'You have been invited to join room "{room.name}"',
+                    'room_id': room_id,
+                    'room_name': room.name,
+                    'invited_by': f"{current_user.username} {current_user.last_name}",
+                    'permissions': {
+                        'can_view': True,
+                        'can_download': False,
+                        'can_upload': False,
+                        'can_delete': False,
+                        'can_rename': False,
+                        'can_move': False,
+                        'can_share': False
+                    },
+                    'timestamp': datetime.utcnow().isoformat()
+                }
+            )
+            
+            log_event(
+                event_type='room_member_add',
+                details={
+                    'room_id': room_id,
+                    'room_name': room.name,
+                    'added_user': f"{user.username} {user.last_name}",
+                    'added_by': f"{current_user.username} {current_user.last_name}"
+                },
+                user_id=current_user.id
+            )
+            
+            db.session.commit()
+            flash(f'{user.username} has been added to the room.', 'success')
+        except Exception as e:
+            db.session.rollback()
+            flash('An error occurred while adding the member.', 'error')
+            print(f"Error adding member: {str(e)}")
+            
     return redirect(url_for('rooms.room_members', room_id=room_id))
 
 @rooms_bp.route('/<int:room_id>/members/<int:user_id>/remove', methods=['POST'])
@@ -186,22 +215,40 @@ def remove_member(room_id, user_id):
             flash('User is not a member of this room.', 'error')
         else:
             user = User.query.get(user_id)
-            db.session.delete(perm)
-            db.session.commit()
-            
-            log_event(
-                event_type='room_member_remove',
-                details={
-                    'room_id': room_id,
-                    'room_name': room.name,
-                    'removed_user': f"{user.username} {user.last_name}",
-                    'removed_by': f"{current_user.username} {current_user.last_name}"
-                },
-                user_id=current_user.id
-            )
-            db.session.commit()
-            
-            flash('User has been removed from the room.', 'success')
+            try:
+                # Create notification for the removed user
+                create_notification(
+                    notif_type='room_invite_removed',
+                    user_id=user_id,
+                    sender_id=current_user.id,
+                    details={
+                        'message': f'You have been removed from room "{room.name}"',
+                        'room_id': room_id,
+                        'room_name': room.name,
+                        'removed_by': f"{current_user.username} {current_user.last_name}",
+                        'timestamp': datetime.utcnow().isoformat()
+                    }
+                )
+                
+                log_event(
+                    event_type='room_member_remove',
+                    details={
+                        'room_id': room_id,
+                        'room_name': room.name,
+                        'removed_user': f"{user.username} {user.last_name}",
+                        'removed_by': f"{current_user.username} {current_user.last_name}"
+                    },
+                    user_id=current_user.id
+                )
+                
+                db.session.delete(perm)
+                db.session.commit()
+                flash('User has been removed from the room.', 'success')
+            except Exception as e:
+                db.session.rollback()
+                flash('An error occurred while removing the member.', 'error')
+                print(f"Error removing member: {str(e)}")
+                
     return redirect(url_for('rooms.room_members', room_id=room_id))
 
 @rooms_bp.route('/<int:room_id>/members/<int:user_id>/permissions', methods=['POST'])