Upstream

app/models/budget/investment.rb

@@ -18,6 +18,7 @@ class Investment < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
  include Relationable
+ include Notifiable
 
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
  belongs_to :heading

app/models/comment.rb

@@ -2,8 +2,9 @@ class Comment < ActiveRecord::Base
  include Flaggable
  include HasPublicAuthor
  include Graphqlable
+ include Notifiable
 
- COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll::Question Legislation::Question Legislation::Proposal Legislation::Annotation Topic SpendingProposal ProbeOption Poll).freeze
+ COMMENTABLE_TYPES = %w(Debate Proposal Budget::Investment Poll Poll::Question Topic Legislation::Question Legislation::Annotation Legislation::Proposal SpendingProposal ProbeOption).freeze
 
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases

app/models/concerns/notifiable.rb

@@ -0,0 +1,35 @@
+module Notifiable
+ extend ActiveSupport::Concern
+
+ def notifiable_title
+ case self.class.name
+ when "ProposalNotification"
+ proposal.title
+ when "Comment"
+ commentable.title
+ else
+ title
+ end
+ end
+
+ def notifiable_available?
+ case self.class.name
+ when "ProposalNotification"
+ check_availability(proposal)
+ when "Comment"
+ check_availability(commentable)
+ else
+ check_availability(self)
+ end
+ end
+
+ def check_availability(resource)
+ resource.present? &&
+ resource.try(:hidden_at) == nil &&
+ resource.try(:retired_at) == nil
+ end
+
+ def linkable_resource
+ is_a?(ProposalNotification) ? proposal : self
+ end
+end

app/models/debate.rb

@@ -10,6 +10,7 @@ class Debate < ActiveRecord::Base
  include HasPublicAuthor
  include Graphqlable
  include Relationable
+ include Notifiable
 
  acts_as_votable
  acts_as_paranoid column: :hidden_at

app/models/legislation/proposal.rb

@@ -15,6 +15,7 @@ class Legislation::Proposal < ActiveRecord::Base
  include Followable
  include Communitable
  include Documentable
+ include Notifiable
 
  documentable max_documents_allowed: 3,
  max_file_size: 3.megabytes,

app/models/legislation/question.rb

@@ -1,6 +1,7 @@
 class Legislation::Question < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'
  belongs_to :process, class_name: 'Legislation::Process', foreign_key: 'legislation_process_id'

app/models/notification.rb

@@ -1,4 +1,5 @@
 class Notification < ActiveRecord::Base
+
  belongs_to :user, counter_cache: true
  belongs_to :notifiable, polymorphic: true
 
@@ -7,6 +8,9 @@ class Notification < ActiveRecord::Base
  scope :not_emailed, -> { where(emailed_at: nil) }
  scope :for_render, -> { includes(:notifiable) }
 
+ delegate :notifiable_title, :notifiable_available?, :check_availability, :linkable_resource,
+ to: :notifiable, allow_nil: true
+
  def timestamp
  notifiable.created_at
  end
@@ -25,17 +29,6 @@ def self.add(user_id, notifiable)
  end
  end
 
- def notifiable_title
- case notifiable.class.name
- when "ProposalNotification"
- notifiable.proposal.title
- when "Comment"
- notifiable.commentable.title
- else
- notifiable.title
- end
- end
-
  def notifiable_action
  case notifiable_type
  when "ProposalNotification"
@@ -47,8 +40,4 @@ def notifiable_action
  end
  end
 
- def linkable_resource
- notifiable.is_a?(ProposalNotification) ? notifiable.proposal : notifiable
- end
-
-end
+end

app/models/poll.rb

@@ -5,6 +5,7 @@ class Poll < ActiveRecord::Base
  include Imageable
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  RECOUNT_DURATION = 1.week
 

app/models/proposal.rb

@@ -13,6 +13,7 @@ class Proposal < ActiveRecord::Base
  include Communitable
  include Imageable
  include Mappable
+ include Notifiable
  include Documentable
  documentable max_documents_allowed: 3,
  max_file_size: 3.megabytes,

app/models/proposal_notification.rb

@@ -1,6 +1,6 @@
 class ProposalNotification < ActiveRecord::Base
-
  include Graphqlable
+ include Notifiable
 
  belongs_to :author, class_name: 'User', foreign_key: 'author_id'
  belongs_to :proposal
@@ -35,4 +35,8 @@ def public_for_api?
  return true
  end
 
+ def notifiable
+ proposal
+ end
+
 end

app/models/topic.rb

@@ -1,6 +1,7 @@
 class Topic < ActiveRecord::Base
  acts_as_paranoid column: :hidden_at
  include ActsAsParanoidAliases
+ include Notifiable
 
  belongs_to :community
  belongs_to :author, -> { with_hidden }, class_name: 'User', foreign_key: 'author_id'

app/views/comments/_form.html.erb

@@ -8,7 +8,7 @@
  <%= f.hidden_field :commentable_id, value: commentable.id %>
  <%= f.hidden_field :parent_id, value: parent_id %>
 
- <%= f.submit comment_button_text(parent_id, commentable), class: "button" %>
+ <%= f.submit comment_button_text(parent_id, commentable), class: "button", id: "publish_comment" %>
 
  <% if can? :comment_as_moderator, commentable %>
  <div class="float-right">

app/views/devise/menu/_login_items.html.erb

@@ -1,5 +1,5 @@
 <% if user_signed_in? %>
- <li>
+ <li id="notifications">
  <%= link_to notifications_path, rel: "", class: "notifications" do %>
  <span class="show-for-sr"><%= t("layouts.header.notifications") %></span>
  <% if current_user.notifications_count > 0 %>

app/views/notifications/_notification.html.erb

@@ -1,5 +1,5 @@
 <li id="<%= dom_id(notification) %>" class="notification">
- <% if notification.notifiable.present? %>
+ <% if notification.notifiable_available? %>
  <%= link_to notification do %>
  <p>
  <em>

spec/features/budgets/investments_spec.rb

@@ -3,6 +3,10 @@
 
 feature 'Budget Investments' do
 
+ context "Concerns" do
+ it_behaves_like 'notifiable in-app', Budget::Investment
+ end
+
  let(:author) { create(:user, :level_two, username: 'Isabel') }
  let(:budget) { create(:budget, name: "Big Budget") }
  let(:other_budget) { create(:budget, name: "What a Budget!") }

spec/features/comments/legislation_questions_spec.rb

@@ -2,6 +2,11 @@
 include ActionView::Helpers::DateHelper
 
 feature 'Commenting legislation questions' do
+
+ context "Concerns" do
+ it_behaves_like 'notifiable in-app', Legislation::Question
+ end
+
  let(:user) { create :user, :level_two }
  let(:process) { create :legislation_process, :in_debate_phase }
  let(:legislation_question) { create :legislation_question, process: process }

spec/features/debates_spec.rb

@@ -9,6 +9,10 @@
  Setting['feature.debates'] = true
  end
 
+ context "Concerns" do
+ it_behaves_like 'notifiable in-app', Debate
+ end
+
  scenario 'Index' do
  debates = [create(:debate), create(:debate), create(:debate)]
 
@@ -1111,4 +1115,5 @@
  expect(page).to_not have_content("Featured")
  end
  end
+
 end

spec/features/legislation/proposals_spec.rb

@@ -2,6 +2,11 @@
 require 'sessions_helper'
 
 feature 'Legislation Proposals' do
+
+ context "Concerns" do
+ it_behaves_like 'notifiable in-app', Legislation::Proposal
+ end
+
  let(:user) { create(:user) }
  let(:user2) { create(:user) }
  let(:process) { create(:legislation_process) }
@@ -55,4 +60,5 @@
  def legislation_proposals_order
  all("[id^='legislation_proposal_']").collect { |e| e[:id] }
  end
+
 end