Move userId to the user model and implement the notification service