Fix simple bugs in subscription logic
Store subscriber id in notifications to save process if user unsubscribe early notification processing
code cleanup
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  code cleanup
  Store subscriber id in notifications to save process if user unsubscribe early notification processing
  Fix simple bugs in subscription logic