[webui][api] Refactor SendEventEmails job

Better creation of RSS notifications
Fix partial views inclusion not to fail when used outside the
EventMailer
Remove unneeded ivars in feeds controller

src/api/app/controllers/webui/feeds_controller.rb

@@ -42,8 +42,7 @@ def commits
   end
 
   def notifications
-    @host = ::Configuration.obs_url
-    @configuration = ::Configuration.first    
+    @configuration = ::Configuration.first
     @user = User.current
     @notifications = User.current.combined_rss_feed_items
   end

src/api/app/jobs/send_event_emails.rb

@@ -16,16 +16,21 @@ def perform
       subscribers = event.subscribers
       next if subscribers.empty?
       EventMailer.event(subscribers, event).deliver_now
-
-      event.subscriptions.each do |subscription|
-        Notifications::RssFeedItem.create(
-          subscriber: subscription.subscriber,
-          event_type: event.eventtype,
-          event_payload: event.payload,
-          subscription_receiver_role: subscription.receiver_role
-        )
-      end
+      create_rss_notifications(event)
     end
     true
   end
+
+  private
+
+  def create_rss_notifications(event)
+    event.subscriptions.each do |subscription|
+      Notifications::RssFeedItem.create(
+        subscriber: subscription.subscriber,
+        event_type: event.eventtype,
+        event_payload: event.payload,
+        subscription_receiver_role: subscription.receiver_role
+      )
+    end
+  end
 end

src/api/app/models/notifications/base.rb

@@ -1,15 +1,12 @@
 class Notifications::Base < ApplicationRecord
   self.table_name = "notifications"
 
-  belongs_to :user
-  belongs_to :group
+  belongs_to :subscriber, polymorphic: true
 
-  def subscriber=(subscriber)
-    if subscriber.is_a? User
-      self.user = subscriber
-    elsif subscriber.is_a? Group
-      self.group = subscriber
-    end
+  serialize :event_payload, Hash
+
+  def event
+    @event ||= event_type.constantize.new(event_payload)
   end
 end
 

src/api/app/models/notifications/rss_feed_item.rb

@@ -20,6 +20,18 @@ def self.cleanup
       end
     end
   end
+
+  def title
+    event.subject
+  end
+
+  def description
+    ApplicationController.renderer.new.render(
+      template: "event_mailer/#{event.template_name}",
+      layout: false,
+      format: :txt,
+      assigns: { e: event.expanded_payload, host: ::Configuration.obs_url, configuration: ::Configuration.first })
+  end
 end
 
 # == Schema Information

src/api/app/views/event_mailer/_actions.text.erb

@@ -1,8 +1,8 @@
 Actions:
 <% event['actions'].each do |a| -%>
 <% if %w(submit maintenance_incident maintenance_release).include? a['type'] -%>
-<%= render partial: 'submit_action', locals: { a: a } -%>
+<%= render partial: 'event_mailer/submit_action', locals: { a: a } -%>
 <% else -%>
-<%= render partial: "#{a['type']}_action", locals: { a: a } -%>
+<%= render partial: "event_mailer/#{a['type']}_action", locals: { a: a } -%>
 <% end -%>
 <% end -%>

src/api/app/views/event_mailer/request_create.text.erb

@@ -5,14 +5,14 @@ Description:
 <%= event['description']%>
 
 <%-end-%>
-<%= render partial: 'actions', locals: { event: event } %>
+<%= render partial: 'event_mailer/actions', locals: { event: event } %>
 
 To REVIEW against the previous version:
    osc request show --diff <%= event['number']%>
 
 To ACCEPT the request:
    osc request accept <%= event['number']%> --message="reviewed ok."
-   
+
 To DECLINE the request:
    osc request decline <%= event['number']%> --message="declined for reason xyz (see ... for background / policy / ...)."
 

src/api/app/views/event_mailer/request_statechange.text.erb

@@ -9,4 +9,4 @@ Comment:
   <%= event['comment'] %>
 
 <% end -%>
-<%= render partial: 'actions', locals: { event: event } %>
+<%= render partial: 'event_mailer/actions', locals: { event: event } %>

src/api/app/views/event_mailer/review_wanted.text.erb

@@ -19,4 +19,4 @@ Review reason set by <%= event['who'] %>:
 Request description:
 <%= event['description'] %>
 
-<%= render partial: 'actions', locals: { event: event } -%>
+<%= render partial: 'event_mailer/actions', locals: { event: event } -%>

src/api/app/views/webui/feeds/notifications.rss.builder

@@ -1,6 +1,6 @@
 xml.rss version: '2.0' do
   xml.channel do
-    xml.title "#{@user.realname}'s (#{@user.login}) notifications"
+    xml.title "#{@user.realname} (#{@user.login}) notifications"
     xml.description "Event's notifications from #{@configuration['title']}"
     xml.link url_for only_path: false, controller: 'main', action: 'index'
     xml.language "en"
@@ -9,12 +9,11 @@ xml.rss version: '2.0' do
 
     @notifications.each do |notification|
       xml.item do
-        xml.title notification.event_type
-        xml.description notification.event_payload
+        xml.title notification.title
+        xml.description notification.description
         xml.category "#{notification.event_type}/#{notification.subscription_receiver_role}"
         xml.pubDate notification.created_at
         xml.author "#{@configuration['title']}"
-        xml.link url_for only_path: false, controller: 'main', action: 'index'
       end
     end
   end

src/api/spec/jobs/send_event_emails_spec.rb

@@ -30,21 +30,21 @@
     end
 
     it "creates an rss notification for user's email" do
-      notification = Notifications::Base.find_by(user: user)
+      notification = Notifications::Base.find_by(subscriber: user)
 
       expect(notification.type).to eq('Notifications::RssFeedItem')
       expect(notification.event_type).to eq('Event::CommentForProject')
-      expect(notification.event_payload).to include('how are things?')
+      expect(notification.event_payload['comment_body']).to include('how are things?')
       expect(notification.subscription_receiver_role).to eq('all')
       expect(notification.delivered).to be_falsey
     end
 
     it "creates an rss notification for group's email" do
-      notification = Notifications::RssFeedItem.find_by(group: group)
+      notification = Notifications::RssFeedItem.find_by(subscriber: group)
 
       expect(notification.type).to eq('Notifications::RssFeedItem')
       expect(notification.event_type).to eq('Event::CommentForProject')
-      expect(notification.event_payload).to include('how are things?')
+      expect(notification.event_payload['comment_body']).to include('how are things?')
       expect(notification.subscription_receiver_role).to eq('all')
       expect(notification.delivered).to be_falsey
     end