From 5fa514818ba30975d1f9d5f90f510cd59e43962d Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Fri, 26 Nov 2021 13:23:25 -0500
Subject: [PATCH 1/7] Update Gemfile

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index af1b116..e8bd20b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'active_record-acts_as', git: 'https://github.com/camsys/active_record-acts_
 
 # To use debugger
 # gem 'debugger'
-gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :master
+gem 'transam_core', git: 'https://github.com/camsys/transam_core', branch: :qa
 gem 'mysql2', "~> 0.5.1" # lock gem for dummy app
 gem "capybara", '2.6.2' # lock gem for old capybara behavior on hidden element xpath
 gem 'sass-rails'

From 840c793b45abbc087c7d36cd6fb1d4a22a85987b Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Fri, 22 Apr 2022 09:06:35 -0400
Subject: [PATCH 2/7] TTPLAT-1955 Use ruby 2.7.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 85ebf3b..de92ac1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-- 2.5.3
+- 2.7.6
 services:
   - mysql
 branches:

From de920c10b514414dba2b5a4a695eb9e09d298338 Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Fri, 22 Apr 2022 09:06:41 -0400
Subject: [PATCH 3/7] Update schema.rb

---
 spec/dummy/db/schema.rb | 231 ++++++++++++++++++++++------------------
 1 file changed, 128 insertions(+), 103 deletions(-)

diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index 8c4db3d..9dc8e3e 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -10,9 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_04_22_165110) do
+ActiveRecord::Schema.define(version: 2021_07_14_191717) do
 
-  create_table "activities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "activities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12
     t.integer "organization_type_id"
     t.string "name", limit: 64
@@ -31,7 +31,7 @@
     t.datetime "updated_at"
   end
 
-  create_table "activity_logs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "activity_logs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "organization_id", null: false
     t.string "item_type", limit: 64, null: false
     t.integer "item_id"
@@ -42,13 +42,13 @@
     t.index ["user_id", "activity_time"], name: "activity_logs_idx2"
   end
 
-  create_table "archived_fiscal_years", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "archived_fiscal_years", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "organization_id"
     t.integer "fy_year"
     t.index ["organization_id"], name: "index_archived_fiscal_years_on_organization_id"
   end
 
-  create_table "asset_event_asset_subsystems", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_event_asset_subsystems", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "asset_event_id"
     t.integer "asset_subsystem_id"
     t.integer "parts_cost"
@@ -57,7 +57,7 @@
     t.index ["asset_subsystem_id"], name: "rehab_events_subsystems_idx2"
   end
 
-  create_table "asset_event_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_event_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "job_name", limit: 64, null: false
@@ -67,7 +67,7 @@
     t.index ["class_name"], name: "asset_event_types_idx1"
   end
 
-  create_table "asset_events", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_events", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "asset_id"
     t.string "transam_asset_type"
@@ -124,7 +124,7 @@
     t.index ["upload_id"], name: "asset_events_idx5"
   end
 
-  create_table "asset_groups", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_groups", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.string "name", limit: 64, null: false
@@ -137,7 +137,7 @@
     t.index ["organization_id"], name: "asset_groups_idx2"
   end
 
-  create_table "asset_groups_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_groups_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "asset_id"
     t.bigint "transam_asset_id"
     t.integer "asset_group_id", null: false
@@ -145,7 +145,7 @@
     t.index ["transam_asset_id"], name: "index_asset_groups_assets_on_transam_asset_id"
   end
 
-  create_table "asset_subsystems", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_subsystems", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64
     t.string "code", limit: 2
     t.string "description", limit: 254
@@ -153,7 +153,7 @@
     t.boolean "active"
   end
 
-  create_table "asset_subtypes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_subtypes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "asset_type_id", null: false
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -162,14 +162,14 @@
     t.index ["asset_type_id"], name: "asset_subtypes_idx1"
   end
 
-  create_table "asset_tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "asset_id"
     t.integer "user_id"
     t.index ["asset_id"], name: "asset_tags_idx1"
     t.index ["user_id"], name: "asset_tags_idx2"
   end
 
-  create_table "asset_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "display_icon_name", limit: 64, null: false
@@ -181,13 +181,13 @@
     t.index ["name"], name: "asset_types_idx2"
   end
 
-  create_table "asset_types_manufacturers", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "asset_types_manufacturers", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "asset_type_id"
     t.integer "manufacturer_id"
     t.index ["asset_type_id", "manufacturer_id"], name: "asset_types_manufacturers_idx1"
   end
 
-  create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.integer "asset_type_id", null: false
@@ -299,13 +299,13 @@
     t.index ["superseded_by_id"], name: "assets_idx13"
   end
 
-  create_table "audit_result_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "audit_result_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 32, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "audit_results", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "audit_results", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "audit_id", null: false
     t.integer "auditable_id", null: false
     t.string "auditable_type", limit: 64, null: false
@@ -324,7 +324,7 @@
     t.index ["filterable_type", "filterable_id"], name: "index_audit_results_on_filterable_type_and_filterable_id"
   end
 
-  create_table "audits", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "audits", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "activity_id"
     t.string "name", limit: 64, null: false
@@ -342,7 +342,7 @@
     t.index ["object_key"], name: "audit_idx1"
   end
 
-  create_table "comments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "comments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "commentable_id", null: false
     t.string "commentable_type", limit: 64, null: false
@@ -353,7 +353,7 @@
     t.index ["commentable_id", "commentable_type"], name: "comments_idx1"
   end
 
-  create_table "condition_estimation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "condition_estimation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -361,14 +361,14 @@
     t.index ["class_name"], name: "condition_estimation_types_idx1"
   end
 
-  create_table "condition_rollup_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "condition_rollup_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "class_name"
     t.string "description"
     t.boolean "active"
   end
 
-  create_table "condition_type_percents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "condition_type_percents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "asset_event_id"
     t.bigint "condition_type_id"
     t.integer "pcnt"
@@ -378,14 +378,14 @@
     t.index ["condition_type_id"], name: "index_condition_type_percents_on_condition_type_id"
   end
 
-  create_table "condition_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "condition_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.decimal "rating_ceiling", precision: 9, scale: 2, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "cost_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "cost_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -393,7 +393,7 @@
     t.index ["class_name"], name: "cost_calculation_types_idx1"
   end
 
-  create_table "customers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "customers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "license_type_id", null: false
     t.string "name", limit: 64, null: false
     t.boolean "active", null: false
@@ -401,14 +401,14 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "delayed_job_priorities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "delayed_job_priorities", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "class_name", null: false
     t.integer "priority", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "delayed_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "delayed_jobs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "priority"
     t.integer "attempts"
     t.text "handler"
@@ -423,20 +423,20 @@
     t.index ["priority", "run_at"], name: "delayed_jobs_priority"
   end
 
-  create_table "disposition_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "disposition_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "code", limit: 2, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "district_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "district_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "districts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "districts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "district_type_id"
     t.string "state"
     t.string "name", limit: 64, null: false
@@ -448,7 +448,27 @@
     t.index ["name"], name: "index_districts_on_name"
   end
 
-  create_table "documents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "document_folders", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
+    t.string "name"
+    t.text "description"
+    t.boolean "active"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "document_tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
+    t.string "name"
+    t.text "description"
+    t.string "pattern"
+    t.string "allowed_extensions"
+    t.bigint "document_folder_id"
+    t.boolean "active"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["document_folder_id"], name: "index_document_tags_on_document_folder_id"
+  end
+
+  create_table "documents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "documentable_id", null: false
     t.string "documentable_type", limit: 64, null: false
@@ -460,11 +480,12 @@
     t.integer "created_by_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.date "file_date"
     t.index ["documentable_id", "documentable_type"], name: "documents_idx2"
     t.index ["object_key"], name: "documents_idx1"
   end
 
-  create_table "dual_fuel_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "dual_fuel_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "primary_fuel_type_id"
     t.integer "secondary_fuel_type_id"
     t.boolean "active"
@@ -472,7 +493,7 @@
     t.index ["secondary_fuel_type_id"], name: "index_dual_fuel_types_on_secondary_fuel_type_id"
   end
 
-  create_table "file_content_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "file_content_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "builder_name"
@@ -482,14 +503,14 @@
     t.index ["name"], name: "file_content_types_idx1"
   end
 
-  create_table "file_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "file_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
     t.index ["name"], name: "file_status_types_idx1"
   end
 
-  create_table "forms", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "forms", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -502,20 +523,20 @@
     t.index ["object_key"], name: "forms_idx1"
   end
 
-  create_table "frequency_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "frequency_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 32, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "fuel_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "fuel_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", null: false
     t.string "code", null: false
     t.string "description", null: false
     t.boolean "active", null: false
   end
 
-  create_table "image_classifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "image_classifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "category"
     t.integer "sort_order"
@@ -524,7 +545,7 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "images", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "images", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.bigint "base_imagable_id"
     t.string "base_imagable_type"
@@ -551,19 +572,19 @@
     t.index ["object_key"], name: "images_idx1"
   end
 
-  create_table "issue_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "issue_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 32, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active"
   end
 
-  create_table "issue_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "issue_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "issues", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "issues", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "issue_type_id", null: false
     t.integer "web_browser_type_id", null: false
@@ -577,7 +598,7 @@
     t.index ["object_key"], name: "issues_idx1"
   end
 
-  create_table "keyword_search_indices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "keyword_search_indices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_class", limit: 64, null: false
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
@@ -589,7 +610,7 @@
     t.index ["object_class"], name: "keyword_search_indices_idx1"
   end
 
-  create_table "license_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "license_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "asset_manager", null: false
@@ -597,20 +618,20 @@
     t.boolean "active", null: false
   end
 
-  create_table "maintenance_provider_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "maintenance_provider_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "code", limit: 2, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "maintenance_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "maintenance_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 32, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "manufacturer_models", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "manufacturer_models", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "description"
     t.bigint "organization_id"
@@ -620,7 +641,7 @@
     t.index ["organization_id"], name: "index_manufacturer_models_on_organization_id"
   end
 
-  create_table "manufacturers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "manufacturers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "filter", limit: 32, null: false
     t.string "name", limit: 128, null: false
     t.string "code", limit: 3, null: false
@@ -628,14 +649,14 @@
     t.index ["filter"], name: "manufacturers_idx1"
   end
 
-  create_table "message_tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "message_tags", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "message_id"
     t.integer "user_id"
     t.index ["message_id"], name: "message_tags_idx1"
     t.index ["user_id"], name: "message_tags_idx2"
   end
 
-  create_table "message_templates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "message_templates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "priority_type_id"
     t.string "object_key"
     t.string "name"
@@ -653,7 +674,7 @@
     t.index ["priority_type_id"], name: "index_message_templates_on_priority_type_id"
   end
 
-  create_table "messages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "messages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.integer "user_id", null: false
@@ -675,7 +696,7 @@
     t.index ["user_id"], name: "messages_idx3"
   end
 
-  create_table "notice_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "notice_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.string "display_icon", limit: 64, null: false
@@ -683,7 +704,7 @@
     t.boolean "active"
   end
 
-  create_table "notices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "notices", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.string "subject", limit: 64, null: false
     t.string "summary", limit: 128, null: false
@@ -697,7 +718,7 @@
     t.datetime "updated_at"
   end
 
-  create_table "notifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "notifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.string "text", null: false
     t.string "link", null: false
@@ -709,14 +730,14 @@
     t.index ["notifiable_id", "notifiable_type"], name: "index_notifications_on_notifiable_id_and_notifiable_type"
   end
 
-  create_table "organization_role_mappings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "organization_role_mappings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "organization_id", null: false
     t.integer "role_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "organization_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "organization_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "display_icon_name", limit: 64, null: false
@@ -727,7 +748,7 @@
     t.index ["class_name"], name: "organization_types_idx1"
   end
 
-  create_table "organizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "organizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "organization_type_id", null: false
     t.integer "customer_id", null: false
     t.string "external_id", limit: 32
@@ -754,13 +775,16 @@
     t.datetime "updated_at", null: false
     t.string "country"
     t.string "legal_name"
+    t.integer "executive_director_id"
+    t.string "agency_office_address"
     t.index ["customer_id"], name: "organizations_idx2"
+    t.index ["executive_director_id"], name: "index_organizations_on_executive_director_id"
     t.index ["organization_type_id"], name: "organizations_idx1"
     t.index ["short_name"], name: "organizations_idx4"
     t.index ["short_name"], name: "short_name"
   end
 
-  create_table "organizations_saved_queries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "organizations_saved_queries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "saved_query_id", null: false
     t.bigint "organization_id", null: false
     t.datetime "created_at", null: false
@@ -769,14 +793,14 @@
     t.index ["saved_query_id"], name: "index_organizations_saved_queries_on_saved_query_id"
   end
 
-  create_table "organizations_saved_searches", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "organizations_saved_searches", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "organization_id"
     t.bigint "saved_search_id"
     t.index ["organization_id"], name: "index_organizations_saved_searches_on_organization_id"
     t.index ["saved_search_id"], name: "index_organizations_saved_searches_on_saved_search_id"
   end
 
-  create_table "policies", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "policies", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.integer "parent_id"
@@ -796,7 +820,7 @@
     t.index ["organization_id"], name: "policies_idx2"
   end
 
-  create_table "policy_asset_subtype_rules", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "policy_asset_subtype_rules", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "policy_id", null: false
     t.integer "asset_subtype_id", null: false
     t.integer "fuel_type_id"
@@ -829,7 +853,7 @@
     t.index ["policy_id"], name: "policy_asset_subtype_rules_idx1"
   end
 
-  create_table "policy_asset_type_rules", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "policy_asset_type_rules", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "policy_id", null: false
     t.integer "asset_type_id", null: false
     t.integer "service_life_calculation_type_id", null: false
@@ -844,21 +868,21 @@
     t.index ["policy_id"], name: "policy_asset_type_rules_idx1"
   end
 
-  create_table "priority_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "priority_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "is_default", null: false
     t.boolean "active", null: false
   end
 
-  create_table "query_asset_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_asset_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "table_name"
     t.text "transam_assets_join"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "query_association_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_association_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "table_name"
     t.string "display_field_name"
     t.string "id_field_name", default: "id"
@@ -866,13 +890,13 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "query_categories", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_categories", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "query_field_asset_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_field_asset_classes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "query_field_id"
     t.bigint "query_asset_class_id"
     t.datetime "created_at", null: false
@@ -881,7 +905,7 @@
     t.index ["query_field_id"], name: "index_query_field_asset_classes_on_query_field_id"
   end
 
-  create_table "query_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "label"
     t.datetime "created_at", null: false
@@ -899,7 +923,7 @@
     t.index ["query_category_id"], name: "index_query_fields_on_query_category_id"
   end
 
-  create_table "query_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "query_field_id"
     t.text "value"
     t.datetime "created_at", null: false
@@ -910,7 +934,7 @@
     t.index ["saved_query_id"], name: "index_query_filters_on_saved_query_id"
   end
 
-  create_table "query_params", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "query_params", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "description"
     t.text "query_string"
@@ -918,20 +942,20 @@
     t.boolean "active"
   end
 
-  create_table "replacement_reason_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "replacement_reason_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active"
   end
 
-  create_table "report_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "report_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.string "display_icon_name", limit: 64, null: false
     t.boolean "active", null: false
   end
 
-  create_table "reports", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "reports", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "report_type_id", null: false
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -949,14 +973,14 @@
     t.index ["report_type_id"], name: "reports_idx1"
   end
 
-  create_table "role_privilege_mappings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "role_privilege_mappings", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "role_id"
     t.bigint "privilege_id"
     t.index ["privilege_id"], name: "index_role_privilege_mappings_on_privilege_id"
     t.index ["role_id"], name: "index_role_privilege_mappings_on_role_id"
   end
 
-  create_table "roles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "roles", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.integer "weight"
     t.integer "resource_id"
@@ -971,7 +995,7 @@
     t.index ["resource_id"], name: "roles_idx2"
   end
 
-  create_table "rule_sets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "rule_sets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key"
     t.string "name"
     t.string "class_name"
@@ -979,7 +1003,7 @@
     t.boolean "active"
   end
 
-  create_table "saved_queries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "saved_queries", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key"
     t.string "name"
     t.string "description"
@@ -991,7 +1015,7 @@
     t.text "ordered_output_field_ids"
   end
 
-  create_table "saved_query_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "saved_query_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.bigint "saved_query_id"
     t.bigint "query_field_id"
     t.datetime "created_at", null: false
@@ -1000,7 +1024,7 @@
     t.index ["saved_query_id"], name: "index_saved_query_fields_on_saved_query_id"
   end
 
-  create_table "saved_searches", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "saved_searches", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "user_id", null: false
     t.string "name", limit: 64, null: false
@@ -1013,20 +1037,20 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "search_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "search_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name"
     t.string "class_name"
     t.boolean "active"
   end
 
-  create_table "serial_numbers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "serial_numbers", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "identifiable_type"
     t.bigint "identifiable_id"
     t.string "identification"
     t.index ["identifiable_type", "identifiable_id"], name: "index_serial_numbers_on_identifiable_type_and_identifiable_id"
   end
 
-  create_table "service_life_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "service_life_calculation_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "class_name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -1034,14 +1058,14 @@
     t.index ["class_name"], name: "service_life_calculation_types_idx1"
   end
 
-  create_table "service_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "service_status_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "code", limit: 1, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "system_config_extensions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "system_config_extensions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "class_name"
     t.string "extension_name"
     t.string "engine_name"
@@ -1050,7 +1074,7 @@
     t.datetime "updated_at", null: false
   end
 
-  create_table "system_config_field_customizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "system_config_field_customizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "table_name"
     t.string "field_name"
     t.string "description"
@@ -1064,7 +1088,7 @@
     t.string "action_name"
   end
 
-  create_table "system_configs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "system_configs", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "customer_id"
     t.string "start_of_fiscal_year", limit: 5
     t.integer "fy_year"
@@ -1089,7 +1113,7 @@
     t.datetime "updated_at"
   end
 
-  create_table "tasks", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "tasks", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "taskable_id"
     t.string "taskable_type"
@@ -1112,7 +1136,7 @@
     t.index ["user_id"], name: "tasks_idx2"
   end
 
-  create_table "transam_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "transam_assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "transam_assetible_type"
     t.bigint "transam_assetible_id"
     t.string "object_key", limit: 12, null: false
@@ -1156,7 +1180,7 @@
     t.index ["vendor_id"], name: "index_transam_assets_on_vendor_id"
   end
 
-  create_table "uploads", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "uploads", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id"
     t.integer "user_id", null: false
@@ -1182,7 +1206,7 @@
     t.index ["user_id"], name: "uploads_idx3"
   end
 
-  create_table "user_notifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "user_notifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "notification_id", null: false
     t.datetime "opened_at"
@@ -1192,7 +1216,7 @@
     t.index ["user_id"], name: "index_user_notifications_on_user_id"
   end
 
-  create_table "user_organization_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "user_organization_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
@@ -1208,13 +1232,13 @@
     t.index ["object_key"], name: "user_organization_filters_idx1"
   end
 
-  create_table "user_organization_filters_organizations", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "user_organization_filters_organizations", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_organization_filter_id", null: false
     t.integer "organization_id", null: false
     t.index ["user_organization_filter_id", "organization_id"], name: "user_organization_filters_idx1"
   end
 
-  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.string "external_id", limit: 32
@@ -1251,19 +1275,20 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "authentication_token", limit: 30
+    t.text "table_prefs"
     t.index ["authentication_token"], name: "index_users_on_authentication_token", unique: true
     t.index ["email"], name: "users_idx3"
     t.index ["object_key"], name: "users_idx1"
     t.index ["organization_id"], name: "users_idx2"
   end
 
-  create_table "users_organizations", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users_organizations", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_id"
     t.integer "organization_id"
     t.index ["user_id", "organization_id"], name: "users_organizations_idx2"
   end
 
-  create_table "users_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "role_id", null: false
     t.integer "granted_by_user_id"
@@ -1277,19 +1302,19 @@
     t.index ["user_id", "role_id"], name: "users_roles_idx2"
   end
 
-  create_table "users_user_organization_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users_user_organization_filters", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "user_organization_filter_id", null: false
     t.index ["user_id"], name: "users_user_organization_filters_idx1"
     t.index ["user_organization_filter_id"], name: "users_user_organization_filters_idx2"
   end
 
-  create_table "users_viewable_organizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users_viewable_organizations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "user_id"
     t.integer "organization_id"
   end
 
-  create_table "vendors", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "vendors", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "organization_id", null: false
     t.string "name", limit: 64, null: false
@@ -1312,7 +1337,7 @@
     t.index ["organization_id"], name: "vendors_idx3"
   end
 
-  create_table "version_associations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "version_associations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.integer "version_id"
     t.string "foreign_key_name", null: false
     t.integer "foreign_key_id"
@@ -1321,7 +1346,7 @@
     t.index ["version_id"], name: "index_version_associations_on_version_id"
   end
 
-  create_table "versions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "versions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "item_type", null: false
     t.integer "item_id", null: false
     t.string "event", null: false
@@ -1333,7 +1358,7 @@
     t.index ["transaction_id"], name: "index_versions_on_transaction_id"
   end
 
-  create_table "weather_codes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "weather_codes", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "state", limit: 2
     t.string "code", limit: 8
     t.string "city", limit: 64
@@ -1341,13 +1366,13 @@
     t.index ["state", "city"], name: "weather_codes_idx"
   end
 
-  create_table "web_browser_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "web_browser_types", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "name", limit: 64, null: false
     t.string "description", limit: 254, null: false
     t.boolean "active", null: false
   end
 
-  create_table "workflow_events", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "workflow_events", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb3", force: :cascade do |t|
     t.string "object_key", limit: 12, null: false
     t.integer "accountable_id", null: false
     t.string "accountable_type", limit: 64, null: false

From dd9e6332eac3b500e3c6ab7d83a98336ee548afb Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Fri, 22 Apr 2022 09:15:49 -0400
Subject: [PATCH 4/7] Add AWS_REGION

---
 spec/dummy/config/environments/test.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
index d84fa29..4ca5030 100644
--- a/spec/dummy/config/environments/test.rb
+++ b/spec/dummy/config/environments/test.rb
@@ -38,4 +38,7 @@
   ENV["SYSTEM_SEND_FROM_ADDRESS"] = "donotreply@camsys-apps.com"
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Required for aws-sdk-core
+  ENV["AWS_REGION"] = "us-east-1"
 end

From 0d2b9da35e045b9ce1755af5d7a2a9ddb825597d Mon Sep 17 00:00:00 2001
From: aandrade <aandrade@camsys.com>
Date: Fri, 22 Dec 2023 15:28:43 -0500
Subject: [PATCH 5/7] [TTPLAT-2287] Update labels for audit fields

---
 app/jobs/audit_update_job.rb                    | 2 +-
 app/views/audits/_audit_activity_form.html.haml | 4 ++--
 app/views/audits/_form.html.haml                | 4 ++--
 app/views/audits/_summary.html.haml             | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/jobs/audit_update_job.rb b/app/jobs/audit_update_job.rb
index 8031c6b..bb346c0 100644
--- a/app/jobs/audit_update_job.rb
+++ b/app/jobs/audit_update_job.rb
@@ -15,7 +15,7 @@ def run
     audit.auditor.audit
 
     event_url = Rails.application.routes.url_helpers.audit_results_path
-    audit_notification = Notification.create(text: "#{audit.name} has been run with new Data Update Start Date and End Date.", link: event_url)
+    audit_notification = Notification.create(text: "#{audit.name} has been run with new Date of Report Range Start Date and Date of Report Range End Date.", link: event_url)
     UserNotification.create(user: creator, notification: audit_notification)
 
   end
diff --git a/app/views/audits/_audit_activity_form.html.haml b/app/views/audits/_audit_activity_form.html.haml
index c964778..9cbd8bb 100644
--- a/app/views/audits/_audit_activity_form.html.haml
+++ b/app/views/audits/_audit_activity_form.html.haml
@@ -4,13 +4,13 @@
     .row
       .col-sm-3
         = hidden_field_tag(:old_activity_start_date, format_as_date(i_f.object.start_date))
-        = i_f.input :start_date, :label => 'Audit Activity Start Date', :wrapper => :vertical_append do
+        = i_f.input :start_date, :label => 'CPT Audit Process Activity Start Date', :wrapper => :vertical_append do
           = i_f.input_field :start_date, :class => "form-control datepicker", :as => :string, :data => {'date-container' => '#page'}, :value => format_as_date(i_f.object.start_date)
           %span.input-group-addon
             %i.fa.fa-calendar
       .col-sm-3
         = hidden_field_tag(:old_activity_end_date, format_as_date(i_f.object.end_date))
-        = i_f.input :end_date, :label => 'Audit Activity End Date', :wrapper => :vertical_append do
+        = i_f.input :end_date, :label => 'CPT Audit Process Activity End Date', :wrapper => :vertical_append do
           = i_f.input_field :end_date, :class => "form-control datepicker", :as => :string, :data => {'date-container' => '#page'}, :value => format_as_date(i_f.object.end_date)
           %span.input-group-addon
             %i.fa.fa-calendar
diff --git a/app/views/audits/_form.html.haml b/app/views/audits/_form.html.haml
index b0a525d..d5d8016 100644
--- a/app/views/audits/_form.html.haml
+++ b/app/views/audits/_form.html.haml
@@ -33,13 +33,13 @@
   .row
     .col-sm-4
       = hidden_field_tag(:old_start_date, format_as_date(f.object.start_date))
-      = f.input :start_date, :wrapper => :vertical_append, :label => "Data Update Start Date" do
+      = f.input :start_date, :wrapper => :vertical_append, :label => "Date of Report Range Start Date" do
         = f.input_field :start_date, :as => :string, :class => 'form-control datepicker', :data => {'date-container' => '#page'}, :value => format_as_date(f.object.start_date)
         %span.input-group-addon
           %i.fa.fa-calendar
     .col-sm-4
       = hidden_field_tag(:old_end_date, format_as_date(f.object.end_date))
-      = f.input :end_date, :wrapper => :vertical_append, :label => "Data Update End Date" do
+      = f.input :end_date, :wrapper => :vertical_append, :label => "Date of Report Range End Date" do
         = f.input_field :end_date, :as => :string, :class => 'form-control datepicker', :data => {'date-container' => '#page'}, :value => format_as_date(f.object.end_date)
         %span.input-group-addon
           %i.fa.fa-calendar
diff --git a/app/views/audits/_summary.html.haml b/app/views/audits/_summary.html.haml
index 3266c37..c5d0d69 100644
--- a/app/views/audits/_summary.html.haml
+++ b/app/views/audits/_summary.html.haml
@@ -4,12 +4,12 @@
   = format_field("Auditor", audit.auditor_class_name)
   %hr
   = format_field("Active", format_as_boolean(audit.active))
-  = format_field("Data Update Start Date", format_as_date(audit.start_date))
-  = format_field("Data Update End Date", format_as_date(audit.end_date))
+  = format_field("Date of Report Range Start Date", format_as_date(audit.start_date))
+  = format_field("Date of Report Range End Date", format_as_date(audit.end_date))
   %hr
   = format_field("Operational", format_as_boolean(audit.operational?))
-  = format_field("Audit Activity Start Date", format_as_date(audit.activity.start_date))
-  = format_field("Audit Activity End Date", format_as_date(audit.activity.end_date))
+  = format_field("CPT Audit Process Activity Start Date", format_as_date(audit.activity.start_date))
+  = format_field("CPT Audit Process Activity End Date", format_as_date(audit.activity.end_date))
   %hr
   = format_field("Last Run", format_as_date(audit.last_run))
   = format_field("Created On", format_as_date(audit.created_at))

From af30ced3b6811d333a530d857e7ad3b356652bdb Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Sun, 7 Jan 2024 12:59:01 -0500
Subject: [PATCH 6/7] Bump version

---
 lib/transam_audit/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/transam_audit/version.rb b/lib/transam_audit/version.rb
index ee55392..885aace 100644
--- a/lib/transam_audit/version.rb
+++ b/lib/transam_audit/version.rb
@@ -1,3 +1,3 @@
 module TransamAudit
-  VERSION = "2.17.0-rc"
+  VERSION = "2.38.0-rc"
 end

From a9b2c77644263f9132f53683fc031dec140c7366 Mon Sep 17 00:00:00 2001
From: "W. Scott Meeks" <smeeks@camsys.com>
Date: Sun, 21 Jan 2024 16:47:49 -0500
Subject: [PATCH 7/7] Update version.rb

---
 lib/transam_audit/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/transam_audit/version.rb b/lib/transam_audit/version.rb
index 885aace..0779704 100644
--- a/lib/transam_audit/version.rb
+++ b/lib/transam_audit/version.rb
@@ -1,3 +1,3 @@
 module TransamAudit
-  VERSION = "2.38.0-rc"
+  VERSION = "2.38.0"
 end