Merge branch 'notification_refactoring'

app/models/issue.rb

@@ -59,5 +59,6 @@ end
 #  closed      :boolean         default(FALSE), not null
 #  position    :integer         default(0)
 #  critical    :boolean         default(FALSE), not null
+#  branch_name :string(255)
 #
 

app/models/mailer_observer.rb

@@ -0,0 +1,75 @@
+class MailerObserver < ActiveRecord::Observer
+  observe :issue, :user, :note, :merge_request
+  cattr_accessor :current_user
+
+  def after_create(model)
+    new_issue(model) if model.kind_of?(Issue)
+    new_user(model) if model.kind_of?(User)
+    new_note(model) if model.kind_of?(Note)
+    new_merge_request(model) if model.kind_of?(MergeRequest)
+  end
+
+  def after_update(model)
+    changed_merge_request(model) if model.kind_of?(MergeRequest)
+    changed_issue(model) if model.kind_of?(Issue)
+  end
+
+  protected
+
+    def new_issue(issue)
+      if issue.assignee != current_user
+        Notify.new_issue_email(issue).deliver
+      end
+    end
+
+    def new_user(user)
+      Notify.new_user_email(user, user.password).deliver
+    end
+
+    def new_note(note)
+      return unless note.notify
+      note.project.users.reject { |u| u.id == current_user.id } .each do |u|
+        case note.noteable_type
+        when "Commit" then
+          Notify.note_commit_email(u, note).deliver
+        when "Issue" then
+          Notify.note_issue_email(u, note).deliver
+        when "MergeRequest" then
+          Notify.note_merge_request_email(u, note).deliver
+        when "Snippet"
+          true
+        else
+          Notify.note_wall_email(u, note).deliver
+        end
+      end
+    end
+
+    def new_merge_request(merge_request)
+      if merge_request.assignee != current_user
+        Notify.new_merge_request_email(merge_request).deliver
+      end
+    end
+
+    def changed_merge_request(merge_request)
+      if merge_request.assignee_id_changed?
+        recipients_ids = merge_request.assignee_id_was, merge_request.assignee_id
+        recipients_ids.delete current_user.id
+
+        User.find(recipients_ids).each do |user|
+          Notify.changed_merge_request_email(user, merge_request).deliver
+        end
+      end
+    end
+
+    def changed_issue(issue)
+      if issue.assignee_id_changed?
+        recipients_ids = issue.assignee_id_was, issue.assignee_id
+        recipients_ids.delete current_user.id
+
+        User.find(recipients_ids).each do |user|
+          Notify.changed_issue_email(user, issue).deliver
+        end
+      end
+
+    end
+end

app/models/merge_request.rb

@@ -44,3 +44,19 @@ class MergeRequest < ActiveRecord::Base
     project.commit(source_branch)
   end
 end
+# == Schema Information
+#
+# Table name: merge_requests
+#
+#  id            :integer         not null, primary key
+#  target_branch :string(255)     not null
+#  source_branch :string(255)     not null
+#  project_id    :integer         not null
+#  author_id     :integer
+#  assignee_id   :integer
+#  title         :string(255)
+#  closed        :boolean         default(FALSE), not null
+#  created_at    :datetime
+#  updated_at    :datetime
+#
+

app/models/note.rb

@@ -13,6 +13,7 @@ class Note < ActiveRecord::Base
            :prefix => true
 
   attr_protected :author, :author_id
+  attr_accessor :notify
 
   validates_presence_of :project
 
@@ -35,6 +36,10 @@ class Note < ActiveRecord::Base
   scope :inc_author, includes(:author)
 
   mount_uploader :attachment, AttachmentUploader
+
+  def notify
+    @notify ||= false
+  end
 end
 # == Schema Information
 #

app/models/project.rb

@@ -247,14 +247,15 @@ end
 #
 # Table name: projects
 #
-#  id           :integer         not null, primary key
-#  name         :string(255)
-#  path         :string(255)
-#  description  :text
-#  created_at   :datetime
-#  updated_at   :datetime
-#  private_flag :boolean         default(TRUE), not null
-#  code         :string(255)
-#  owner_id     :integer
+#  id             :integer         not null, primary key
+#  name           :string(255)
+#  path           :string(255)
+#  description    :text
+#  created_at     :datetime
+#  updated_at     :datetime
+#  private_flag   :boolean         default(TRUE), not null
+#  code           :string(255)
+#  owner_id       :integer
+#  default_branch :string(255)     default("master"), not null
 #
 

app/models/users_project.rb

@@ -23,13 +23,12 @@ end
 #
 # Table name: users_projects
 #
-#  id         :integer         not null, primary key
-#  user_id    :integer         not null
-#  project_id :integer         not null
-#  read       :boolean         default(FALSE)
-#  write      :boolean         default(FALSE)
-#  admin      :boolean         default(FALSE)
-#  created_at :datetime
-#  updated_at :datetime
+#  id             :integer         not null, primary key
+#  user_id        :integer         not null
+#  project_id     :integer         not null
+#  created_at     :datetime
+#  updated_at     :datetime
+#  repo_access    :integer         default(0), not null
+#  project_access :integer         default(0), not null
 #