Merge branch 'main' into 4241-change-agency-type-to-enum

Benjamin-Couey · web-flow · commit 723d43d0f1ec · 2025-01-23T09:07:32.000-07:00
diff --git a/Gemfile b/Gemfile
@@ -37,6 +37,8 @@ gem "rolify", "~> 6.0"
 gem "strong_migrations", "1.8.0"
 # used in events
 gem 'dry-struct'
+# Use solid_cache as a cache store
+gem "solid_cache", "~> 1.0"
 
 ##### JAVSCRIPT/CSS/ASSETS #######
 
@@ -111,11 +113,6 @@ gem "nokogiri", ">= 1.10.4"
 gem "image_processing"
 gem "sprockets", "~> 4.2.1"
 
-group :production do
-  # Tool to detect unused code through knowing which methods are used in which files.
-  gem 'coverband'
-end
-
 group :production, :staging do
   # Reduce the noise of logs and include custom fields to it for easier access
   gem 'lograge'
@@ -218,7 +215,4 @@ if %w(mingw mswin x64_mingw jruby).include?(RUBY_PLATFORM)
   gem "tzinfo-data", "~> 1.2", platforms: %i(mingw mswin x64_mingw jruby)
 end
 
-# Use Redis for Action Cable
-gem "redis", "~> 5.3"
-
 gem "importmap-rails", "~> 2.1"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -143,8 +143,6 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
-    coverband (6.1.2)
-      redis (>= 3.0)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -551,10 +549,6 @@ GEM
     rdoc (6.10.0)
       psych (>= 4.0.0)
     recaptcha (5.17.0)
-    redis (5.3.0)
-      redis-client (>= 0.22.0)
-    redis-client (0.22.2)
-      connection_pool
     regexp_parser (2.9.3)
     reline (0.6.0)
       io-console (~> 0.5)
@@ -652,6 +646,10 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
+    solid_cache (1.0.6)
+      activejob (>= 7.2)
+      activerecord (>= 7.2)
+      railties (>= 7.2)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -743,7 +741,6 @@ DEPENDENCIES
   capybara (~> 3.40)
   capybara-screenshot
   clockwork
-  coverband
   cuprite
   database_cleaner-active_record (~> 2.2)
   debug (>= 1.0.0)
@@ -798,7 +795,6 @@ DEPENDENCIES
   rails-controller-testing
   rails-erd
   recaptcha
-  redis (~> 5.3)
   rolify (~> 6.0)
   rspec-rails (~> 7.1.0)
   rubocop
@@ -808,6 +804,7 @@ DEPENDENCIES
   shoulda-matchers (~> 6.2)
   simple_form
   simplecov
+  solid_cache (~> 1.0)
   sprockets (~> 4.2.1)
   standard (~> 1.40)
   standard-performance
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
@@ -98,7 +98,7 @@ def organization_params
       :enable_individual_requests, :enable_quantity_based_requests,
       :ytd_on_distribution_printout, :one_step_partner_invite,
       :hide_value_columns_on_receipt, :hide_package_column_on_receipt,
-      :signature_for_distribution_pdf,
+      :signature_for_distribution_pdf, :receive_email_on_requests,
       partner_form_fields: [],
       request_unit_names: []
     )
diff --git a/app/mailers/requests_confirmation_mailer.rb b/app/mailers/requests_confirmation_mailer.rb
@@ -4,7 +4,16 @@ def confirmation_email(request)
     @partner = request.partner
     @request_items = fetch_items(request)
     requestee_email = request.user_email
-    mail(to: requestee_email, cc: @partner.email, subject: "#{@organization.name} - Requests Confirmation")
+    # If the requestee organization has opted in to receiving an email when a
+    # request is made, CC them
+    cc = [@partner.email]
+    if @organization.receive_email_on_requests
+      cc.push(@organization.email)
+    end
+    cc.flatten!
+    cc.compact!
+    cc.uniq!
+    mail(to: requestee_email, cc: cc, subject: "#{@organization.name} - Requests Confirmation")
   end
 
   private
diff --git a/app/models/organization.rb b/app/models/organization.rb
@@ -20,6 +20,7 @@
 #  name                           :string
 #  one_step_partner_invite        :boolean          default(FALSE), not null
 #  partner_form_fields            :text             default([]), is an Array
+#  receive_email_on_requests      :boolean          default(FALSE), not null
 #  reminder_day                   :integer
 #  repackage_essentials           :boolean          default(FALSE), not null
 #  short_name                     :string
@@ -62,6 +63,8 @@ class Organization < ApplicationRecord
     has_many :product_drives
     has_many :donation_sites
     has_many :donations
+    has_many :items
+    has_many :item_categories
     has_many :manufacturers
     has_many :partners
     has_many :partner_groups
@@ -76,29 +79,6 @@ class Organization < ApplicationRecord
     has_many :request_units, class_name: 'Unit'
   end
 
-  has_many :items, dependent: :destroy do
-    def other
-      where(partner_key: "other")
-    end
-
-    def during(date_start, date_end = Time.zone.now.strftime("%Y-%m-%d"))
-      select("COUNT(line_items.id) as amount, name")
-        .joins(:line_items)
-        .where("line_items.created_at BETWEEN ? and ?", date_start, date_end)
-        .group(:name)
-    end
-
-    def top(limit = 5)
-      order('count(line_items.id) DESC')
-        .limit(limit)
-    end
-
-    def bottom(limit = 5)
-      order('count(line_items.id) ASC')
-        .limit(limit)
-    end
-  end
-  has_many :item_categories, dependent: :destroy
   has_many :barcode_items, dependent: :destroy do
     def all
       unscope(where: :organization_id).where("barcode_items.organization_id = ? OR barcode_items.barcodeable_type = ?", proxy_association.owner.id, "BaseItem")
@@ -170,10 +150,6 @@ def to_param
     short_name
   end
 
-  def display_users
-    users.map(&:email).join(", ")
-  end
-
   def ordered_requests
     requests.order(status: :asc, updated_at: :desc)
   end
@@ -188,14 +164,6 @@ def address_changed?
     street_changed? || city_changed? || state_changed? || zipcode_changed?
   end
 
-  def address_inline
-    address.split("\n").map(&:strip).join(", ")
-  end
-
-  def total_inventory
-    View::Inventory.total_inventory(id)
-  end
-
   def self.seed_items(organization = Organization.all)
     base_items = BaseItem.without_kit.map(&:to_h)
 
@@ -239,10 +207,6 @@ def item_id_to_display_string_map
     end
   end
 
-  def valid_items_for_select
-    valid_items.map { |item| [item[:name], item[:id]] }.sort
-  end
-
   def from_email
     return get_admin_email if email.blank?
 
diff --git a/app/views/layouts/_lte_admin_sidebar.html.erb b/app/views/layouts/_lte_admin_sidebar.html.erb
@@ -130,13 +130,4 @@
     <% end %>
   </li>
 
-  <% if Rails.env.production? %>
-    <li class="nav-item">
-      <%= link_to("/coverage", class: "nav-link") do %>
-        <i class="nav-icon fa-solid fa-chart-bar"></i>
-        <p>Coverband</p>
-      <% end %>
-    </li>
-  <% end %>
-
 </ul>
diff --git a/app/views/organizations/_details.html.erb b/app/views/organizations/_details.html.erb
@@ -194,6 +194,12 @@
                   <%= humanize_boolean(@organization.hide_package_column_on_receipt) %>
                 </p>
               </div>
+              <div class="mb-4">
+                <h3 class='font-bold'>Receive email when partner makes a request:</h3>
+                <p>
+                  <%= humanize_boolean(@organization.receive_email_on_requests) %>
+                </p>
+              </div>
               <% if @organization.logo.attached? %>
                     <div class="mb-4">
                     <h3 class='font-bold'>Logo</h3>
diff --git a/app/views/organizations/edit.html.erb b/app/views/organizations/edit.html.erb
@@ -131,6 +131,7 @@
                 <%= f.input :one_step_partner_invite, label: 'Use One Step Invite and Approve partner process?', as: :radio_buttons, collection: [[true, 'Yes'], [false, 'No']], label_method: :second, value_method: :first %>
                 <%= f.input :hide_value_columns_on_receipt, label: 'Hide both value columns on distribution receipts?', as: :radio_buttons, collection: [[true, 'Yes'], [false, 'No']], label_method: :second, value_method: :first %>
                 <%= f.input :hide_package_column_on_receipt, label: 'Hide the package column on distribution receipts?', as: :radio_buttons, collection: [[true, 'Yes'], [false, 'No']], label_method: :second, value_method: :first %>
+                <%= f.input :receive_email_on_requests, label: 'Receive email when partner makes a request?', as: :radio_buttons, collection: [[true, 'Yes'], [false, 'No']], label_method: :second, value_method: :first %>
 
                 <% default_email_text_hint = "You can use the variables <code>%{partner_name}</code>, <code>%{delivery_method}</code>, <code>%{distribution_date}</code>, and <code>%{comment}</code> to include the partner's name, delivery method, distribution date, and comments sent in the request." %>
                 <%= f.input :default_email_text, label: "Distribution Email Content", hint: default_email_text_hint.html_safe do %>
diff --git a/config/cable.yml b/config/cable.yml
@@ -1,6 +1,5 @@
 development:
-  adapter: redis
-  url: redis://localhost:6379/1
+  adapter: async
 
 test:
   adapter: async
diff --git a/config/cache.yml b/config/cache.yml
@@ -0,0 +1,16 @@
+default: &default
+  store_options:
+    # Cap age of oldest cache entry to fulfill retention policies
+    max_age: <%= 14.days.to_i %>
+    max_size: <%= 256.megabytes %>
+    namespace: <%= Rails.env %>
+
+development:
+  <<: *default
+
+test:
+  <<: *default
+
+production:
+  database: cache
+  <<: *default
diff --git a/config/coverband.rb b/config/coverband.rb
diff --git a/config/database.yml b/config/database.yml
@@ -28,12 +28,21 @@ test:
 # These env vars live in Cloud66 application settings. Don't change
 # the names of the vars we're looking for without ensuring you've
 # updated/duplicated the vars there!
+#
+# Solid Cache is only configured for production, where it uses
+# the primary database.
 production:
-  adapter: postgresql
-  encoding: unicode
-  host: <%= ENV["DIAPER_DB_HOST"] %>
-  pool: 20
-  username: <%= ENV["DIAPER_DB_USERNAME"] %>
-  password: <%= ENV["DIAPER_DB_PASSWORD"] %>
-  database: <%= ENV["DIAPER_DB_DATABASE"] %>
-  timeout: 5000
+  primary: &primary_production
+    <<: *default
+    adapter: postgresql
+    encoding: unicode
+    host: <%= ENV["DIAPER_DB_HOST"] %>
+    pool: 20
+    username: <%= ENV["DIAPER_DB_USERNAME"] %>
+    password: <%= ENV["DIAPER_DB_PASSWORD"] %>
+    database: <%= ENV["DIAPER_DB_DATABASE"] %>
+    timeout: 5000
+  cache:
+    <<: *primary_production
+    migrations_paths: db/cache_migrate
+
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -61,7 +61,7 @@
   config.log_level = :info
 
   # Use a different cache store in production.
-  config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'] }
+  config.cache_store = :solid_cache_store
 
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
diff --git a/config/routes.rb b/config/routes.rb
@@ -14,12 +14,6 @@ def set_up_flipper
     omniauth_callbacks: 'users/omniauth_callbacks'
   }
 
-  if Rails.env.production?
-    authenticate :user, lambda { |u| u.has_role?(Role::SUPER_ADMIN) } do
-      mount Coverband::Reporters::Web.new, at: '/coverage'
-    end
-  end
-
   #
   # Mount web interface to see delayed job status and queue length.
   # Visible only to logged in users with the `super_admin` role
diff --git a/db/cache_migrate/20250121104407_create_production_cache_table.rb b/db/cache_migrate/20250121104407_create_production_cache_table.rb
@@ -0,0 +1,16 @@
+class CreateProductionCacheTable < ActiveRecord::Migration[7.2]
+  def change
+    safety_assured do
+      create_table "solid_cache_entries", force: :cascade do |t|
+        t.binary "key", limit: 1024, null: false
+        t.binary "value", limit: 536870912, null: false
+        t.datetime "created_at", null: false
+        t.integer "key_hash", limit: 8, null: false
+        t.integer "byte_size", limit: 4, null: false
+        t.index ["byte_size"], name: "index_solid_cache_entries_on_byte_size"
+        t.index ["key_hash", "byte_size"], name: "index_solid_cache_entries_on_key_hash_and_byte_size"
+        t.index ["key_hash"], name: "index_solid_cache_entries_on_key_hash", unique: true
+      end
+    end
+  end
+end
diff --git a/db/migrate/20241218140400_add_receive_email_on_request.rb b/db/migrate/20241218140400_add_receive_email_on_request.rb
@@ -0,0 +1,7 @@
+class AddReceiveEmailOnRequest < ActiveRecord::Migration[7.2]
+  def change
+    safety_assured do
+      add_column :organizations, :receive_email_on_requests, :boolean, default: false, null: false
+    end
+  end
+end
diff --git a/db/migrate/20250121200831_fix_for20250120_request_problem.rb b/db/migrate/20250121200831_fix_for20250120_request_problem.rb
@@ -0,0 +1,10 @@
+class FixFor20250120RequestProblem < ActiveRecord::Migration[7.2]
+  def up
+    # Merely marking request 44040 fulfilled.
+    # It already has a distribution associated with it, so we don't have to fix that
+    return unless Rails.env.production?
+    request = Request.find("44040")
+    request.status = 2
+    request.save!
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -492,6 +492,7 @@
     t.boolean "hide_value_columns_on_receipt", default: false
     t.boolean "hide_package_column_on_receipt", default: false
     t.boolean "signature_for_distribution_pdf", default: false
+    t.boolean "receive_email_on_requests", default: false, null: false
     t.index ["latitude", "longitude"], name: "index_organizations_on_latitude_and_longitude"
     t.index ["short_name"], name: "index_organizations_on_short_name"
   end
diff --git a/docs/user_guide/bank/getting_started_customization.md b/docs/user_guide/bank/getting_started_customization.md
diff --git a/spec/factories/organizations.rb b/spec/factories/organizations.rb
diff --git a/spec/mailers/requests_confirmation_mailer_spec.rb b/spec/mailers/requests_confirmation_mailer_spec.rb
diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb
diff --git a/spec/requests/organization_requests_spec.rb b/spec/requests/organization_requests_spec.rb
diff --git a/spec/system/admin/organizations_system_spec.rb b/spec/system/admin/organizations_system_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def organization_params`
`98`	`98`	`:enable_individual_requests, :enable_quantity_based_requests,`
`99`	`99`	`:ytd_on_distribution_printout, :one_step_partner_invite,`
`100`	`100`	`:hide_value_columns_on_receipt, :hide_package_column_on_receipt,`
`101`		`- :signature_for_distribution_pdf,`
	`101`	`+ :signature_for_distribution_pdf, :receive_email_on_requests,`
`102`	`102`	`partner_form_fields: [],`
`103`	`103`	`request_unit_names: []`
`104`	`104`	`)`