Merge branch 'main' into 5150-switch-pagination-order

Author: neenu-chacko

app/controllers/admin/organizations_controller.rb

@@ -86,7 +86,7 @@ def destroy
 
   def organization_params
     params.require(:organization)
-          .permit(:name, :short_name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day,
+          .permit(:name, :street, :city, :state, :zipcode, :email, :url, :logo, :intake_location, :default_email_text, :account_request_id, :reminder_day, :deadline_day,
                   users_attributes: %i(name email organization_admin), account_request_attributes: %i(ndbn_member_id id))
   end
 

app/controllers/application_controller.rb

@@ -30,7 +30,7 @@ def current_organization
     elsif current_role.resource.is_a?(Organization)
       current_role.resource
     else
-      Organization.find_by(short_name: params[:organization_name])
+      Organization.find_by(id: params[:organization_id])
     end
   end
   helper_method :current_organization

app/controllers/historical_trends/base_controller.rb

@@ -1,5 +1,5 @@
 class HistoricalTrends::BaseController < ApplicationController
   def cached_series(type)
-    Rails.cache.fetch("#{current_organization.short_name}-historical-#{type}-data") { HistoricalTrendService.new(current_organization.id, type).series }
+    Rails.cache.fetch("#{current_organization.id}-historical-#{type}-data") { HistoricalTrendService.new(current_organization.id, type).series }
   end
 end

app/controllers/organizations_controller.rb

@@ -92,7 +92,7 @@ def organization_params
     request_type_formatter(params)
 
     params.require(:organization).permit(
-      :name, :short_name, :street, :city, :state,
+      :name, :street, :city, :state,
       :zipcode, :email, :url, :logo, :intake_location,
       :default_storage_location, :default_email_text, :reminder_email_text,
       :invitation_text, :reminder_day, :deadline_day,

app/jobs/historical_data_cache_job.rb

@@ -2,7 +2,7 @@ class HistoricalDataCacheJob < ApplicationJob
   def perform(org_id:, type:)
     organization = Organization.find_by(id: org_id)
 
-    Rails.cache.write("#{organization.short_name}-historical-#{type}-data", HistoricalTrendService.new(organization.id, type).series)
+    Rails.cache.write("#{organization.id}-historical-#{type}-data", HistoricalTrendService.new(organization.id, type).series)
   end
 
   def queue_name = "low_priority"

app/models/organization.rb

@@ -44,8 +44,10 @@ class Organization < ApplicationRecord
 
   include Deadlinable
 
+  # TODO: remove once migration "20250504183911_remove_short_name_from_organizations" has run in production
+  self.ignored_columns += ["short_name"]
+
   validates :name, presence: true
-  validates :short_name, presence: true, format: /\A[a-z0-9_]+\z/i, uniqueness: true
   validates :url, format: { with: URI::DEFAULT_PARSER.make_regexp, message: "it should look like 'http://www.example.com'" }, allow_blank: true
   validates :email, format: { with: URI::MailTo::EMAIL_REGEXP }, allow_blank: true
   validate :correct_logo_mime_type
@@ -149,11 +151,6 @@ def assign_attributes_from_account_request(account_request)
     self
   end
 
-  # NOTE: when finding Organizations, use Organization.find_by(short_name: params[:organization_name])
-  def to_param
-    short_name
-  end
-
   def ordered_requests
     requests.order(status: :asc, updated_at: :desc)
   end

app/services/distribution_service.rb

@@ -10,10 +10,10 @@ def perform_distribution_service(&block)
     set_error(e)
   rescue Errors::InsufficientAllotment => e
     distribution.line_items.assign_insufficiency_errors(e.insufficient_items)
-    Rails.logger.error "[!] #{self.class.name} failed because of Insufficient Allotment #{distribution_organization.short_name}: #{distribution.errors.full_messages} [#{e.message}]"
+    Rails.logger.error "[!] #{self.class.name} failed because of Insufficient Allotment #{distribution_organization.name}: #{distribution.errors.full_messages} [#{e.message}]"
     set_error(e)
   rescue StandardError => e
-    Rails.logger.error "[!] #{self.class.name} failed for #{distribution_organization.short_name}: #{distribution.errors.full_messages} [#{e.inspect}]"
+    Rails.logger.error "[!] #{self.class.name} failed for #{distribution_organization.name}: #{distribution.errors.full_messages} [#{e.inspect}]"
     set_error(e)
   ensure
     return self

app/views/admin/organizations/_list.html.erb

@@ -12,7 +12,7 @@
 
     <tbody>
       <% @organizations.each do |organization| %>
-        <tr class="<%= organization.short_name %>">
+        <tr>
           <td><%= organization.name %></td>
           <td><%= link_to organization.email, "mailto:#{organization.email}" %></td>
           <td class="date"><%= organization.created_at.strftime("%F") %></td>

app/views/admin/organizations/_organization_row.html.erb

@@ -1,4 +1,4 @@
-<tr class="<%= organization_row.short_name %>">
+<tr>
   <td><%= organization_row.name %></td>
   <td><%= link_to organization_row.email, "mailto:#{organization_row.email}" %></td>
   <td class="date"><%= organization_row.created_at.strftime("%F") %></td>

app/views/admin/organizations/edit.html.erb

@@ -42,14 +42,6 @@
                   <span class="input-group-text"><i class="fa fa-user"></i></span>
                   <%= f.input_field :name, class: "form-control" %>
                 <% end %>
-                <%= f.input :short_name, required: true, autofocus: true, wrapper: :input_group do %>
-                  <span class="input-group-text"><i class="fa fa-desktop"></i></span>
-                  <%= f.input_field :short_name, class: "form-control" %>
-                <% end %>
-                <div>
-                  APPROACH with EXTREME CAUTION! Editing the short name will break bookmarked links and calendar notices! If a
-                  bank has asked you to do this, explain this to them first.
-                </div>
                 <%= f.input :url, as: :url, placeholder: "http://www.example.com", wrapper: :input_group do %>
                   <span class="input-group-text"><i class="fa fa-link"></i></span>
                   <%= f.input_field :url, class: "form-control" %>