feat: Enhance event reminder and update mailers with new templates and localization support

Author: rsmithlal

app/jobs/better_together/event_reminder_job.rb

@@ -5,7 +5,11 @@ module BetterTogether
   class EventReminderJob < ApplicationJob
     queue_as :notifications
 
-    def perform(event, reminder_type = '24_hours')
+    retry_on StandardError, wait: :polynomially_longer, attempts: 5
+    discard_on ActiveRecord::RecordNotFound
+
+    def perform(event_or_id, reminder_type = '24_hours')
+      event = find_event(event_or_id)
       return unless event_valid?(event)
 
       attendees = going_attendees(event)
@@ -15,13 +19,22 @@ def perform(event, reminder_type = '24_hours')
 
     private
 
+    def find_event(event_or_id)
+      return event_or_id if event_or_id.is_a?(BetterTogether::Event)
+
+      BetterTogether::Event.find(event_or_id) if event_or_id.present?
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
     def event_valid?(event)
       event.present? && event.starts_at.present?
     end
 
     def going_attendees(event)
-      event.attendees.joins(:event_attendances)
-           .where(better_together_event_attendances: { status: 'going' })
+      # Get people who have 'going' status for this event
+      person_ids = event.event_attendances.where(status: 'going').pluck(:person_id)
+      BetterTogether::Person.where(id: person_ids)
     end
 
     def send_reminders_to_attendees(event, attendees, reminder_type)

app/jobs/better_together/event_reminder_scheduler_job.rb

@@ -5,9 +5,14 @@ module BetterTogether
   class EventReminderSchedulerJob < ApplicationJob
     queue_as :notifications
 
-    def perform(event)
+    retry_on StandardError, wait: :polynomially_longer, attempts: 5
+    discard_on ActiveRecord::RecordNotFound
+
+    def perform(event_or_id)
+      event = find_event(event_or_id)
       return unless event_valid?(event)
       return if event_in_past?(event)
+      return unless event_has_attendees?(event)
 
       cancel_existing_reminders(event)
       schedule_reminders(event)
@@ -16,6 +21,14 @@ def perform(event)
 
     private
 
+    def find_event(event_or_id)
+      return event_or_id if event_or_id.is_a?(BetterTogether::Event)
+
+      BetterTogether::Event.find(event_or_id) if event_or_id.present?
+    rescue ActiveRecord::RecordNotFound
+      nil
+    end
+
     def event_valid?(event)
       event.present? && event.starts_at.present?
     end
@@ -24,9 +37,14 @@ def event_in_past?(event)
       event.starts_at <= Time.current
     end
 
+    def event_has_attendees?(event)
+      event.event_attendances.any?
+    end
+
     def schedule_reminders(event)
       schedule_24_hour_reminder(event) if should_schedule_24_hour_reminder?(event)
       schedule_1_hour_reminder(event) if should_schedule_1_hour_reminder?(event)
+      schedule_start_time_reminder(event) if should_schedule_start_time_reminder?(event)
     end
 
     def should_schedule_24_hour_reminder?(event)
@@ -37,20 +55,41 @@ def should_schedule_1_hour_reminder?(event)
       event.starts_at > 1.hour.from_now
     end
 
+    def should_schedule_start_time_reminder?(event)
+      event.starts_at > Time.current
+    end
+
     def schedule_24_hour_reminder(event)
       EventReminderJob.set(wait_until: event.starts_at - 24.hours)
-                      .perform_later(event, '24_hours')
+                      .perform_later(event.id)
     end
 
     def schedule_1_hour_reminder(event)
       EventReminderJob.set(wait_until: event.starts_at - 1.hour)
-                      .perform_later(event, '1_hour')
+                      .perform_later(event.id)
+    end
+
+    def schedule_start_time_reminder(event)
+      EventReminderJob.set(wait_until: event.starts_at)
+                      .perform_later(event.id)
     end
 
     def log_completion(event)
       Rails.logger.info "Scheduled reminders for event #{event.identifier}"
     end
 
+    def reminder_intervals
+      [24.hours, 1.hour, 0.seconds]
+    end
+
+    def schedule_future_reminder?(event_id, reminder_time)
+      return false if reminder_time <= Time.current
+
+      EventReminderJob.set(wait_until: reminder_time)
+                      .perform_later(event_id)
+      true
+    end
+
     def cancel_existing_reminders(event)
       # Find and cancel existing reminder jobs for this event
       # This is a simplified approach - in production you might want to use

app/mailers/better_together/event_mailer.rb

@@ -8,6 +8,7 @@ def event_reminder(recipient, event, reminder_type = '24_hours')
       @event = event
       @reminder_type = reminder_type
       @recipient = recipient
+      @platform = BetterTogether::Platform.find_by(host: true)
 
       mail(
         to: recipient.email,
@@ -20,6 +21,7 @@ def event_update(recipient, event, changed_attributes)
       @event = event
       @changed_attributes = changed_attributes
       @recipient = recipient
+      @platform = BetterTogether::Platform.find_by(host: true)
 
       mail(
         to: recipient.email,
@@ -31,15 +33,15 @@ def event_update(recipient, event, changed_attributes)
 
     def reminder_subject(event)
       I18n.t(
-        'better_together.mailers.event_reminder.subject',
+        'better_together.event_mailer.event_reminder.subject',
         event_name: event.name,
         default: 'Reminder: %<event_name>s'
       )
     end
 
     def update_subject(event)
       I18n.t(
-        'better_together.mailers.event_update.subject',
+        'better_together.event_mailer.event_update.subject',
         event_name: event.name,
         default: 'Event updated: %<event_name>s'
       )

app/models/better_together/person.rb

@@ -82,7 +82,13 @@ def self.primary_community_delegation_attrs
 
     translates :description_html, backend: :action_text
 
-    delegate :email, to: :user, allow_nil: true
+    # Return email from user if available, otherwise from contact details
+    def email
+      return user.email if user&.email.present?
+
+      # Fallback to primary email address from contact details
+      email_addresses.find(&:primary_flag)&.email
+    end
 
     has_one_attached :profile_image
     has_one_attached :cover_image

app/views/better_together/event_mailer/event_reminder.html.erb

@@ -0,0 +1,39 @@
+<!-- app/views/better_together/event_mailer/event_reminder.html.erb -->
+
+<p><%= t('.greeting', recipient_name: @recipient.name) %></p>
+
+<p><%= t('.reminder_message', event_name: @event.name) %></p>
+
+<h3><%= @event.name %></h3>
+
+<% if @event.description.present? %>
+  <p><strong><%= t('.description') %>:</strong></p>
+  <p><%= @event.description %></p>
+<% end %>
+
+<p><strong><%= t('.when') %>:</strong></p>
+<% if @event.starts_at %>
+  <p><%= l(@event.starts_at, format: :long) %></p>
+  <% if @event.ends_at %>
+    <p><%= t('.ends_at') %>: <%= l(@event.ends_at, format: :long) %></p>
+  <% end %>
+<% else %>
+  <p><%= t('.time_tbd') %></p>
+<% end %>
+
+<% if @event.duration_in_hours.present? %>
+  <p><strong><%= t('.duration') %>:</strong> <%= t('.hours', count: @event.duration_in_hours) %></p>
+<% end %>
+
+<% if @event.location? %>
+  <p><strong><%= t('.location') %>:</strong></p>
+  <p><%= @event.location_display_name %></p>
+<% end %>
+
+<% if @event.registration_url.present? %>
+  <p><%= link_to t('.register_link'), @event.registration_url, class: 'text-decoration-none' %></p>
+<% end %>
+
+<p><%= t('.view_event_link_html', link: link_to(@event.name, event_url(@event))) %></p>
+
+<p><%= t('.signature_html', platform: @platform&.name || 'Better Together') %></p>

app/views/better_together/event_mailer/event_update.html.erb

@@ -0,0 +1,52 @@
+<!-- app/views/better_together/event_mailer/event_update.html.erb -->
+
+<p><%= t('.greeting', recipient_name: @recipient.name) %></p>
+
+<% if @changed_attributes.length > 1 %>
+  <p><%= t('.update_message_plural', event_name: @event.name) %></p>
+<% else %>
+  <p><%= t('.update_message_singular', event_name: @event.name) %></p>
+<% end %>
+
+<h3><%= @event.name %></h3>
+
+<p><strong><%= t('.changes_made') %>:</strong></p>
+<ul>
+  <% @changed_attributes.each do |attribute| %>
+    <li><%= t(".changed_attributes.#{attribute}", default: attribute.humanize) %></li>
+  <% end %>
+</ul>
+
+<p><strong><%= t('.current_details') %>:</strong></p>
+
+<% if @event.description.present? %>
+  <p><strong><%= t('.description') %>:</strong></p>
+  <p><%= @event.description %></p>
+<% end %>
+
+<p><strong><%= t('.when') %>:</strong></p>
+<% if @event.starts_at %>
+  <p><%= l(@event.starts_at, format: :long) %></p>
+  <% if @event.ends_at %>
+    <p><%= t('.ends_at') %>: <%= l(@event.ends_at, format: :long) %></p>
+  <% end %>
+<% else %>
+  <p><%= t('.time_tbd') %></p>
+<% end %>
+
+<% if @event.duration_in_hours.present? %>
+  <p><strong><%= t('.duration') %>:</strong> <%= t('.hours', count: @event.duration_in_hours) %></p>
+<% end %>
+
+<% if @event.location? %>
+  <p><strong><%= t('.location') %>:</strong></p>
+  <p><%= @event.location_display_name %></p>
+<% end %>
+
+<% if @event.registration_url.present? %>
+  <p><%= link_to t('.register_link'), @event.registration_url, class: 'text-decoration-none' %></p>
+<% end %>
+
+<p><%= t('.view_event_link_html', link: link_to(@event.name, event_url(@event))) %></p>
+
+<p><%= t('.signature_html', platform: @platform&.name || 'Better Together') %></p>

config/locales/en.yml

@@ -673,6 +673,44 @@ en:
         signature_html: |-
           Best regards,<br />
           The %{platform} Team
+    event_mailer:
+      event_reminder:
+        subject: "Reminder: %{event_name}"
+        greeting: Hello %{recipient_name},
+        reminder_message: This is a friendly reminder about the upcoming event "%{event_name}".
+        description: Description
+        when: When
+        ends_at: Ends at
+        duration: Duration
+        hours: 
+          one: "%{count} hour"
+          other: "%{count} hours"
+        location: Location
+        register_link: Register or RSVP
+        view_event_link_html: 'View event details: %{link}'
+        signature_html: |-
+          Best regards,<br />
+          The %{platform} Team
+      event_update:
+        subject: "Event updated: %{event_name}"
+        greeting: Hello %{recipient_name},
+        update_message_singular: The event "%{event_name}" has been updated.
+        update_message_plural: The event "%{event_name}" has been updated with several changes.
+        changes_made: Changes made
+        current_details: Current details
+        description: Description
+        when: When
+        ends_at: Ends at
+        duration: Duration
+        hours:
+          one: "%{count} hour"
+          other: "%{count} hours"
+        location: Location
+        register_link: Register or RSVP
+        view_event_link_html: 'View event details: %{link}'
+        signature_html: |-
+          Best regards,<br />
+          The %{platform} Team
     conversations:
       communicator:
         active_conversations: Active Conversations

spec/factories/better_together/contact_details.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :contact_detail do # rubocop:todo Lint/EmptyBlock
+  factory :better_together_contact_detail, class: BetterTogether::ContactDetail, aliases: [:contact_detail] do
+    # contactable association should be set by the caller
   end
 end

spec/factories/better_together/email_addresses.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
-  factory :email_address do # rubocop:todo Lint/EmptyBlock
+  factory :better_together_email_address, class: BetterTogether::EmailAddress, aliases: [:email_address] do
+    email { Faker::Internet.unique.email }
+    label { 'primary' }
+    primary_flag { true }
+    # contact_detail association should be set by the caller
   end
 end

spec/factories/better_together/people.rb

@@ -11,6 +11,17 @@ module BetterTogether
       identifier { Faker::Internet.unique.username(specifier: 10..20) }
 
       community
+
+      # Add email address after creation since Person model likely requires it for mailer
+      after(:create) do |person|
+        # Ensure person has contact_detail
+        person.contact_detail ||= create(:better_together_contact_detail, contactable: person)
+
+        create(:better_together_email_address,
+               contact_detail: person.contact_detail,
+               email: Faker::Internet.unique.email,
+               primary_flag: true)
+      end
     end
   end
 end