Merge branch 'feature/notification_preferences' into main

Signed-off-by: Robert Smith <[email protected]>

Author: rsmithlal

app/controllers/better_together/messages_controller.rb

@@ -35,7 +35,8 @@ def notify_participants(message)
       recipients = message.conversation.participants.where.not(id: message.sender_id)
 
       # Pass the array of recipients to the notification
-      BetterTogether::NewMessageNotifier.with(record: message).deliver_later(recipients)
+      BetterTogether::NewMessageNotifier.with(record: message,
+                                              conversation_id: message.conversation_id).deliver_later(recipients)
     end
 
     def broadcast_to_recipients(message, recipients)

app/controllers/better_together/people_controller.rb

@@ -75,7 +75,7 @@ def set_resource_instance
 
     def person_params
       params.require(:person).permit(
-        :name, :description, :profile_image, :slug, :locale,
+        :name, :description, :profile_image, :slug, :locale, :notify_by_email,
         :profile_image, :cover_image, :remove_profile_image, :remove_cover_image,
         *resource_class.permitted_attributes
       )

app/models/better_together/person.rb

@@ -58,6 +58,10 @@ def self.primary_community_delegation_attrs
       time_zone String, default: ENV.fetch('APP_TIME_ZONE', 'Newfoundland')
     end
 
+    store_attributes :notification_preferences do
+      notify_by_email Boolean, default: true
+    end
+
     validates :name,
               presence: true
 

app/notifiers/better_together/new_message_notifier.rb

@@ -33,37 +33,24 @@ def sender
       delegate :url, to: :event
 
       def send_email_notification?
-        recipient.email.present? && should_send_email?
+        recipient.email.present? && recipient.notification_preferences['notify_by_email'] && should_send_email?
       end
 
-      # rubocop:todo Metrics/MethodLength
-      def should_send_email? # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
-        # Find the events related to the conversation
-        related_event_ids = BetterTogether::NewMessageNotifier.where(params: { conversation_id: conversation.id })
-                                                              .pluck(:id)
+      def should_send_email?
+        # Check for unread notifications for the recipient for the record's conversation
+        unread_notifications = recipient.notifications.where(
+          event_id: BetterTogether::NewMessageNotifier.where(params: { conversation_id: conversation.id }).select(:id),
+          read_at: nil
+        ).order(created_at: :desc)
 
-        # Check for unread notifications for the recipient related to these events
-        unread_notifications = recipient.notifications
-                                        .where(event_id: related_event_ids, read_at: nil)
-
-        if unread_notifications.empty? || (unread_notifications.last.created_at <= 1.day.ago)
-          # No unread recent notifications, send the email
-          true
+        if unread_notifications.none?
+          # If the recipient has read their notifications, do not send
+          false
         else
-          # Optional: Implement a time-based delay or other conditions
-          last_email_sent_at = recipient.notifications
-                                        .where(event_id: related_event_ids)
-                                        .order(created_at: :desc)
-                                        .pluck(:created_at)
-                                        .first
-
-          return true if last_email_sent_at.blank? # Send if no previous email sent
-
-          # Send email only if more than 30 minutes have passed since the last one
-          last_email_sent_at < 30.minutes.ago
+          # Only send one email per unread notifications per conversation
+          message.id == unread_notifications.last.event.record_id
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
 
     def identifier

app/views/better_together/conversation_mailer/new_message_notification.html.erb

@@ -6,6 +6,7 @@
 
 <p><%= t('.view_conversation') %></p>
 
-<p><%= link_to conversation_url(@conversation), conversation_url(@conversation) %></p>
+<p><%= link_to t('.view_conversation_link'), 
+								 conversation_url(@conversation, anchor: "message_#{@message.id}") %></p>
 
 <p><%= t('.signature_html', platform: @platform.name) %></p>

app/views/better_together/people/_form.html.erb

@@ -118,11 +118,16 @@
            id="person-preferences"
            role="tabpanel"
            aria-labelledby="person-preferences-tab">
-        <div class="mb-3">
+        <div class="mb-3 border-bottom">
           <%= required_label(form, :locale, class: "form-label") %>
           <%= language_select_field(form:, selected_locale: person.locale) %>
           <small class="form-text text-muted"><%= t('helpers.hint.person.locale') %></small>
         </div>
+				<div class="mb-3">
+					<p><%= t('better_together.people.notification_preferences') %></p>
+					<%= render partial: 'better_together/shared/fields/toggle_switch', locals: {form:, attr: :notify_by_email} %>
+					  <small class="form-text text-muted"><%= t('helpers.hint.person.notify_by_email') %></small>
+				</div>
       </div>
 
       <!-- Device Permissions Tab -->

config/locales/en.yml

@@ -296,6 +296,7 @@ en:
         member_communities: Member communities
         member_platforms: Member platforms
         name: Name
+        notify_by_email: Receive email notifications
         notification_mentions: Notification mentions
         notifications: Notifications
         person_community_memberships: Person community memberships
@@ -638,6 +639,7 @@ en:
         subject_with_title: '[%{conversation}] conversation has an unread message'
         view_conversation: 'You can view and reply to this message by clicking the
           link below:'
+        view_conversation_link: 'Go to conversation'
     conversations:
       communicator:
         active_conversations: Active Conversations
@@ -818,6 +820,7 @@ en:
         new_person: New person
       submit:
         save: Save
+      notification_preferences: Message notification preferences
       tabs:
         contact_details: Contact Details
         details: Details
@@ -1299,6 +1302,7 @@ en:
         description: Provide a brief description or biography.
         locale: Select the preferred language for the person.
         name: Enter the full name of the person.
+        notify_by_email: Send an email when a conversation has an unread message.
         profile_image: Upload a profile image for the person.
         slug: A URL-friendly identifier, typically auto-generated.
     label:

config/locales/es.yml

@@ -296,6 +296,7 @@ es:
         member_communities: Comunidades miembros
         member_platforms: Plataformas miembros
         name: Nombre
+        notify_by_email: Recibir notificaciones por correo electrónico
         notification_mentions: Menciones de notificación
         notifications: Notificaciones
         person_community_memberships: Membresías de la comunidad de personas
@@ -641,6 +642,7 @@ es:
         subject_with_title: '[%{conversation}] tiene un mensaje sin leer'
         view_conversation: 'Puedes ver y responder a este mensaje haciendo clic en
           el enlace a continuación:'
+        view_conversation_link: 'Ir a la conversación'
     conversations:
       communicator:
         active_conversations: Active Conversations
@@ -819,6 +821,7 @@ es:
         permissions_group_label: Permissions group label
       index:
         new_person: Nueva persona
+      notification_preferences: Preferencias de notificación de mensajes
       submit:
         save: Guardar
       tabs:
@@ -1287,6 +1290,7 @@ es:
         description: Proporcione una breve descripción o biografía.
         locale: Selecciona el idioma preferido para la persona.
         name: Ingrese el nombre completo de la persona.
+        notify_by_email: Envía un correo electrónico cuando una conversación tiene un mensage no leído.
         profile_image: Sube una imagen de perfil para la persona.
         slug: Un identificador compatible con URL, generalmente generado automáticamente.
     label:

config/locales/fr.yml

@@ -296,6 +296,7 @@ fr:
         member_communities: Communautés membres
         member_platforms: Plateformes membres
         name: Nom
+        notify_by_email: Recevoir des notifications par e-mail
         notification_mentions: Mentions de notification
         notifications: Notifications
         person_community_memberships: Adhésions communautaires de personnes
@@ -643,6 +644,7 @@ fr:
         subject_with_title: '[%{conversation}] contient un message non lu'
         view_conversation: 'Vous pouvez voir et répondre à ce message en cliquant
           sur le lien ci-dessous :'
+        view_conversation_link: 'Aller à la conversation'
     conversations:
       communicator:
         active_conversations: Active Conversations
@@ -822,6 +824,7 @@ fr:
         permissions_group_label: Permissions group label
       index:
         new_person: Nouvelle personne
+      notification_preferences: Préférences de notification des messages
       submit:
         save: Enregistrer
       tabs:
@@ -1313,6 +1316,7 @@ fr:
         description: Fournissez une brève description ou biographie.
         locale: Sélectionnez la langue préférée pour la personne.
         name: Entrez le nom complet de la personne.
+        notify_by_email: Envoyer un e-mail lorsqu'une conversation contient un message non lu.
         profile_image: Téléchargez une image de profil pour la personne.
         slug: Un identifiant compatible avec les URL, généralement généré automatiquement.
     label:

db/migrate/20250804172724_add_notification_preferences_to_better_together_people.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# adds a notifications preferences column to track and store message notification preferences
+class AddNotificationPreferencesToBetterTogetherPeople < ActiveRecord::Migration[7.1]
+  def change
+    add_column :better_together_people, :notification_preferences, :jsonb, null: false, default: {}
+  end
+end