Merge branch 'main' into feature/message-opt-in

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

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -13,11 +13,11 @@ jobs:
           - ruby: '3.4.4'
             rails: '7.1.5.1'
             allowed_failure: false   # ✅ required
-          # - ruby: '3.4.4'
-          #   rails: '7.2'
-          #   allowed_failure: true    # ⚠️ allowed to fail
           - ruby: '3.4.4'
-            rails: '8.0'
+            rails: '7.2.2.1'
+            allowed_failure: false   # ⚠️ allowed to fail
+          - ruby: '3.4.4'
+            rails: '8.0.2'
             allowed_failure: true    # ⚠️ allowed to fail
 
     env:

Gemfile

@@ -35,7 +35,7 @@ gem 'redis', '~> 5.4'
 gem 'rswag'
 
 # Sidekiq for background processing
-gem 'sidekiq', '~> 8.0.6'
+gem 'sidekiq', '~> 8.0.7'
 
 # Error and performance monitoring with Sentry
 gem 'sentry-rails'

Gemfile.lock

@@ -314,13 +314,13 @@ GEM
       railties (>= 6.1.0)
     faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.0)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-multipart (1.1.0)
+    faraday-multipart (1.1.1)
       multipart-post (~> 2.0)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     ffi (1.17.2-aarch64-linux-gnu)
     ffi (1.17.2-arm64-darwin)
@@ -595,7 +595,7 @@ GEM
       psych (>= 4.0.0)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.25.1)
+    redis-client (0.25.2)
       connection_pool
     reform (2.6.2)
       disposable (>= 0.5.0, < 1.0.0)
@@ -604,7 +604,7 @@ GEM
     reform-rails (0.2.6)
       activemodel (>= 5.0)
       reform (>= 2.3.1, < 3.0.0)
-    regexp_parser (2.11.0)
+    regexp_parser (2.11.1)
     reline (0.6.2)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -678,7 +678,7 @@ GEM
     rubocop-factory_bot (2.27.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.32.0)
+    rubocop-rails (2.33.0)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -691,7 +691,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
       rubocop-rspec (~> 3.5)
-    ruby-openai (8.1.0)
+    ruby-openai (8.2.0)
       event_stream_parser (>= 0.3.0, < 2.0.0)
       faraday (>= 1)
       faraday-multipart (>= 1)
@@ -727,7 +727,7 @@ GEM
       activesupport (>= 3)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (8.0.6)
+    sidekiq (8.0.7)
       connection_pool (>= 2.5.0)
       json (>= 2.9.0)
       logger (>= 1.6.2)
@@ -863,7 +863,7 @@ DEPENDENCIES
   sentry-ruby
   shoulda-callback-matchers
   shoulda-matchers
-  sidekiq (~> 8.0.6)
+  sidekiq (~> 8.0.7)
   simplecov
   spring
   spring-watcher-listen (~> 2.1.0)

app/controllers/better_together/conversations_controller.rb

@@ -47,7 +47,7 @@ def show # rubocop:todo Metrics/MethodLength, Metrics/AbcSize
         # Move this to separate action/bg process only activated when the messages are actually read.
         events = BetterTogether::NewMessageNotifier.where(record_id: @messages.pluck(:id)).select(:id)
 
-        notifications = helpers.current_person.notifications.where(event_id: events.pluck(:id))
+        notifications = helpers.current_person.notifications.unread.where(event_id: events.pluck(:id))
         notifications.update_all(read_at: Time.current)
       end
 

app/controllers/better_together/metrics/link_click_reports_controller.rb

@@ -41,7 +41,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
         respond_to do |format| # rubocop:todo Metrics/BlockLength
           if @link_click_report.persisted?
-            flash[:notice] = 'Report was successfully created.'
+            flash[:notice] = t('flash.generic.created', resource: t('resources.report'))
             format.html { redirect_to metrics_link_click_reports_path, notice: flash[:notice] }
             format.turbo_stream do
               render turbo_stream: [
@@ -55,7 +55,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
               ]
             end
           else
-            flash.now[:alert] = 'Error creating report.'
+            flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.report'))
             format.html { render :new, status: :unprocessable_entity }
             format.turbo_stream do
               render turbo_stream: [

app/controllers/better_together/metrics/page_view_reports_controller.rb

@@ -39,7 +39,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
         respond_to do |format| # rubocop:todo Metrics/BlockLength
           if @page_view_report.persisted?
-            flash[:notice] = 'Report was successfully created.'
+            flash[:notice] = t('flash.generic.created', resource: t('resources.report'))
             format.html { redirect_to metrics_page_view_reports_path, notice: flash[:notice] }
             format.turbo_stream do
               render turbo_stream: [
@@ -55,7 +55,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
               ]
             end
           else
-            flash.now[:alert] = 'Error creating report.'
+            flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.report'))
             format.html { render :new, status: :unprocessable_entity }
             format.turbo_stream do
               render turbo_stream: [

app/controllers/better_together/notifications_controller.rb

@@ -11,11 +11,11 @@ def index
     end
 
     # TODO: Make a Stimulus controller to dispatch this action async when messages are viewed
-    # rubocop:todo Metrics/MethodLength
     def mark_as_read # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       if params[:id]
-        @notification = helpers.current_person.notifications.find(params[:id])
-        @notification.update(read_at: Time.current)
+        mark_notification_as_read(params[:id])
+      elsif params[:record_id]
+        mark_record_notification_as_read(params[:record_id])
       else
         helpers.current_person.notifications.unread.update_all(read_at: Time.current)
       end
@@ -35,6 +35,17 @@ def mark_as_read # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
+
+    def mark_notification_as_read(id)
+      @notification = helpers.current_person.notifications.find(id)
+      @notification.update(read_at: Time.current)
+    end
+
+    def mark_record_notification_as_read(id)
+      @notifications = helpers.current_person.notifications.unread.includes(
+        :event
+      ).references(:event).where(event: { record_id: id })
+      @notifications.update_all(read_at: Time.current)
+    end
   end
 end

app/controllers/better_together/pages_controller.rb

@@ -37,7 +37,7 @@ def create
       authorize @page
 
       if @page.save
-        redirect_to edit_page_path(@page), notice: 'Page was successfully created.'
+        redirect_to edit_page_path(@page), notice: t('flash.generic.created', resource: t('resources.page'))
       else
         render :new
       end
@@ -53,11 +53,11 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       respond_to do |format|
         if @page.update(page_params)
           format.html do
-            flash[:notice] = 'Page was successfully updated.'
-            redirect_to edit_page_path(@page), notice: 'Page was successfully updated.'
+            flash[:notice] = t('flash.generic.updated', resource: t('resources.page'))
+            redirect_to edit_page_path(@page), notice: t('flash.generic.updated', resource: t('resources.page'))
           end
           format.turbo_stream do
-            flash.now[:notice] = 'Page was successfully updated.'
+            flash.now[:notice] = t('flash.generic.updated', resource: t('resources.page'))
             render turbo_stream: [
               turbo_stream.replace(helpers.dom_id(@page, 'form'), partial: 'form',
                                                                   locals: { page: @page }),
@@ -77,7 +77,7 @@ def update # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
     def destroy
       authorize @page
       @page.destroy
-      redirect_to pages_url, notice: 'Page was successfully destroyed.'
+      redirect_to pages_url, notice: t('flash.generic.destroyed', resource: t('resources.page'))
     end
 
     protected

app/controllers/better_together/person_community_memberships_controller.rb

@@ -13,7 +13,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       respond_to do |format|
         if @person_community_membership.save
-          flash[:notice] = 'Member was successfully added.'
+          flash[:notice] = t('flash.generic.created', resource: t('resources.member'))
           format.html { redirect_to @community, notice: flash[:notice] }
           format.turbo_stream do
             render turbo_stream: [
@@ -26,7 +26,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             ]
           end
         else
-          flash.now[:alert] = 'Error adding member.'
+          flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.member'))
           format.html { redirect_to @community, alert: @person_community_membership.errors.full_messages.to_sentence }
           format.turbo_stream do
             render turbo_stream: [
@@ -44,7 +44,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @person_community_membership
 
       if @person_community_membership.destroy
-        flash.now[:notice] = 'Member was successfully removed.'
+        flash.now[:notice] = t('flash.generic.removed', resource: t('resources.member'))
         respond_to do |format|
           format.html { redirect_to @community }
           format.turbo_stream do
@@ -56,7 +56,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
           end
         end
       else
-        flash.now[:error] = 'Failed to remove member.'
+        flash.now[:error] = t('flash.generic.error_remove', resource: t('resources.member'))
         respond_to do |format|
           format.html { redirect_to @community, alert: flash.now[:error] }
           format.turbo_stream do

app/controllers/better_together/platform_invitations_controller.rb

@@ -21,7 +21,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
 
       respond_to do |format|
         if @platform_invitation.save
-          flash[:notice] = 'Invitation was successfully created.'
+          flash[:notice] = t('flash.generic.created', resource: t('resources.invitation'))
           format.html { redirect_to @platform, notice: flash[:notice] }
           format.turbo_stream do
             render turbo_stream: [
@@ -34,7 +34,7 @@ def create # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
             ]
           end
         else
-          flash.now[:alert] = 'Error creating platform_invitation.'
+          flash.now[:alert] = t('flash.generic.error_create', resource: t('resources.invitation'))
           format.html { redirect_to @platform, alert: @platform_invitation.errors.full_messages.to_sentence }
           format.turbo_stream do
             render turbo_stream: [
@@ -52,7 +52,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @platform_invitation
 
       if @platform_invitation.destroy
-        flash.now[:notice] = 'Invitation was successfully removed.'
+        flash.now[:notice] = t('flash.generic.removed', resource: t('resources.invitation'))
         respond_to do |format|
           format.html { redirect_to @platform }
           format.turbo_stream do
@@ -64,7 +64,7 @@ def destroy # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
           end
         end
       else
-        flash.now[:error] = 'Failed to remove platform_invitation.'
+        flash.now[:error] = t('flash.generic.error_remove', resource: t('resources.invitation'))
         respond_to do |format|
           format.html { redirect_to @platform, alert: flash.now[:error] }
           format.turbo_stream do
@@ -82,7 +82,7 @@ def resend # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       authorize @platform_invitation
 
       BetterTogether::PlatformInvitationMailerJob.perform_later(@platform_invitation.id)
-      flash[:notice] = 'Invitation email has been queued for sending.'
+      flash[:notice] = t('flash.generic.queued', resource: t('resources.invitation_email'))
 
       respond_to do |format|
         format.html { redirect_to @platform, notice: flash[:notice] }