Merge pull request #74 from cs169/tentative_accept

Tentative accept

Author: sikesbc

Gemfile.lock

@@ -672,7 +672,7 @@ GEM
     turbolinks-source (5.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.3)
+    tzinfo-data (1.2026.1)
       tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -832,7 +832,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.3.10p183
 
 BUNDLED WITH
    2.5.6

app/controllers/admin/conferences_controller.rb

@@ -71,16 +71,16 @@ def new
         source = Conference.find_by(short_title: params[:duplicate_from])
         if source && can?(:read, source)
           @conference = Conference.new(
-            description: source.description,
-            timezone: source.timezone,
-            start_hour: source.start_hour,
-            end_hour: source.end_hour,
-            color: source.color,
-            custom_css: source.custom_css,
-            ticket_layout: source.ticket_layout,
+            description:        source.description,
+            timezone:           source.timezone,
+            start_hour:         source.start_hour,
+            end_hour:           source.end_hour,
+            color:              source.color,
+            custom_css:         source.custom_css,
+            ticket_layout:      source.ticket_layout,
             registration_limit: source.registration_limit,
-            booth_limit: source.booth_limit,
-            organization_id: source.organization_id
+            booth_limit:        source.booth_limit,
+            organization_id:    source.organization_id
           )
           @duplicate_from_source = source.short_title
         else
@@ -98,14 +98,14 @@ def create
         source = Conference.find_by(short_title: params[:duplicate_from])
         if source && can?(:read, source)
           @conference.assign_attributes(
-            description: source.description,
-            custom_css: source.custom_css,
-            ticket_layout: source.ticket_layout,
+            description:        source.description,
+            custom_css:         source.custom_css,
+            ticket_layout:      source.ticket_layout,
             registration_limit: source.registration_limit,
-            booth_limit: source.booth_limit,
-            color: source.color,
-            start_hour: source.start_hour,
-            end_hour: source.end_hour
+            booth_limit:        source.booth_limit,
+            color:              source.color,
+            start_hour:         source.start_hour,
+            end_hour:           source.end_hour
           )
         end
       end

app/controllers/admin/emails_controller.rb

@@ -28,11 +28,11 @@ def index
 
     def email_params
       params.require(:email_settings).permit(:send_on_registration,
-                                             :send_on_accepted, :send_on_rejected, :send_on_confirmed_without_registration,
+                                             :send_on_accepted, :send_on_tentative_accepted, :send_on_rejected, :send_on_confirmed_without_registration,
                                              :send_on_submitted_proposal,
                                              :submitted_proposal_subject, :submitted_proposal_body,
-                                             :registration_subject, :accepted_subject, :rejected_subject, :confirmed_without_registration_subject,
-                                             :registration_body, :accepted_body, :rejected_body, :confirmed_without_registration_body,
+                                             :registration_subject, :accepted_subject, :tentative_accepted_subject, :rejected_subject, :confirmed_without_registration_subject,
+                                             :registration_body, :accepted_body, :tentative_accepted_body, :rejected_body, :confirmed_without_registration_body,
                                              :send_on_conference_dates_updated, :conference_dates_updated_subject, :conference_dates_updated_body,
                                              :send_on_conference_registration_dates_updated, :conference_registration_dates_updated_subject, :conference_registration_dates_updated_body,
                                              :send_on_venue_updated, :venue_updated_subject, :venue_updated_body,

app/controllers/admin/events_controller.rb

@@ -115,6 +115,46 @@ def new
       @superevents = @program.events.where(superevent: true)
     end
 
+    def preview_tentative_accept
+      email_settings = @conference.email_settings
+      @tentative_subject = email_settings.tentative_accepted_subject.presence
+      default_body = email_settings.tentative_accepted_body.presence
+      @missing_committee_review = @event.committee_review.blank?
+      @tentative_body = EmailTemplateParser.parse_template(default_body, email_settings.get_values(@conference, @event.submitter, @event)) unless @missing_committee_review
+      render :tentative_accept
+    end
+
+    def tentative_accept
+      email_settings = @conference.email_settings
+
+      if @event.committee_review.blank?
+        flash.now[:alert] = 'Committee feedback is required before sending a tentative acceptance email.'
+        @tentative_subject = email_settings.tentative_accepted_subject.presence
+        email_settings.tentative_accepted_body.presence
+        @missing_committee_review = true
+        render :tentative_accept and return
+      end
+
+      @tentative_subject = email_settings.tentative_accepted_subject.presence
+      default_body = email_settings.tentative_accepted_body.presence
+      @missing_committee_review = false
+      @tentative_body = EmailTemplateParser.parse_template(default_body, email_settings.get_values(@conference, @event.submitter, @event))
+      send_mail = email_settings.send_on_tentative_accepted
+
+      begin
+        @event.tentatively_accept(send_mail: send_mail, subject: @tentative_subject, body: @tentative_body)
+        @event.save!
+        flash[:notice] = 'Event tentatively accepted!'
+        redirect_to admin_conference_program_events_path(conference_id: @conference.short_title) and return
+      rescue ActiveRecord::RecordInvalid => e
+        flash.now[:error] = "Could not save tentative acceptance: #{e.record.errors.full_messages.join(', ')}"
+        render :tentative_accept
+      rescue Transitions::InvalidTransition => e
+        flash.now[:error] = "Update state failed. #{e.message}"
+        render :tentative_accept
+      end
+    end
+
     def accept
       send_mail = @event.program.conference.email_settings.send_on_accepted
       subject = @event.program.conference.email_settings.accepted_subject.blank?

app/helpers/events_helper.rb

@@ -104,6 +104,7 @@ def difficulty_dropdown(event, difficulties, conference_id)
   end
 
   # TODO-SNAPCON: Move to admin helper
+  # rubocop:disable Metrics/MethodLength
   def state_dropdown(event, conference_id, email_settings)
     selection = event.state.humanize
     options = []
@@ -123,6 +124,12 @@ def state_dropdown(event, conference_id, email_settings)
         ]
       end
     end
+    if event.transition_possible? :tentatively_accept
+      options << [
+        'Tentatively Accept',
+        preview_tentative_accept_admin_conference_program_event_path(conference_id, event), :get
+      ]
+    end
     if event.transition_possible? :reject
       options << [
         'Reject',
@@ -159,6 +166,7 @@ def state_dropdown(event, conference_id, email_settings)
     end
     active_dropdown(selection, options)
   end
+  # rubocop:enable Metrics/MethodLength
 
   # TODO-SNAPCON: Move to admin helper
   def event_switch_checkbox(event, attribute, conference_id)
@@ -318,9 +326,10 @@ def active_dropdown(selection, options)
     #
     # Selection is the string to show by default, which is clicked to expose the
     # dropdown options.
-    # Options is a list of 2-item lists; for each entry:
+    # Options is a list of lists; for each entry:
     # * [0] is the text of the option,
-    # * [1] is the link url for the options
+    # * [1] is the link url for the option,
+    # * [2] is the optional HTTP method symbol (defaults to :patch)
     content_tag('div', class: 'dropdown') do
       content_tag(
         'a',
@@ -333,7 +342,8 @@ def active_dropdown(selection, options)
       end +
         content_tag('ul', class: 'dropdown-menu') do
           options.collect do |option|
-            content_tag('li', link_to(option[0], option[1], method: :patch))
+            method = option[2] || :patch
+            content_tag('li', link_to(option[0], option[1], method: method))
           end.join.html_safe
         end
     end

app/mailers/mailbot.rb

@@ -54,6 +54,16 @@ def acceptance_mail(event)
     mail(subject: @conference.email_settings.accepted_subject, cc: @speakers)
   end
 
+  def tentative_acceptance_mail(event, subject: nil, body: nil)
+    @user = event.submitter
+    @conference = event.program.conference
+    @speakers = event.speakers.map(&:email)
+    @email_body = body.presence || @conference.email_settings.generate_event_mail(event, @conference.email_settings.tentative_accepted_body)
+    email_subject = subject.presence || @conference.email_settings.tentative_accepted_subject
+
+    mail(subject: email_subject, cc: @speakers)
+  end
+
   def submitted_proposal_mail(event)
     @user = event.submitter
     @speakers = event.speakers.map(&:email)

app/models/conference.rb

@@ -906,7 +906,7 @@ def copy_associations_from(source)
       new_room_id = old_room_id ? room_id_map[old_room_id] : nil
       program.tracks.create!(
         t.attributes.slice('name', 'short_name', 'description', 'color', 'state', 'relevance', 'start_date', 'end_date', 'cfp_active').merge(
-          guid: SecureRandom.urlsafe_base64,
+          guid:    SecureRandom.urlsafe_base64,
           room_id: new_room_id
         )
       )

app/models/email_settings.rb

@@ -36,9 +36,12 @@
 #  send_on_registration                          :boolean          default(FALSE)
 #  send_on_rejected                              :boolean          default(FALSE)
 #  send_on_submitted_proposal                    :boolean          default(FALSE)
+#  send_on_tentative_accepted                    :boolean          default(FALSE)
 #  send_on_venue_updated                         :boolean          default(FALSE)
 #  submitted_proposal_body                       :text
 #  submitted_proposal_subject                    :string
+#  tentative_accepted_body                       :text
+#  tentative_accepted_subject                    :string
 #  venue_updated_body                            :text
 #  venue_updated_subject                         :string
 #  created_at                                    :datetime

app/models/event.rb

@@ -110,6 +110,7 @@ class Event < ApplicationRecord
 
   scope :confirmed, -> { where(state: 'confirmed') }
   scope :unconfirmed, -> { where(state: 'unconfirmed') }
+  scope :tentatively_accepted, -> { where(state: 'tentatively_accepted') }
   scope :canceled, -> { where(state: 'canceled') }
   scope :withdrawn, -> { where(state: 'withdrawn') }
   scope :highlighted, -> { where(is_highlight: true) }
@@ -120,6 +121,7 @@ class Event < ApplicationRecord
     state :new
     state :withdrawn
     state :unconfirmed
+    state :tentatively_accepted
     state :confirmed
     state :canceled
     state :rejected
@@ -131,7 +133,10 @@ class Event < ApplicationRecord
       transitions to: :withdrawn, from: %i[new unconfirmed confirmed]
     end
     event :accept do
-      transitions to: :unconfirmed, from: [:new], on_transition: :process_acceptance
+      transitions to: :unconfirmed, from: %i[new tentatively_accepted], on_transition: :process_acceptance
+    end
+    event :tentatively_accept do
+      transitions to: :tentatively_accepted, from: [:new], on_transition: :process_tentative_acceptance
     end
     event :confirm do
       transitions to: :confirmed, from: :unconfirmed, on_transition: :process_confirmation
@@ -140,17 +145,18 @@ class Event < ApplicationRecord
       transitions to: :canceled, from: %i[unconfirmed confirmed]
     end
     event :reject do
-      transitions to: :rejected, from: [:new], on_transition: :process_rejection
+      transitions to: :rejected, from: %i[new tentatively_accepted], on_transition: :process_rejection
     end
   end
 
   COLORS = {
-    new:         '#0000FF', # blue
-    withdrawn:   '#FF8000', # orange
-    unconfirmed: '#FFFF00', # yellow
-    confirmed:   '#00FF00', # green
-    canceled:    '#848484', # grey
-    rejected:    '#FF0000'  # red
+    new:                  '#0000FF', # blue
+    withdrawn:            '#FF8000', # orange
+    unconfirmed:          '#FFFF00', # yellow
+    tentatively_accepted: '#FFA500', # amber
+    confirmed:            '#00FF00', # green
+    canceled:             '#848484', # grey
+    rejected:             '#FF0000'  # red
   }.freeze
 
   ##
@@ -245,6 +251,15 @@ def process_acceptance(options)
     end
   end
 
+  def process_tentative_acceptance(options)
+    if program.conference.email_settings.send_on_tentative_accepted &&
+       program.conference.email_settings.tentative_accepted_body &&
+       program.conference.email_settings.tentative_accepted_subject &&
+       options[:send_mail].present?
+      Mailbot.tentative_acceptance_mail(self, subject: options[:subject], body: options[:body]).deliver_later
+    end
+  end
+
   def process_rejection(options)
     if program.conference.email_settings.send_on_rejected &&
        program.conference.email_settings.rejected_body &&

app/models/user.rb

@@ -104,8 +104,8 @@ def for_registration(conference)
   scope :comment_notifiable, lambda { |conference|
                                joins(users_roles: :role)
                                  .where(roles: { resource_type: 'Conference',
-                                                 resource_id: conference.id,
-                                                 name: %i[organizer cfp] })
+                                                 resource_id:   conference.id,
+                                                 name:          %i[organizer cfp] })
                                  .where(
                                    Role.arel_table[:name]
                                        .eq('cfp')