Started notifications refactor

app/models/jobs/mail_request_acceptance.rb

@@ -6,7 +6,7 @@
 module Job
   class MailRequestAcceptance < Base
     @queue = :mail
-    def self.perform_delegate(recipient_id, sender_id)
+    def self.perform_delegate(recipient_id, sender_id, target_id)
       Notifier.request_accepted(recipient_id, sender_id).deliver
     end
   end

app/models/jobs/mail_request_received.rb

@@ -6,7 +6,7 @@
 module Job
   class MailRequestReceived < Base
     @queue = :mail
-    def self.perform_delegate(recipient_id, sender_id)
+    def self.perform_delegate(recipient_id, sender_id, target_id)
       Notifier.new_request(recipient_id, sender_id).deliver
     end
   end

app/models/notification.rb

@@ -31,18 +31,7 @@ class Notification < ActiveRecord::Base
   end
 
   def email_the_user(target, actor)
-    case self.action
+    self.recipient.mail(self.mail_job, self.recipient_id, actor.id, target.id)
-    when "new_request"
-      self.recipient.mail(Job::MailRequestReceived, self.recipient_id, actor.id)
-    when "request_accepted"
-      self.recipient.mail(Job::MailRequestAcceptance, self.recipient_id, actor.id)
-    when "comment_on_post"
-      self.recipient.mail(Job::MailCommentOnPost, self.recipient_id, actor.id, target.id)
-    when "also_commented"
-      self.recipient.mail(Job::MailAlsoCommented, self.recipient_id, actor.id, target.id)
-    when "mentioned"
-      self.recipient.mail(Job::MailMentioned, self.recipient_id, actor.id, target.id)
-    end
   end
 
 private

app/models/notifications/also_commented.rb

@@ -0,0 +1,5 @@
+class Notifications::AlsoCommented < Notification
+  def mail_job
+    Job::MailAlsoCommented
+  end
+end

app/models/notifications/comment_on_post.rb

@@ -0,0 +1,5 @@
+class Notifications::CommentOnPost < Notification
+  def mail_job
+    Job::MailCommentOnPost
+  end
+end

app/models/notifications/mentioned.rb

@@ -0,0 +1,5 @@
+class Notifications::Mentioned < Notification
+  def mail_job
+    Job::MailMentioned
+  end
+end

app/models/notifications/new_request.rb

@@ -0,0 +1,5 @@
+class Notifications::NewRequest < Notification
+  def mail_job
+    Job::MailRequestReceived
+  end
+end

app/models/notifications/request_accepted.rb

@@ -0,0 +1,5 @@
+class Notifications::RequestAccepted < Notification
+  def mail_job
+    Job::MailRequestAcceptance
+  end
+end

db/migrate/20110130072907_notification_multiple_people.rb

@@ -5,7 +5,7 @@ class NotificationMultiplePeople < ActiveRecord::Migration
       t.integer :person_id
       t.timestamps
     end
-    
+
     add_index :notification_actors, :notification_id
     add_index :notification_actors, [:notification_id, :person_id] , :unique => true
     add_index :notification_actors, :person_id  ## if i am not mistaken we don't need this one because we won't query person.notifications
@@ -14,15 +14,15 @@ class NotificationMultiplePeople < ActiveRecord::Migration
     execute "INSERT INTO notification_actors (notification_id, person_id) " +
       " SELECT id , actor_id " +
       " FROM notifications"
-    
+
     #update the notifications to reference the post
     execute "UPDATE notifications, comments " +
               "SET notifications.target_id = comments.post_id, " +
-                "target_type = 'Post' " + 
+                "target_type = 'Post' " +
               "WHERE (notifications.target_id = comments.id " +
                 "AND (notifications.action = 'comment_on_post' " +
                 "OR notifications.action = 'also_commented'))"
-    
+
     #select all the notifications to keep
     execute "CREATE TEMPORARY TABLE keep_table " +
                "(SELECT id as keep_id, actor_id , target_type , target_id , recipient_id , action " +
@@ -49,7 +49,7 @@ class NotificationMultiplePeople < ActiveRecord::Migration
 
     #delete all the notifications that need to be deleted
     execute "DELETE notifications.* " +
-              "FROM notifications, keep_delete " + 
+              "FROM notifications, keep_delete " +
               "WHERE notifications.id != keep_delete.keep_id AND "+
                      "notifications.target_type = keep_delete.target_type AND "+
                      "notifications.target_id = keep_delete.target_id AND "+
@@ -62,10 +62,6 @@ class NotificationMultiplePeople < ActiveRecord::Migration
   end
 
   def self.down
-    remove_index :notification_actors, :notification_id
+    raise ActiveRecord::IrreversibleMigration.new
-    remove_index :notification_actors, [:notification_id, :person_id]
-    remove_index :notification_actors, :person_id
-    
-    drop_table :notification_actors
   end
 end

db/migrate/20110228180709_notification_subclasses.rb

@@ -0,0 +1,30 @@
+class NotificationSubclasses < ActiveRecord::Migration
+  def self.up
+    add_column :notifications, :type, :string, :null => :false
+    {:new_request => 'Notifications::NewRequest',
+      :request_accepted => 'Notifications::RequestAccepted',
+      :comment_on_post => 'Notifications::CommentOnPost',
+      :also_commented => 'Notifications::AlsoCommented',
+      :mentioned => 'Notifications::Mentioned'
+    }.each_pair do |key, value|
+      execute("UPDATE notifications
+              set type = #{value}
+              where action = #{key.to_s}")
+    end
+    remove_column :notifications, :action
+  end
+
+  def self.down
+    add_column :notifications, :action, :string
+    {:new_request => 'Notifications::NewRequest',
+      :request_accepted => 'Notifications::RequestAccepted',
+      :comment_on_post => 'Notifications::CommentOnPost',
+      :also_commented => 'Notifications::AlsoCommented',
+      :mentioned => 'Notifications::Mentioned'
+    }.each_pair do |key, value|
+      execute("UPDATE notifications
+              set action = #{key.to_s}
+              where type = #{value}")
+    remove_column :notifications, :type
+  end
+end