From ebdf0df4102ef65e2ed855e55187b7a7e2df6cac Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Tue, 12 Aug 2014 16:04:24 +0530 Subject: [PATCH] Moving notifications to models --- .../admin/callforpapers_controller.rb | 15 +++-------- .../admin/conference_controller.rb | 19 +++++++++++++ app/controllers/admin/venue_controller.rb | 9 ++----- app/models/call_for_papers.rb | 27 +++++++++++++++++++ app/models/conference.rb | 26 ++++++++++++++++++ app/models/venue.rb | 8 ++++++ 6 files changed, 86 insertions(+), 18 deletions(-) diff --git a/app/controllers/admin/callforpapers_controller.rb b/app/controllers/admin/callforpapers_controller.rb index f31eacb9..7d4ac3d2 100644 --- a/app/controllers/admin/callforpapers_controller.rb +++ b/app/controllers/admin/callforpapers_controller.rb @@ -12,20 +12,13 @@ module Admin def update @cfp = @conference.call_for_papers @cfp.assign_attributes(params[:call_for_papers]) - notify_on_schedule_public = @cfp.schedule_public_changed? && @cfp.schedule_public\ - && @conference.email_settings.send_on_call_for_papers_schedule_public\ - && !@conference.email_settings.call_for_papers_schedule_public_subject.blank?\ - && !@conference.email_settings.call_for_papers_schedule_public_template.blank? + send_mail_on_schedule_public = @cfp.notify_on_schedule_public? - notify_on_cfp_date_update = !@cfp.end_date.blank? && !@cfp.start_date.blank?\ - && (@cfp.start_date_changed? || @cfp.end_date_changed?)\ - && @conference.email_settings.send_on_call_for_papers_dates_updates\ - && !@conference.email_settings.call_for_papers_dates_updates_subject.blank?\ - && !@conference.email_settings.call_for_papers_dates_updates_template.blank? + send_mail_on_cfp_dates_updates = @cfp.notify_on_cfp_date_update? if @cfp.update_attributes(params[:call_for_papers]) - Mailbot.delay.send_on_call_for_papers_dates_updates(@conference) if notify_on_cfp_date_update - Mailbot.delay.send_on_schedule_public(@conference) if notify_on_schedule_public + Mailbot.delay.send_on_call_for_papers_dates_updates(@conference) if send_mail_on_cfp_dates_updates + Mailbot.delay.send_on_schedule_public(@conference) if send_mail_on_schedule_public redirect_to(admin_conference_callforpapers_path( id: @conference.short_title), notice: 'Call for Papers was successfully updated.') diff --git a/app/controllers/admin/conference_controller.rb b/app/controllers/admin/conference_controller.rb index 1f3ba8ee..d5710983 100644 --- a/app/controllers/admin/conference_controller.rb +++ b/app/controllers/admin/conference_controller.rb @@ -72,6 +72,25 @@ module Admin end end + def update + @conference = Conference.find_by(short_title: params[:id]) + short_title = @conference.short_title + @conference.assign_attributes(params[:conference]) + send_mail_on_conf_update = @conference.notify_on_conf_dates_updates? + send_mail_on_reg_update = @conference.notify_on_conf_reg_dates_updates? + + if @conference.update_attributes(params[:conference]) + Mailbot.delay.conference_date_update_mail(@conference) if send_mail_on_conf_update + Mailbot.delay.conference_registration_date_update_mail(@conference) if send_mail_on_reg_update + redirect_to(edit_admin_conference_path(id: @conference.short_title), + notice: 'Conference was successfully updated.') + else + redirect_to(edit_admin_conference_path(id: short_title), + alert: 'Updating conference failed. ' \ + "#{@conference.errors.full_messages.join('. ')}.") + end + end + def update @conference = Conference.find_by(short_title: params[:id]) short_title = @conference.short_title diff --git a/app/controllers/admin/venue_controller.rb b/app/controllers/admin/venue_controller.rb index bb32b913..59379a09 100644 --- a/app/controllers/admin/venue_controller.rb +++ b/app/controllers/admin/venue_controller.rb @@ -8,14 +8,9 @@ module Admin def update @venue = @conference.venue @venue.assign_attributes(params[:venue]) - venue_notify = (@venue.name_changed? || @venue.address_changed?) && - (!@venue.name.blank? && !@venue.address.blank?) && - (@conference.email_settings.send_on_venue_update && - !@conference.email_settings.venue_update_subject.blank? && - @conference.email_settings.venue_update_template) - + send_mail = @venue.venue_notify?(@conference) if @venue.update_attributes(params[:venue]) - Mailbot.delay.send_email_on_venue_update(@conference) if venue_notify + Mailbot.delay.send_email_on_venue_update(@conference) if send_mail redirect_to(admin_conference_venue_info_path(conference_id: @conference.short_title), notice: 'Venue was successfully updated.') else diff --git a/app/models/call_for_papers.rb b/app/models/call_for_papers.rb index d14ba923..569939c3 100644 --- a/app/models/call_for_papers.rb +++ b/app/models/call_for_papers.rb @@ -33,4 +33,31 @@ class CallForPapers < ActiveRecord::Base def end_week end_date.strftime('%W').to_i end + + ## + # Checks whether cfp dates is updated + # + # ====Returns + # * +True+ -> If cfp dates is updated and all other parameters are set + # * +False+ -> Either cfp date is not updated or one or more parameter is not set + def notify_on_cfp_date_update? + !self.end_date.blank? && !self.start_date.blank?\ + && (self.start_date_changed? || self.end_date_changed?)\ + && self.conference.email_settings.send_on_call_for_papers_dates_updates\ + && !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\ + && !self.conference.email_settings.call_for_papers_dates_updates_template.blank? + end + ## + # Checks whether cfp dates is updated + # + # ====Returns + # * +True+ -> If cfp dates is updated and all other parameters are set + # * +False+ -> Either cfp date is not updated or one or more parameter is not set + def notify_on_schedule_public? + !self.end_date.blank? && !self.start_date.blank?\ + && (self.start_date_changed? || self.end_date_changed?)\ + && self.conference.email_settings.send_on_call_for_papers_dates_updates\ + && !self.conference.email_settings.call_for_papers_dates_updates_subject.blank?\ + && !self.conference.email_settings.call_for_papers_dates_updates_template.blank? + end end diff --git a/app/models/conference.rb b/app/models/conference.rb index 23252d79..01a8d8b4 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -929,4 +929,30 @@ class Conference < ActiveRecord::Base result end + + ## + # Checks if conference is updated for email notifications. + # + # ====Returns + # * +True+ -> If conference is updated and all other parameters are set + # * +False+ -> Either conference is not updated or one or more parameter is not set + def notify_on_conf_dates_updates? + (self.start_date_changed? || self.end_date_changed?)\ + && self.email_settings.send_on_updated_conference_dates\ + && !self.email_settings.updated_conference_dates_subject.blank?\ + && self.email_settings.updated_conference_dates_template + end + + ## + # Checks if registration dates are updated for email notifications. + # + # ====Returns + # * +True+ -> If registration dates is updated and all other parameters are set + # * +False+ -> Either registration date is not updated or one or more parameter is not set + def notify_on_reg_dates? + (self.registration_start_date_changed? || self.registration_end_date_changed?)\ + && self.email_settings.send_on_updated_conference_registration_dates\ + && !self.email_settings.updated_conference_registration_dates_subject.blank?\ + && self.email_settings.updated_conference_registration_dates_template + end end diff --git a/app/models/venue.rb b/app/models/venue.rb index 0963c0d7..5012699f 100644 --- a/app/models/venue.rb +++ b/app/models/venue.rb @@ -12,6 +12,14 @@ class Venue < ActiveRecord::Base size: { in: 0..500.kilobytes } accepts_nested_attributes_for :lodgings, allow_destroy: true + def venue_notify?(conference) + (self.name_changed? || self.address_changed?) && + (!self.name.blank? && !self.address.blank?) && + (conference.email_settings.send_on_venue_update && + !conference.email_settings.venue_update_subject.blank? && + conference.email_settings.venue_update_template) + end + private # TODO: create a module to be mixed into model to perform same operation