Merge branch 'main' of https://github.com/Budmin/casa into 6600_volunteer_emailsave

Author: Budmin

.github/workflows/combine_and_report.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v6
       - name: Download artifacts
         if: ${{ !cancelled() }}
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: artifacts
 

.github/workflows/docker.yml

@@ -43,7 +43,7 @@ jobs:
 
       - name: Archive selenium screenshots
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: selenium-screenshots
           path: |

.github/workflows/rspec.yml

@@ -86,7 +86,7 @@ jobs:
 
       - name: Archive selenium screenshots
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: selenium-screenshots
           path: |

Gemfile.lock

@@ -142,7 +142,7 @@ GEM
     caxlsx_rails (0.6.4)
       actionpack (>= 3.1)
       caxlsx (>= 3.0)
-    cgi (0.5.0)
+    cgi (0.5.1)
     childprocess (5.1.0)
       logger (~> 1.5)
     cliver (0.3.2)
@@ -160,7 +160,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
-    date (3.5.0)
+    date (3.5.1)
     delayed_job (4.1.13)
       activesupport (>= 3.0, < 9.0)
     delayed_job_active_record (4.1.11)
@@ -285,7 +285,7 @@ GEM
     image_processing (1.14.0)
       mini_magick (>= 4.9.5, < 6)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.1)
+    io-console (0.8.2)
     irb (1.15.3)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -334,7 +334,7 @@ GEM
       logger
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
+    minitest (5.27.0)
     multi_xml (0.7.1)
       bigdecimal (~> 3.1)
     multipart-post (2.4.1)
@@ -427,7 +427,7 @@ GEM
     pry-byebug (3.11.0)
       byebug (~> 12.0)
       pry (>= 0.13, < 0.16)
-    psych (5.2.6)
+    psych (5.3.0)
       date
       stringio
     public_suffix (7.0.0)
@@ -489,7 +489,7 @@ GEM
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.3.0)
+    rake (13.3.1)
     rdoc (6.17.0)
       erb
       psych (>= 4.0.0)
@@ -650,7 +650,7 @@ GEM
     traceroute (0.8.1)
       rails (>= 3.0.0)
     tsort (0.2.0)
-    turbo-rails (2.0.17)
+    turbo-rails (2.0.20)
       actionpack (>= 7.1.0)
       railties (>= 7.1.0)
     twilio-ruby (7.8.3)

app/controllers/users/invitations_controller.rb

@@ -0,0 +1,9 @@
+class Users::InvitationsController < Devise::InvitationsController
+  # Override the edit action to ensure the invitation_token is properly set in the form
+  def edit
+    self.resource = resource_class.new
+    set_minimum_password_length if respond_to?(:set_minimum_password_length, true)
+    resource.invitation_token = params[:invitation_token]
+    render :edit
+  end
+end

app/datatables/case_contact_datatable.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+class CaseContactDatatable < ApplicationDatatable
+  ORDERABLE_FIELDS = %w[
+    occurred_at
+    contact_made
+    medium_type
+    duration_minutes
+  ].freeze
+
+  private
+
+  def data
+    records.map do |case_contact|
+      {
+        id: case_contact.id,
+        occurred_at: I18n.l(case_contact.occurred_at, format: :full, default: nil),
+        casa_case: {
+          id: case_contact.casa_case_id,
+          case_number: case_contact.casa_case&.case_number
+        },
+        contact_types: case_contact.contact_types.map(&:name).join(", "),
+        medium_type: case_contact.medium_type&.titleize,
+        creator: {
+          id: case_contact.creator_id,
+          display_name: case_contact.creator&.display_name,
+          email: case_contact.creator&.email,
+          role: case_contact.creator&.role
+        },
+        contact_made: case_contact.contact_made,
+        duration_minutes: case_contact.duration_minutes,
+        contact_topics: case_contact.contact_topics.map(&:question).join(" | "),
+        is_draft: !case_contact.active?,
+        has_followup: case_contact.followups.requested.exists?
+      }
+    end
+  end
+
+  def filtered_records
+    raw_records.where(search_filter)
+  end
+
+  def raw_records
+    base_relation
+      .joins("INNER JOIN users creators ON creators.id = case_contacts.creator_id")
+      .left_joins(:casa_case)
+      .includes(:contact_types, :contact_topics, :followups, :creator)
+      .order(order_clause)
+      .order(:id)
+  end
+
+  def search_filter
+    return "TRUE" if search_term.blank?
+
+    ilike_fields = %w[
+      creators.display_name
+      creators.email
+      casa_cases.case_number
+      case_contacts.notes
+    ]
+
+    ilike_clauses = ilike_fields.map { |field| "#{field} ILIKE ?" }.join(" OR ")
+    contact_type_clause = "case_contacts.id IN (#{contact_type_search_subquery})"
+
+    full_clause = "#{ilike_clauses} OR #{contact_type_clause}"
+    [full_clause, ilike_fields.count.times.map { "%#{search_term}%" }].flatten
+  end
+
+  def contact_type_search_subquery
+    @contact_type_search_subquery ||= lambda {
+      return "SELECT NULL WHERE FALSE" if search_term.blank?
+
+      CaseContact
+        .select("DISTINCT case_contacts.id")
+        .joins(case_contact_contact_types: :contact_type)
+        .where("contact_types.name ILIKE ?", "%#{search_term}%")
+        .to_sql
+    }.call
+  end
+
+  def order_clause
+    @order_clause ||= build_order_clause
+  end
+end