diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..053c12b2
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: CI
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ master, main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_USERNAME: root
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: aml_dummy_test
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Ruby 3.2
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.2'
+        bundler-cache: true
+        cache-version: 1
+
+    - name: Install dependencies
+      run: |
+        gem install bundler
+        bundle config set --local without 'production'
+        bundle install --jobs 4 --retry 3
+
+    - name: Set up test database
+      env:
+        MYSQL_USERNAME: root
+        MYSQL_PASSWORD: password
+        MYSQL_DATABASE: aml_dummy_test
+        RAILS_ENV: test
+      run: |
+        bundle exec rake db:migrate
+
+    - name: Run tests
+      run: |
+        bundle exec rspec spec --format progress
+      env:
+        RAILS_ENV: test
+        MYSQL_USERNAME: root
+        MYSQL_PASSWORD: password
+        MYSQL_DATABASE: aml_dummy_test
diff --git a/.gitignore b/.gitignore
index c18bf8be..301744ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,4 +54,7 @@ node_modules/
 spec/dummy/log/development.log
 spec/dummy/log/spec.log
 spec/dummy/public/*
-spec/dummy/tmp/*
\ No newline at end of file
+spec/dummy/tmp/*
+
+# Claude Code local settings
+.claude/settings.local.json
\ No newline at end of file
diff --git a/.protocols/test_fixes_protocol.md b/.protocols/test_fixes_protocol.md
new file mode 100644
index 00000000..3ded02dc
--- /dev/null
+++ b/.protocols/test_fixes_protocol.md
@@ -0,0 +1,114 @@
+# Протокол исправления тестов AML Engine
+
+## Общая информация
+- **Дата**: 2025-10-19
+- **Ветка**: chore/upgrade-rails
+- **Количество тестов**: 115 examples, 6 failures
+- **Статус**: В процессе исправления
+
+## Обнаруженные проблемы
+
+### 1. Отсутствие метода `enabled_workflow_events`
+- [x] **Исследовать проблему**
+- [ ] **Добавить метод в AML::Order**
+- [ ] **Добавить метод в AML::PaymentCardOrder**
+- [ ] **Протестировать исправление**
+
+**Ошибка**: `NoMethodError: undefined method 'enabled_workflow_events'`
+**Затронутые файлы**:
+- `app/authorizers/aml/order_authorizer.rb:20`
+- `app/views/application/_payment_card_order_actions.slim:2`
+
+### 2. Отсутствие метода `risk_category` для класса
+- [x] **Исследовать проблему**
+- [ ] **Исправить использование в view**
+- [ ] **Протестировать исправление**
+
+**Ошибка**: `NoMethodError: undefined method 'risk_category' for AML::Client:Class`
+**Затронутые файлы**:
+- `app/views/aml/clients/_risk_category.slim:4`
+
+### 3. Проблемы с отображением шаблонов
+- [ ] **Исправить проблемы с рендерингом**
+- [ ] **Протестировать все контроллеры**
+
+## Детализация ошибок
+
+### Список падающих тестов:
+1. `AML::OrderRejectionsController GET #new returns http success`
+2. `AML::OrderRejectionsController POST #create returns http redirected`
+3. `AML::Orders оператор #show`
+4. `AML::Orders оператор #index`
+5. `AML::PaymentCardOrdersController actions #show`
+6. `AML::PaymentCardOrdersController actions #index`
+
+### Выполненные действия:
+- [x] Запуск полного набора тестов
+- [x] Анализ ошибок в деталях
+- [x] Исследование исходного кода проблемных мест
+- [x] Создание плана исправления
+
+## Замечания по коду
+
+### Проблема с WorkflowActiverecord:
+- Метод `enabled_workflow_events` вызывается в авторайзере, но не определен
+- Нужно исследовать библиотеку workflow и найти правильный способ получения доступных событий
+
+### Проблема с Enum:
+- `AML::Client` имеет `enum :risk_category`, но в view происходит неправильное обращение
+- Нужно использовать правильный синтаксис для получения значений enum
+
+## Выполненные исправления:
+
+### 1. ✅ Метод `enabled_workflow_events`
+- **Проблема**: Метод отсутствовал в моделях `AML::Order` и `AML::PaymentCardOrder`
+- **Решение**: Добавлен метод с правильной реализацией:
+  ```ruby
+  def enabled_workflow_events
+    current_state.events.map { |k, events| events.select { |e| e.condition_applicable?(self, []) } }.flatten.uniq.map(&:name)
+  end
+  public :enabled_workflow_events
+  ```
+- **Файлы**: `app/models/aml/order.rb`, `app/models/aml/payment_card_order.rb`
+
+### 2. ✅ Проблема с `risk_category` enum
+- **Проблема**: View шаблон использовал неправильный синтаксис для enum
+- **Решение**: Заменено на статический массив значений:
+  ```slim
+  - ['A', 'B', 'C'].each do |risk_category|
+    = client_risk_category_link client, risk_category
+  ```
+- **Файл**: `app/views/aml/clients/_risk_category.slim`
+
+### 3. ✅ Настройка Ransack для Rails 8
+- **Проблема**: Ransack 4.4.1 требует явного указания searchable attributes и associations
+- **Решение**: Добавлены методы `ransackable_attributes` и `ransackable_associations`
+- **Файлы**: `app/models/aml/order.rb`, `app/models/aml/payment_card_order.rb`
+
+## Результаты
+
+✅ **Все 6 падающих тестов теперь проходят**
+- `AML::OrderRejectionsController GET #new returns http success`
+- `AML::OrderRejectionsController POST #create returns http redirected`
+- `AML::OrdersController оператор #show`
+- `AML::OrdersController оператор #index`
+- `AML::PaymentCardOrdersController actions #show`
+- `AML::PaymentCardOrdersController actions #index`
+
+✅ **Полный набор тестов**: 115 examples, 0 failures
+
+## Технические детали:
+
+### Исправления workflow:
+- Использована правильная сигнатура `condition_applicable?(object, event_arguments)`
+- Метод сделан public для доступа из авторайзеров
+- Добавлена поддержка для обеих моделей: `Order` и `PaymentCardOrder`
+
+### Совместимость с Rails 8:
+- Настроены Ransack searchable attributes
+- Настроены Ransack searchable associations
+- Исправлены deprecated вызовы
+
+## Итог:
+
+Все тесты успешно проходят, функциональность workflow восстановлена, система авторизации работает корректно. Risk категории клиентов отображаются в интерфейсе.
\ No newline at end of file
diff --git a/.ruby-version b/.ruby-version
index 37c2961c..f092941a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.2
+3.2.8
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 00000000..cc7cd113
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,280 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+AML Engine is a Ruby on Rails mountable engine for anti-money laundering compliance in the Kassa cryptocurrency exchange platform. It provides comprehensive functionality for managing client verification, document processing, and compliance workflows.
+
+## Development Setup
+
+### Prerequisites
+- Ruby 2.7.8 (managed via rbenv)
+- MySQL database
+
+### Testing Commands
+
+**Running tests from the AML engine directory:**
+```bash
+# Run all tests
+bundle exec rspec spec --format documentation
+
+# Run specific test files
+bundle exec rspec spec/models/aml/order_spec.rb --format documentation
+
+# Run with different formatters
+bundle exec rspec spec --format progress
+bundle exec rspec spec --format documentation
+```
+
+### Database Setup for Testing
+
+**Before running tests for the first time, you need to set up the test database:**
+
+1. **Reset and create the test database:**
+   ```bash
+   bundle exec rake db:drop db:create
+   ```
+
+2. **Run migrations for both development and test environments:**
+   ```bash
+   # Development environment
+   bundle exec rake db:migrate
+
+   # Test environment
+   RAILS_ENV=test bundle exec rake db:migrate
+   ```
+
+**Important**:
+- The engine uses a dummy Rails application in `spec/dummy/` for isolated testing
+- All dependencies are managed through the engine's Gemfile
+- Tests can be run directly from the AML engine directory
+
+### Available Rake Tasks
+```bash
+# Generate workflow diagrams for models
+bundle exec rake doc:workflow MODEL=Order
+
+# Run default test suite
+bundle exec rake spec
+
+# List all available tasks
+bundle exec rake -T
+```
+
+## Architecture Overview
+
+### Core Domain Models
+
+**AML::Order**: Central entity representing client verification requests
+- Workflow states: pending, documents_uploaded, processing, accepted, rejected
+- Includes concerns for workflow management, notifications, and card validation
+- Located in: `app/models/aml/order.rb`
+
+**AML::Client**: Represents customers undergoing verification
+- Profile information and verification status tracking
+- Relationship with orders and agreements
+- Located in: `app/models/aml/client.rb`
+
+**AML::OrderDocument**: Document uploads for verification
+- File handling via CarrierWave uploaders
+- Validation and processing workflows
+- Located in: `app/models/aml/order_document.rb`
+
+**AML::DocumentKind**: Configurable document type definitions
+- Field definitions and validation rules
+- Multi-language support via Globalize
+- Located in: `app/models/aml/document_kind.rb`
+
+### Workflow System
+
+Uses the `workflow` gem for state management:
+- Order states: pending → documents_uploaded → processing → accepted/rejected
+- Document states: pending → accepted → rejected
+- Configurable transitions and validation rules
+- Workflow diagrams can be generated with `rake doc:workflow MODEL=ModelName`
+
+### Authorization System
+
+Implements role-based access control using the `authority` gem:
+- Operators can manage orders, clients, and documents
+- Different permission levels for various actions
+- Authorizers located in: `app/authorizers/aml/`
+
+### API and Serialization
+
+- JSON API serialization using FastJSONAPI
+- Serializers for all major models in `app/serializers/aml/`
+- RESTful controllers for CRUD operations
+
+### File Upload and Processing
+
+- CarrierWave for file uploads
+- Image processing and validation
+- Support for multiple document formats
+- Uploaders in `app/uploaders/aml/`
+
+## Key Components
+
+### Controllers
+- Admin interface controllers in `app/controllers/aml/`
+- RESTful API endpoints for order management
+- Document processing and validation workflows
+
+### Decorators
+- Draper decorators for view logic in `app/decorators/aml/`
+- Separation of presentation logic from models
+
+### Mailers
+- Notification system for order status changes
+- Email templates for client communication
+- Located in: `app/mailers/aml/`
+
+### Testing
+- Comprehensive RSpec test suite
+- Factory Bot factories in `factories/`
+- Test helpers and support files
+- Dummy Rails app in `spec/dummy/` for isolated testing
+
+## Configuration Requirements
+
+### Engine Initialization
+The engine requires configuration in the host application:
+
+```ruby
+AML.configure do |config|
+  config.allowed_emails = Secrets.aml_allowed_emails
+  config.mail_from = Settings.mailer.default_from
+  config.logger = ActiveSupport::Logger.new Rails.root.join './log/aml.log'
+end
+```
+
+### Model Extensions
+Host application should extend AML models with User integration:
+
+```ruby
+class AML::Operator
+  has_one :user, class_name: 'User', foreign_key: :aml_operator_id
+
+  def email
+    user&.email || "no user for AML::Operator #{id}"
+  end
+
+  def name
+    user&.name || "no user AML::Operator #{id}"
+  end
+end
+```
+
+## Dependencies and Gem Management
+
+### Key Dependencies
+- Rails 6.x (mountable engine)
+- workflow (state management)
+- authority (authorization)
+- globalize (internationalization)
+- carrierwave (file uploads)
+- fast_jsonapi (serialization)
+- draper (decorators)
+- rspec-rails (testing)
+
+### Development Dependencies
+- Several gems use custom GitHub branches
+- Some dependencies are forked for custom modifications
+- Check Gemfile for specific branch requirements
+
+## Common Development Patterns
+
+### Workflow Transitions
+```ruby
+order = AML::Order.new
+order.submit!  # Changes state to documents_uploaded
+order.start_processing!  # Changes state to processing
+order.accept!  # Changes state to accepted
+```
+
+### Document Processing
+```ruby
+document = order.order_documents.build(document_kind: passport_kind)
+document.image = params[:file]
+document.save!
+document.accept!  # Mark document as accepted
+```
+
+### Authorization Checks
+```ruby
+# In controllers
+authorize! :read, order
+authorize! :update, client
+
+# In views
+if authorized_to?(:manage, order)
+  # Show management controls
+end
+```
+
+## Testing Notes
+
+### Test Dependencies
+- Uses the dummy Rails application for testing
+- Uses DatabaseRewinder for fast test cleanup
+- Factory Bot for test data generation
+
+### Common Test Issues and Solutions
+
+**Migration Issues:**
+- **Problem**: `ActiveRecord::PendingMigrationError` or "Migrations are pending"
+- **Solution**: Run `bundle exec rake db:migrate RAILS_ENV=test`
+
+**Database Setup Issues:**
+- **Problem**: Foreign key constraint failures during migration
+- **Solution**: Reset the database completely: `bundle exec rake db:drop db:create db:migrate`
+
+**Missing Dependencies:**
+- **Problem**: Missing DummyUser class or undefined constants
+- **Solution**: Ensure proper test helpers are loaded and all required test files exist
+
+**Enum Issues:**
+- **Problem**: `Undeclared attribute type for enum` errors
+- **Solution**: Ensure all migrations are run, including enum field migrations like `Add risk category to clients`
+
+**Configuration Issues:**
+- **Problem**: `NoMethodError: undefined method 'fixture_path='`
+- **Solution**: This is due to deprecated RSpec configuration; test setup needs updating for newer Rails versions
+
+**Missing Test Files:**
+- **Problem**: Missing test files like `spec/test_files/test.png`
+- **Solution**: Create required test files manually in the `spec/test_files/` directory
+
+### Running Tests
+**For isolated testing (recommended):**
+```bash
+bundle exec rspec spec --format documentation
+```
+
+**Run specific test files:**
+```bash
+bundle exec rspec spec/models/aml/order_spec.rb --format documentation
+```
+
+**Current Status**:
+- Database migrations are working correctly ✅
+- Test environment is properly configured ✅
+- Some tests have configuration issues related to newer Rails/RSpec versions ⚠️
+- The basic setup and database initialization process is working ✅
+
+## Integration Points
+
+### Host Application Requirements
+- Sorcery authentication system
+- Authority authorization integration
+- Mail configuration for notifications
+- File storage configuration
+- User model integration for operators
+
+### Database Schema
+- Uses isolated namespace with `aml_` prefix
+- Full migration support
+- Referential integrity with host application models
+
+This engine is designed as a standalone component that can be mounted in any Rails application requiring AML compliance functionality.
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 150459ba..5667f926 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,19 +9,22 @@ gemspec
 gem 'active_link_to', github: 'BrandyMint/active_link_to'
 gem 'dapi-archivable', require: 'archivable'
 
-gem 'fast_jsonapi', github: 'HoJSim/fast_jsonapi', branch: 'dev'
-gem 'workflow', github: 'brandymint/workflow', branch: 'transition_availbility'
-gem 'globalize', github: 'globalize/globalize', ref: 'HEAD'
+gem 'fast_jsonapi' #, github: 'HoJSim/fast_jsonapi', branch: 'dev'
+#gem 'globalize' #, github: 'globalize/globalize', ref: 'HEAD'
 
-gem 'sendgrid-actionmailer', github: 'dreimannzelt/sendgrid-actionmailer', branch: :dynamic_template_data
+#gem 'sendgrid-actionmailer', github: 'dreimannzelt/sendgrid-actionmailer', branch: :dynamic_template_data
 gem 'noty_flash', github: 'BrandyMint/noty_flash'
 
 source 'https://rails-assets.org' do
   gem 'rails-assets-noty'
 end
+gem "concurrent-ruby", "~> 1.3"
+group :development do
+  gem 'test-prof'
+end
 
-gem 'axlsx', github: 'randym/axlsx'
-gem 'simple_form', git: 'git://github.com/plataformatec/simple_form.git'
+#gem 'axlsx' #, github: 'randym/axlsx'
+#gem 'simple_form' #, git: 'git://github.com/plataformatec/simple_form.git'
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
diff --git a/Gemfile.lock b/Gemfile.lock
index 3d97a54d..8d02c0bb 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: git://github.com/plataformatec/simple_form.git
-  revision: 7f3350e7f21eb75138490b8a48bf8394eb22c88a
-  specs:
-    simple_form (4.1.0)
-      actionpack (>= 5.0)
-      activemodel (>= 5.0)
-
 GIT
   remote: https://github.com/BrandyMint/active_link_to.git
   revision: ac17e0a934cfcad9a64b02148c52dc3c3028127f
@@ -16,72 +8,28 @@ GIT
 
 GIT
   remote: https://github.com/BrandyMint/noty_flash.git
-  revision: 24e3deacd8960248459f7cad179899dac3f1d321
+  revision: 9f2d93b8192c52122b691f8a14953c35613dfdc1
   specs:
     noty_flash (0.1.2)
 
-GIT
-  remote: https://github.com/HoJSim/fast_jsonapi.git
-  revision: d6b6b37486f8fd0dfbf83a95abf3dd933bfb2383
-  branch: dev
-  specs:
-    fast_jsonapi (1.1.1)
-      activesupport (>= 4.2)
-
-GIT
-  remote: https://github.com/brandymint/workflow.git
-  revision: eb918255df3b3a665ee3b0a2b4594f555366ad62
-  branch: transition_availbility
-  specs:
-    workflow (1.3.0)
-
-GIT
-  remote: https://github.com/dreimannzelt/sendgrid-actionmailer.git
-  revision: 03e5d9d0ea180ad82c959498d6e2fa76ce135d0f
-  branch: dynamic_template_data
-  specs:
-    sendgrid-actionmailer (2.0.1)
-      mail (~> 2.5)
-      sendgrid-ruby (~> 5.3.0)
-
-GIT
-  remote: https://github.com/globalize/globalize.git
-  revision: 3fe2f93ab2d0f5d9c2b84e085f627cf469db72a1
-  ref: HEAD
-  specs:
-    globalize (5.2.0)
-      activemodel (>= 4.2, < 5.3)
-      activerecord (>= 4.2, < 5.3)
-      request_store (~> 1.0)
-
-GIT
-  remote: https://github.com/randym/axlsx.git
-  revision: c593a08b2a929dac7aa8dc418b55e26b4c49dc34
-  specs:
-    axlsx (3.0.0.pre)
-      htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
-      nokogiri (~> 1.8, >= 1.8.2)
-      rubyzip (~> 1.2, >= 1.2.1)
-
 PATH
   remote: .
   specs:
     aml (0.5.6)
       active_link_to
       authority
-      axlsx
-      axlsx_rails (~> 0.5.2)
       best_in_place
       bootstrap-kaminari-views
       bootstrap-sass (~> 3.2)
       bootstrap3-datetimepicker-rails (~> 4.17.47)
       breadcrumbs_on_rails
       carrierwave
-      coffee-rails (~> 4.2)
+      caxlsx
+      caxlsx_rails
+      coffee-rails
+      concurrent-ruby
       dapi-archivable (~> 0.1.2)
-      draper (~> 3.0.1)
-      enumerize
+      draper
       fast_jsonapi
       font-awesome-rails
       globalize
@@ -91,11 +39,11 @@ PATH
       kaminari
       localized_render
       momentjs-rails (>= 2.9.0)
-      money (~> 6.13)
-      money-rails (~> 1.13)
+      money
+      money-rails
+      nokogiri
       noty_flash
-      nprogress-rails
-      rails (~> 5.2.1)
+      rails
       ransack
       sass-rails
       sendgrid-actionmailer
@@ -105,135 +53,203 @@ PATH
       slim-rails
       turbolinks
       valid_email
-      workflow (~> 1.3.0)
+      workflow-activerecord
 
 GEM
-  remote: https://rubygems.org/
   remote: https://rails-assets.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    rails-assets-noty (3.1.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      mail (>= 2.8.0)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activemodel-serializers-xml (1.0.3)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
       builder (~> 3.1)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
-    ast (2.4.0)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
+      timeout (>= 0.4.0)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
+      marcel (~> 1.0)
+    activesupport (8.0.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    ast (2.4.3)
     authority (3.3.0)
       activesupport (>= 3.0.0)
-    autoprefixer-rails (9.4.7)
-      execjs
-    axlsx_rails (0.5.2)
-      actionpack (>= 3.1)
-      axlsx (>= 2.0.1)
-    bcrypt (3.1.12)
-    best_in_place (3.1.1)
-      actionpack (>= 3.2)
-      railties (>= 3.2)
+    autoprefixer-rails (10.4.21.0)
+      execjs (~> 2)
+    base64 (0.3.0)
+    bcrypt (3.1.20)
+    benchmark (0.4.1)
+    best_in_place (4.0.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
+    bigdecimal (3.3.1)
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
       rails (>= 3.1)
-    bootstrap-sass (3.4.0)
+    bootstrap-sass (3.4.1)
       autoprefixer-rails (>= 5.2.1)
       sassc (>= 2.0.0)
     bootstrap3-datetimepicker-rails (4.17.47)
       momentjs-rails (>= 2.8.1)
-    breadcrumbs_on_rails (3.0.1)
-    builder (3.2.3)
-    byebug (10.0.2)
-    carrierwave (1.3.1)
-      activemodel (>= 4.0.0)
-      activesupport (>= 4.0.0)
-      mime-types (>= 1.16)
-    coderay (1.1.2)
-    coffee-rails (4.2.2)
+    breadcrumbs_on_rails (4.1.0)
+      railties (>= 5.0)
+    builder (3.3.0)
+    byebug (12.0.0)
+    carrierwave (3.1.2)
+      activemodel (>= 6.0.0)
+      activesupport (>= 6.0.0)
+      addressable (~> 2.6)
+      image_processing (~> 1.1)
+      marcel (~> 1.0.0)
+      ssrf_filter (~> 1.0)
+    caxlsx (4.4.0)
+      htmlentities (~> 4.3, >= 4.3.4)
+      marcel (~> 1.0)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 2.4, < 4)
+    caxlsx_rails (0.6.4)
+      actionpack (>= 3.1)
+      caxlsx (>= 3.0)
+    coderay (1.1.3)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.4)
-    crass (1.0.4)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.4)
+    crass (1.0.6)
     dapi-archivable (0.1.3)
       activerecord
       activesupport
-    database_rewinder (0.9.1)
-    diff-lcs (1.3)
-    draper (3.0.1)
-      actionpack (~> 5.0)
-      activemodel (~> 5.0)
-      activemodel-serializers-xml (~> 1.0)
-      activesupport (~> 5.0)
+    database_rewinder (1.1.0)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    draper (4.0.4)
+      actionpack (>= 5.0)
+      activemodel (>= 5.0)
+      activemodel-serializers-xml (>= 1.0)
+      activesupport (>= 5.0)
+      request_store (>= 1.0)
+      ruby2_keywords
+    drb (2.2.3)
+    erubi (1.13.1)
+    execjs (2.10.0)
+    factory_bot (6.5.5)
+      activesupport (>= 6.1.0)
+    faraday (2.14.0)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-net_http (3.4.1)
+      net-http (>= 0.5.0)
+    fast_jsonapi (1.5)
+      activesupport (>= 4.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
+    font-awesome-rails (4.7.0.9)
+      railties (>= 3.2, < 9.0)
+    formatador (1.2.1)
+      reline
+    globalid (1.3.0)
+      activesupport (>= 6.1)
+    globalize (7.0.0)
+      activemodel (>= 7.0, < 8.1)
+      activerecord (>= 7.0, < 8.1)
+      activesupport (>= 7.0, < 8.1)
       request_store (~> 1.0)
-    enumerize (2.2.2)
-      activesupport (>= 3.2)
-    erubi (1.8.0)
-    execjs (2.7.0)
-    factory_bot (4.11.1)
-      activesupport (>= 3.0.0)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
-    font-awesome-rails (4.7.0.4)
-      railties (>= 3.2, < 6.0)
-    formatador (0.2.5)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    globalize-accessors (0.2.1)
-      globalize (~> 5.0, >= 5.0.0)
-    guard (2.15.0)
+    globalize-accessors (0.3.0)
+      globalize (>= 5.0.0)
+    guard (2.19.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
+      logger (~> 1.6)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      ostruct (~> 0.6)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.2.0)
-      bundler (>= 1.3.0)
+    guard-bundler (3.0.1)
+      bundler (>= 2.1, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -244,201 +260,272 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.5.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
+      rubocop (< 2.0)
+    hashie (5.0.0)
     htmlentities (4.3.4)
-    i18n (1.5.2)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
-    jquery-rails (4.3.3)
+    image_processing (1.14.0)
+      mini_magick (>= 4.9.5, < 6)
+      ruby-vips (>= 2.0.17, < 3)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (6.0.1)
+    jquery-ui-rails (8.0.0)
       railties (>= 3.2.16)
-    jwt (2.1.0)
-    kaminari (1.1.1)
+    json (2.15.1)
+    jwt (3.1.2)
+      base64
+    kaminari (1.2.2)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.2)
+      kaminari-activerecord (= 1.2.2)
+      kaminari-core (= 1.2.2)
+    kaminari-actionview (1.2.2)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.2)
+    kaminari-activerecord (1.2.2)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    localized_render (0.1.0)
+      kaminari-core (= 1.2.2)
+    kaminari-core (1.2.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    listen (3.9.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    localized_render (0.2.0)
       globalize
-      rails (~> 5.2.1)
-    loofah (2.2.3)
+      rails
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    lumberjack (1.0.13)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    lumberjack (1.4.2)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    momentjs-rails (2.20.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_magick (5.3.1)
+      logger
+    mini_mime (1.1.5)
+    minitest (5.26.0)
+    momentjs-rails (2.29.4.1)
       railties (>= 3.1)
-    monetize (1.9.0)
+    monetize (1.13.0)
       money (~> 6.12)
-    money (6.13.2)
+    money (6.19.0)
       i18n (>= 0.6.4, <= 2)
-    money-rails (1.13.1)
+    money-rails (1.15.0)
       activesupport (>= 3.0)
-      monetize (~> 1.9.0)
-      money (~> 6.13.0)
+      monetize (~> 1.9)
+      money (~> 6.13)
       railties (>= 3.0)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    mustermann (1.0.3)
-    mysql2 (0.5.2)
+    multi_xml (0.7.2)
+      bigdecimal (~> 3.1)
+    mysql2 (0.5.7)
+      bigdecimal
     nenv (0.3.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
+    net-http (0.6.0)
+      uri
+    net-imap (0.5.12)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.1)
+      net-protocol
+    nio4r (2.7.4)
+    nokogiri (1.18.10-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.10-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.10-x86_64-linux-musl)
+      racc (~> 1.4)
+    notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    nprogress-rails (0.2.0.2)
-    oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
+    oauth (1.1.2)
+      oauth-tty (~> 1.0, >= 1.0.6)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1, >= 1.1.9)
+    oauth-tty (1.0.6)
+      version_gem (~> 1.1, >= 1.1.9)
+    oauth2 (2.0.17)
+      faraday (>= 0.17.3, < 4.0)
+      jwt (>= 1.0, < 4.0)
+      logger (~> 1.2)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    pry-doc (1.0.0)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0, >= 2.0.3)
+      version_gem (~> 1.1, >= 1.1.9)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.9.0)
+      ast (~> 2.4.1)
+      racc
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.6.0)
+    pry (0.15.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
+    pry-doc (1.6.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (3.0.3)
-    rack (2.0.6)
-    rack-protection (2.0.5)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2)
-      sprockets-rails (>= 2.0.0)
-    rails-assets-noty (3.1.4)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
+    psych (3.1.0)
+    public_suffix (6.0.2)
+    racc (1.8.1)
+    rack (3.2.3)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
+      rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
+      bundler (>= 1.15.0)
+      railties (= 8.0.3)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    rails-i18n (5.1.3)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (8.0.2)
       i18n (>= 0.7, < 2)
-      railties (>= 5.0, < 6)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    ransack (2.1.1)
-      actionpack (>= 5.0)
-      activerecord (>= 5.0)
-      activesupport (>= 5.0)
+      railties (>= 8.0.0, < 9)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.3.0)
+    ransack (4.4.1)
+      activerecord (>= 7.2)
+      activesupport (>= 7.2)
       i18n
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    request_store (1.4.1)
+    rdoc (6.3.4.1)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    request_store (1.7.0)
       rack (>= 1.4)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.13.1)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.62.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.6)
+    rubocop (1.81.1)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.31.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
-    ruby_dep (1.5.0)
-    ruby_http_client (3.3.0)
-    rubyzip (1.2.2)
-    sass (3.7.3)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    sassc (2.0.0)
-      ffi (~> 1.9.6)
-      rake
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-rspec (3.7.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    ruby-progressbar (1.13.0)
+    ruby-vips (2.2.5)
+      ffi (~> 1.12)
+      logger
+    ruby2_keywords (0.0.5)
+    ruby_http_client (3.5.5)
+    rubyzip (3.2.0)
+    sass-rails (6.0.0)
+      sassc-rails (~> 2.1, >= 2.1.1)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
+    securerandom (0.4.1)
     semver (1.0.1)
-    sendgrid-ruby (5.3.0)
-      ruby_http_client (~> 3.3.0)
-      sinatra (>= 1.4.7, < 3)
+    sendgrid-actionmailer (3.2.0)
+      mail (~> 2.7)
+      sendgrid-ruby (~> 6.4)
+    sendgrid-ruby (6.7.0)
+      ruby_http_client (~> 3.4)
     shellany (0.0.1)
+    simple_form (5.3.1)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
     simple_form_bootstrap_inputs (0.1.0)
       bootstrap-sass (~> 3.2)
       bootstrap3-datetimepicker-rails (~> 4.17.47)
@@ -446,62 +533,82 @@ GEM
       jquery-ui-rails
       rails-i18n
       simple_form
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
-      tilt (~> 2.0)
-    slim (4.0.1)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 2.0.6, < 2.1)
-    slim-rails (3.2.0)
+    simpleidn (0.2.3)
+    slim (5.2.1)
+      temple (~> 0.10.0)
+      tilt (>= 2.1.0)
+    slim-rails (3.7.0)
       actionpack (>= 3.1)
       railties (>= 3.1)
-      slim (>= 3.0, < 5.0)
-    sorcery (0.13.0)
+      slim (>= 3.0, < 6.0, != 5.0.0)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
+    sorcery (0.17.0)
       bcrypt (~> 3.1)
-      oauth (~> 0.4, >= 0.4.4)
-      oauth2 (~> 1.0, >= 0.8.0)
-    sprockets (3.7.2)
+      oauth (>= 0.6)
+      oauth2 (~> 2.0)
+    sprockets (4.2.2)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      logger
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    temple (0.8.0)
-    test-prof (0.7.3)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tilt (2.0.9)
-    turbolinks (5.2.0)
+    ssrf_filter (1.3.0)
+    temple (0.10.4)
+    test-prof (1.0.11)
+    thor (1.4.0)
+    tilt (2.6.1)
+    timeout (0.4.3)
+    tsort (0.2.0)
+    turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.4.1)
-    valid_email (0.1.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.4)
+    useragent (0.16.11)
+    valid_email (0.2.1)
       activemodel
       mail (>= 2.6.1)
-    websocket-driver (0.7.0)
+      simpleidn
+    version_gem (1.1.9)
+    websocket-driver (0.8.0)
+      base64
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    yard (0.9.16)
+    websocket-extensions (0.1.5)
+    workflow (3.1.1)
+    workflow-activerecord (6.0.1)
+      activerecord (>= 6.0)
+      workflow (~> 3.0)
+    yard (0.9.37)
+    zeitwerk (2.7.3)
 
 PLATFORMS
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   active_link_to!
   activesupport
   aml!
-  axlsx!
   byebug
+  concurrent-ruby (~> 1.3)
   dapi-archivable
   database_rewinder
   factory_bot
-  fast_jsonapi!
-  globalize!
+  fast_jsonapi
   guard-bundler
   guard-ctags-bundler
   guard-rspec
@@ -512,16 +619,14 @@ DEPENDENCIES
   pry-byebug
   pry-doc
   pry-rails
+  psych (~> 3.1.0)
   rails-assets-noty!
-  rspec-rails (~> 3.7)
+  rspec-rails
   rubocop
   rubocop-rspec
   semver
-  sendgrid-actionmailer!
-  simple_form!
   sorcery
-  test-prof (~> 0.7.2)
-  workflow!
+  test-prof (~> 1.0.0, >= 0)
 
 BUNDLED WITH
-   1.17.3
+   2.7.2
diff --git a/README.md b/README.md
index 9572cefa..7b2b4159 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,9 @@
 # AML engine
 
 [![Build Status](https://travis-ci.org/alfagen/aml-engine.svg?branch=master)](https://travis-ci.org/alfagen/aml-engine)
+[![Tests](https://github.com/alfagen/aml-engine/workflows/Tests/badge.svg)](https://github.com/alfagen/aml-engine/actions/workflows/tests.yml)
 
+AML Engine - это монтируемый Ruby on Rails движок для соответствия требованиям противодействия отмыванию денег (AML) на криптовалютной биржевой платформе Kassa.
 
 ## Статусы документа
 
@@ -11,6 +13,78 @@
 
 ![Статусы заявки](https://github.com/alfagen/aml-engine/blob/master/doc/aml_orders_workflow.png?raw=true)
 
+## Установка и настройка
+
+### Требования
+- Ruby 2.7.8 (управляется через rbenv)
+- MySQL база данных
+- Rails 6.x
+
+### Настройка базы данных для тестов
+
+**Перед запуском тестов необходимо настроить тестовую базу данных:**
+
+1. **Сброс и создание тестовой базы данных:**
+   ```bash
+   bundle exec rake db:drop db:create
+   ```
+
+2. **Запуск миграций для разработки и тестовых сред:**
+   ```bash
+   # Среда разработки
+   bundle exec rake db:migrate
+
+   # Тестовая среда
+   RAILS_ENV=test bundle exec rake db:migrate
+   ```
+
+### Запуск тестов
+
+**Запуск тестов из директории AML Engine:**
+```bash
+# Запуск всех тестов
+bundle exec rspec spec --format documentation
+
+# Запуск конкретных тестовых файлов
+bundle exec rspec spec/models/aml/order_spec.rb --format documentation
+
+# Запуск с форматом progress
+bundle exec rspec spec --format progress
+
+# Запуск с выводом в формате документации
+bundle exec rspec spec --format documentation
+```
+
+### Доступные Rake задачи
+```bash
+# Генерация диаграмм workflow для моделей
+bundle exec rake doc:workflow MODEL=Order
+
+# Запуск набора тестов по умолчанию
+bundle exec rake spec
+
+# Просмотр всех доступных задач
+bundle exec rake -T
+```
+
+### Устранение распространенных проблем
+
+**Проблемы с миграциями:**
+- **Проблема**: `ActiveRecord::PendingMigrationError` или "Migrations are pending"
+- **Решение**: Выполнить `bundle exec rake db:migrate RAILS_ENV=test`
+
+**Проблемы с настройкой базы данных:**
+- **Проблема**: Ошибки ограничений внешнего ключа во время миграции
+- **Решение**: Полностью сбросить базу данных: `bundle exec rake db:drop db:create db:migrate`
+
+**Проблемы с enum:**
+- **Проблема**: Ошибки `Undeclared attribute type for enum`
+- **Решение**: Убедиться, что все миграции выполнены, включая миграции полей enum, такие как `Add risk category to clients`
+
+**Проблемы с зависимостями:**
+- **Проблема**: Отсутствуют тестовые файлы
+- **Решение**: Убедиться, что файл `spec/test_files/test.png` существует. При необходимости создайте его вручную.
+
 ## Приложение должно поддерживать следующий интерфейс:
 
 ### Routes
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 00000000..2e0649e0
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1 @@
+* [ ] Удалить activestorage
diff --git a/aml.gemspec b/aml.gemspec
index b85ccf39..e0746206 100644
--- a/aml.gemspec
+++ b/aml.gemspec
@@ -22,23 +22,23 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency 'noty_flash'
     s.add_runtime_dependency 'fast_jsonapi'
     s.add_runtime_dependency 'valid_email'
-    s.add_runtime_dependency 'enumerize'
-    s.add_runtime_dependency 'workflow', '~> 1.3.0'
+    s.add_runtime_dependency 'workflow-activerecord'
     s.add_runtime_dependency 'ransack'
     s.add_runtime_dependency 'authority'
     s.add_runtime_dependency 'globalize'
     s.add_runtime_dependency 'globalize-accessors'
-    s.add_runtime_dependency 'money', '~> 6.13'
-    s.add_runtime_dependency 'money-rails', '~> 1.13'
+    s.add_runtime_dependency 'money'
+    s.add_runtime_dependency 'money-rails'
     s.add_runtime_dependency 'sendgrid-actionmailer'
-    s.add_runtime_dependency 'draper', '~> 3.1.0'
+    s.add_runtime_dependency 'draper'
     s.add_runtime_dependency 'active_link_to'
     s.add_runtime_dependency 'slim'
     s.add_runtime_dependency 'slim-rails'
-    s.add_runtime_dependency 'axlsx'
-    s.add_runtime_dependency 'axlsx_rails', '~> 0.5.2'
+    s.add_runtime_dependency 'caxlsx'
+    s.add_runtime_dependency 'caxlsx_rails'
+    s.add_runtime_dependency 'nokogiri'
     s.add_runtime_dependency 'kaminari'
-    s.add_runtime_dependency 'rails', "~> 6.0.6"
+    s.add_runtime_dependency 'rails'
     s.add_runtime_dependency "dapi-archivable", "~> 0.1.2"
     s.add_runtime_dependency 'jquery-rails'
     s.add_runtime_dependency 'jquery-ui-rails'
@@ -53,9 +53,9 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency 'simple_form'
     s.add_runtime_dependency 'sass-rails'
     s.add_runtime_dependency 'localized_render'
+    s.add_runtime_dependency 'concurrent-ruby'
     s.add_runtime_dependency 'simple_form_bootstrap_inputs'
     s.add_runtime_dependency 'best_in_place'
-
     s.add_development_dependency "mysql2"
     s.add_development_dependency 'rubocop'
     s.add_development_dependency 'rubocop-rspec'
@@ -75,12 +75,14 @@ Gem::Specification.new do |s|
     # hist --grep foo
     # Adds step-by-step debugging and stack navigation capabilities to pry using byebug.
     s.add_development_dependency 'pry-byebug'
-    s.add_development_dependency 'test-prof', '~> 0.7.2'
+    s.add_development_dependency 'test-prof', '~> 1.0.0'
 
     s.add_development_dependency 'sorcery'
     s.add_development_dependency 'activesupport'
     s.add_development_dependency 'semver'
     s.add_development_dependency 'factory_bot'
-    s.add_development_dependency 'rspec-rails', '~> 3.7'
+    s.add_development_dependency 'rspec-rails'
     s.add_development_dependency 'database_rewinder'
+    # Зафиксировать старую версию Psych для совместимости с YAML алиасами
+    s.add_development_dependency 'psych', '~> 3.1.0'
 end
diff --git a/app/assets/javascripts/aml/application.js b/app/assets/javascripts/aml/application.js
index f52668ff..c736e84c 100644
--- a/app/assets/javascripts/aml/application.js
+++ b/app/assets/javascripts/aml/application.js
@@ -16,7 +16,6 @@
 //= require moment/ru
 //= require bootstrap
 //= require bootstrap-datetimepicker
-//= require activestorage
 //= require turbolinks
 //= require noty_flash
 //= require best_in_place
diff --git a/app/controllers/aml/payment_card_orders_controller.rb b/app/controllers/aml/payment_card_orders_controller.rb
index 0ac149f2..4173896c 100755
--- a/app/controllers/aml/payment_card_orders_controller.rb
+++ b/app/controllers/aml/payment_card_orders_controller.rb
@@ -41,7 +41,7 @@ def show
 
     def done
       authorize_action_for payment_card_order
-      payment_card_order.done!(image: params[:payment_card_order][:image])
+      payment_card_order.done!(params[:payment_card_order][:image])
       flash.notice = 'Заявка отмечена как загруженная'
       redirect_to payment_card_order_path(payment_card_order)
     end
diff --git a/app/mailers/aml/notification_mailer.rb b/app/mailers/aml/notification_mailer.rb
index 50518ea6..137949b9 100644
--- a/app/mailers/aml/notification_mailer.rb
+++ b/app/mailers/aml/notification_mailer.rb
@@ -1,6 +1,6 @@
 module AML
   class NotificationMailer < ApplicationMailer
-    def notify(email:, template_id:, data: {})
+    def notify(email, template_id, data = {})
       logger.info "Notify from #{AML.mail_from} to #{email} with template_id #{template_id} and data #{data}"
       mail(
         from:        AML.mail_from,
diff --git a/app/models/aml/client.rb b/app/models/aml/client.rb
index 214d1a75..bdc6b9bc 100644
--- a/app/models/aml/client.rb
+++ b/app/models/aml/client.rb
@@ -5,7 +5,6 @@
 
 module AML
   class Client < ApplicationRecord
-    extend Enumerize
     include Authority::Abilities
 
     scope :ordered, -> { order 'id desc' }
@@ -29,7 +28,7 @@ class Client < ApplicationRecord
     # Нужно для для сериализера
     alias_attribute :current_order_id, :aml_order_id
 
-    enumerize :risk_category, in: %w(A B C)
+    enum :risk_category, { A: 'A', B: 'B', C: 'C' }
 
     # TODO: Не может быть без имени если находится в статусе оформляется или принят/отклонен
     #
@@ -53,9 +52,7 @@ def all_agreements_accepted?
 
     def notify(template_id, data = {})
       if email.present?
-        AML::NotificationMailer.
-          notify( email: email, template_id: template_id, data: data).
-          deliver!
+        AML::NotificationMailer.notify(email, template_id, data).deliver!
       else
         AML::NotificationMailer.logger.error "У клиента #{id} нет email-а"
       end
diff --git a/app/models/aml/client_info.rb b/app/models/aml/client_info.rb
index 9d16ec5e..8c26dc39 100644
--- a/app/models/aml/client_info.rb
+++ b/app/models/aml/client_info.rb
@@ -1,10 +1,9 @@
 module AML
   class ClientInfo < ApplicationRecord
-    extend Enumerize
     include Authority::Abilities
 
     belongs_to :aml_client, class_name: 'AML::Client', foreign_key: :aml_client_id
 
-    enumerize :gender, in: %w(male female)
+    enum :gender, { male: 'male', female: 'female' }
   end
 end
diff --git a/app/models/aml/notification.rb b/app/models/aml/notification.rb
index 8dc74f8b..543d1ab2 100644
--- a/app/models/aml/notification.rb
+++ b/app/models/aml/notification.rb
@@ -1,6 +1,5 @@
 module AML
   class Notification < ApplicationRecord
-    extend Enumerize
     include Authority::Abilities
 
     has_many :aml_notification_templates, class_name: 'AML::NotificationTemplate', foreign_key: :aml_notification_id, dependent: :destroy
@@ -10,7 +9,7 @@ class Notification < ApplicationRecord
 
     after_create :create_templates
 
-    enumerize :key, in: %w(on_pending_notification on_accept_notification on_reject_notification)
+    enum :key, { on_pending_notification: 'on_pending_notification', on_accept_notification: 'on_accept_notification', on_reject_notification: 'on_reject_notification' }
 
     def to_s
       title
diff --git a/app/models/aml/operator.rb b/app/models/aml/operator.rb
index 482d7c4e..bdd13ed2 100644
--- a/app/models/aml/operator.rb
+++ b/app/models/aml/operator.rb
@@ -1,20 +1,20 @@
 require 'valid_email'
-require 'enumerize'
 
 module AML
   class Operator < ApplicationRecord
-    extend Enumerize
-    include Workflow
+    include WorkflowActiverecord
     include Authority::Abilities
 
     scope :ordered, -> { order 'id desc' }
 
+    scope :with_unblocked_state, -> { where workflow_state: :unblocked }
+
     has_many :orders, class_name: 'AML::Order', dependent: :destroy
     has_many :payment_card_orders, class_name: 'AML::PaymentCardOrder', dependent: :destroy
 
-    enum role: [:operator, :administrator]
+    enum :role, [:operator, :administrator]
 
-    enumerize :workflow_state, in: %w[blocked unblocked], scope: true
+    enum :workflow_state, { blocked: 'blocked', unblocked: 'unblocked' }
 
     workflow do
       state :unblocked do
@@ -39,9 +39,7 @@ def notify(template_id, data = {})
         AML::NotificationMailer.logger.error "У оператора #{id} нет email-а"
         return
       end
-      AML::NotificationMailer.
-        notify( email: email, template_id: template_id, data: data).
-        deliver!
+      AML::NotificationMailer.notify( email, template_id, data).deliver!
     end
 
     def to_s
diff --git a/app/models/aml/order.rb b/app/models/aml/order.rb
index 52a7b662..8483e031 100644
--- a/app/models/aml/order.rb
+++ b/app/models/aml/order.rb
@@ -1,7 +1,6 @@
 module AML
   class Order < ApplicationRecord
-    extend Enumerize
-    include Workflow
+    include WorkflowActiverecord
     include Archivable
     include Authority::Abilities
 
@@ -165,5 +164,22 @@ def cancel_previous_orders!
     def set_default_aml_status
       self.aml_status ||= ::AML.default_status
     end
+
+    # Returns available events list for current state
+    def enabled_workflow_events
+      current_state.events.map { |k, events| events.select { |e| e.condition_applicable?(self, []) } }.flatten.uniq.map(&:name)
+    end
+
+    public :enabled_workflow_events
+
+    # Ransack configuration for searchable attributes
+    def self.ransackable_attributes(auth_object = nil)
+      ["aml_reject_reason_id", "aml_status_id", "archived_at", "birth_date", "card_bin", "card_brand", "card_holding_state", "card_holding_state_updated_at", "card_suffix", "client_id", "cloned_order_id", "created_at", "first_name", "id", "id_value", "operated_at", "operator_id", "orders_count_sort", "patronymic", "pending_at", "reject_reason_details", "surname", "updated_at", "workflow_state"]
+    end
+
+    # Ransack configuration for searchable associations
+    def self.ransackable_associations(auth_object = nil)
+      ["aml_check_lists", "aml_client_info", "aml_reject_reason", "aml_status", "client", "cloned_order", "operator", "order_checks", "order_documents", "required_document_kinds"]
+    end
   end
 end
diff --git a/app/models/aml/order_check.rb b/app/models/aml/order_check.rb
index 1e8af2de..a5e9589c 100644
--- a/app/models/aml/order_check.rb
+++ b/app/models/aml/order_check.rb
@@ -1,6 +1,6 @@
 module AML
   class OrderCheck < ApplicationRecord
-    include Workflow
+    include WorkflowActiverecord
     include Authority::Abilities
 
     belongs_to :aml_order, class_name: 'AML::Order'
diff --git a/app/models/aml/order_document.rb b/app/models/aml/order_document.rb
index d85fe8ca..4dd4547b 100644
--- a/app/models/aml/order_document.rb
+++ b/app/models/aml/order_document.rb
@@ -11,8 +11,7 @@ def message
       end
     end
 
-    extend Enumerize
-    include Workflow
+        include WorkflowActiverecord
 
     mount_uploader :image, OrderDocumentFileUploader
 
diff --git a/app/models/aml/payment_card_order.rb b/app/models/aml/payment_card_order.rb
index 1713990c..30263123 100644
--- a/app/models/aml/payment_card_order.rb
+++ b/app/models/aml/payment_card_order.rb
@@ -1,7 +1,7 @@
 module AML
   class PaymentCardOrder < ApplicationRecord
     include Authority::Abilities
-    include Workflow
+    include WorkflowActiverecord
 
     include OrderWorkflow
     include OrderNotifications
@@ -55,7 +55,7 @@ def is_owner?(operator)
       self.operator == operator
     end
 
-    def done(image: )
+    def done(image)
       update_attribute :image, image
       touch :pending_at
     end
@@ -64,6 +64,23 @@ def client_name
       ["##{client.id}", client.first_name, client.surname, client.patronymic].compact.join ' '
     end
 
+    # Returns available events list for current state
+    def enabled_workflow_events
+      current_state.events.map { |k, events| events.select { |e| e.condition_applicable?(self, []) } }.flatten.uniq.map(&:name)
+    end
+
+    public :enabled_workflow_events
+
+    # Ransack configuration for searchable attributes
+    def self.ransackable_attributes(auth_object = nil)
+      ["aml_client_id", "aml_operator_id", "aml_reject_reason_id", "card_bin", "card_brand", "card_suffix", "created_at", "id", "image", "operated_at", "pending_at", "reject_reason_details", "updated_at", "workflow_state"]
+    end
+
+    # Ransack configuration for searchable associations
+    def self.ransackable_associations(auth_object = nil)
+      ["aml_payment_card", "aml_reject_reason", "client", "operator"]
+    end
+
     private
 
     def find_notification_for_key(notification_key)
diff --git a/app/models/aml/reject_reason.rb b/app/models/aml/reject_reason.rb
index fcce0623..12cf1af4 100644
--- a/app/models/aml/reject_reason.rb
+++ b/app/models/aml/reject_reason.rb
@@ -16,6 +16,6 @@ class RejectReason < ApplicationRecord
 
     validates :kind, presence: true
 
-    enum kind: ['order_reason', 'order_document_reason', 'card_order_reason']
+    enum :kind, [:order_reason, :order_document_reason, :card_order_reason]
   end
 end
diff --git a/app/models/concerns/aml/order_notifications.rb b/app/models/concerns/aml/order_notifications.rb
index e9d07cd3..8a000f8c 100644
--- a/app/models/concerns/aml/order_notifications.rb
+++ b/app/models/concerns/aml/order_notifications.rb
@@ -7,9 +7,16 @@ module OrderNotifications
     private
 
     def notify_operators
+      AML.logger.info "notify_operators called for order #{id}, template_id: #{AML.new_order_sendgrid_template_id}"
       if AML.new_order_sendgrid_template_id.present?
         AML::Operator.with_unblocked_state.find_each do |o|
-          o.notify AML.new_order_sendgrid_template_id, order_type: self.class.name, order_id: id, client_name: client.name
+          AML.logger.info "Notifying operator #{o.id} with template #{AML.new_order_sendgrid_template_id}"
+          o.notify(
+            AML.new_order_sendgrid_template_id,
+            order_type: self.class.name,
+            order_id: id,
+            client_name: client.name
+          )
         end
       else
         AML.logger.warn 'Не могу уведомить операторов о новой заявке, не установлен AML.new_order_sendgrid_template_id'
@@ -30,10 +37,14 @@ def notify(notification_key)
       end
 
       AML.logger.info "Sending notification #{notification_key} with template_id #{notification_template.template_id} for client #{client.id} (#{client.email})"
-      client.notify notification_template.template_id,
+      AML.logger.info "About to call client.notify with template_id: #{notification_template.template_id}"
+      client.notify(
+        notification_template.template_id,
         first_name: client_first_name,
         reject_reason_title: aml_reject_reason.try(:title),
         reject_reason_details: reject_reason_details.presence
+      )
+      AML.logger.info "Successfully called client.notify"
 
     rescue NotificaitonKeyNotFound => err
       return unless defined? Bugsnag
diff --git a/app/views/aml/clients/_risk_category.slim b/app/views/aml/clients/_risk_category.slim
index d1f4e7b5..f6a36a56 100644
--- a/app/views/aml/clients/_risk_category.slim
+++ b/app/views/aml/clients/_risk_category.slim
@@ -1,5 +1,5 @@
 .btn-group.btn-group-sm role='group'
   = client_risk_category_link client, nil
 
-  - AML::Client.risk_category.values.each do |risk_category|
+  - AML::Client.risk_categories.values.each do |risk_category|
     = client_risk_category_link client, risk_category
diff --git a/app/views/aml/orders/orders.xlsx.caxlsx b/app/views/aml/orders/orders.xlsx.caxlsx
new file mode 100644
index 00000000..7d7605a7
--- /dev/null
+++ b/app/views/aml/orders/orders.xlsx.caxlsx
@@ -0,0 +1,8 @@
+wb = xlsx_package.workbook
+wb.add_worksheet(name: 'Клиенты') do |sheet|
+  sheet.add_row columns
+
+  orders.each do |order|
+    sheet.add_row(columns.map { |column| order.send column })
+  end
+end
diff --git a/bin/rails b/bin/rails
index 9b96da39..59ded87c 100755
--- a/bin/rails
+++ b/bin/rails
@@ -3,8 +3,8 @@
 # installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('..', __dir__)
-ENGINE_PATH = File.expand_path('../lib/aml/engine', __dir__)
-APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
+ENGINE_PATH = File.expand_path('../lib/aml/engine/engine', __dir__)
+APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
diff --git a/bin/rspec b/bin/rspec
new file mode 100755
index 00000000..93e191c2
--- /dev/null
+++ b/bin/rspec
@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")
diff --git a/config/boot.rb b/config/boot.rb
new file mode 100644
index 00000000..bd06f574
--- /dev/null
+++ b/config/boot.rb
@@ -0,0 +1,2 @@
+require 'bundler/setup' # Set up gems listed in the Gemfile.
+require 'logger' # Fix concurrent-ruby removing logger dependency which Rails itself does not have
\ No newline at end of file
diff --git a/config/initializers/psych_fix.rb b/config/initializers/psych_fix.rb
new file mode 100644
index 00000000..bf39b42f
--- /dev/null
+++ b/config/initializers/psych_fix.rb
@@ -0,0 +1,13 @@
+# Исправление совместимости Ruby 3.2 с Rails 5.2
+# Проблема с ActionDispatch::Static middleware
+if Rails::VERSION::MAJOR == 5 && RUBY_VERSION >= '3.0'
+  module ActionDispatch
+    class Static
+      def initialize(app, path, cache_control = nil)
+        @app = app
+        @path = path
+        @cache_control = cache_control
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/factories/aml_reject_reasons.rb b/factories/aml_reject_reasons.rb
index c9572a0d..6ddcf0c3 100644
--- a/factories/aml_reject_reasons.rb
+++ b/factories/aml_reject_reasons.rb
@@ -2,18 +2,18 @@
   factory(:aml_reject_reason, class: AML::RejectReason) do
     sequence(:title) { |n| "title#{n}" }
 
-    kind { 'order_reason' }
+    kind { :order_reason }
 
     trait :order_reason do
-      kind { 'order_reason' }
+      kind { :order_reason }
     end
 
     trait :order_document_reason do
-      kind { 'order_document_reason' }
+      kind { :order_document_reason }
     end
 
     trait :payment_card_order_reason do
-      kind { 'card_order_reason' }
+      kind { :card_order_reason }
     end
   end
 end
diff --git a/lib/aml.rb b/lib/aml.rb
index 497b4722..62287e09 100644
--- a/lib/aml.rb
+++ b/lib/aml.rb
@@ -1,4 +1,6 @@
+require 'logger'
 require 'archivable'
+require 'workflow-activerecord'
 
 require 'aml/engine'
 require 'aml/configuration'
@@ -46,9 +48,9 @@ def self.seed_demo!
       s2.aml_document_groups << g1
       s2.aml_document_groups << g2
 
-      RejectReason.create!(title: 'Ошибка в заявке', kind: 'order_reason')
-      RejectReason.create!(title: 'Ошибка в документе', kind: 'order_document_reason')
-      RejectReason.create!(title: 'Ошибка в заявке на привязку', kind: 'card_order_reason')
+      RejectReason.create!(title: 'Ошибка в заявке', kind: :order_reason)
+      RejectReason.create!(title: 'Ошибка в документе', kind: :order_document_reason)
+      RejectReason.create!(title: 'Ошибка в заявке на привязку', kind: :card_order_reason)
     end
   end
 
diff --git a/lib/database_rewinder_patch.rb b/lib/database_rewinder_patch.rb
new file mode 100644
index 00000000..2bdcf533
--- /dev/null
+++ b/lib/database_rewinder_patch.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# Patch for DatabaseRewinder to fix MySQL connection with password
+# This fixes the issue where DatabaseRewinder creates a new MySQL connection
+# without the password, causing "Access denied for user 'root'@'ip' (using password: NO)" error
+
+module DatabaseRewinder
+  module MultipleStatementsExecutor
+    refine ActiveRecord::ConnectionAdapters::AbstractAdapter do
+      def execute_multiple(sql)
+        #TODO Use ADAPTER_NAME when we've dropped AR 4.1 support
+        case self.class.name
+        when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+          disable_referential_integrity { log(sql) { raw_connection_or_connection.exec sql } }
+        when 'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
+          if raw_connection_or_connection.query_options[:connect_flags] & Mysql2::Client::MULTI_STATEMENTS != 0
+            disable_referential_integrity do
+              _result = log(sql) { raw_connection_or_connection.query sql }
+              while raw_connection_or_connection.next_result
+                # just to make sure that all queries are finished
+                _result = raw_connection_or_connection.store_result
+              end
+            end
+          else
+            query_options = raw_connection_or_connection.query_options.dup
+            query_options[:connect_flags] |= Mysql2::Client::MULTI_STATEMENTS
+
+            # FIX: Add password from the connection configuration if it's missing
+            unless query_options[:password]
+              # Get the full configuration from the connection
+              config = self.instance_variable_get(:@config) || pool&.db_config&.configuration_hash || {}
+              query_options[:password] = config[:password]
+            end
+
+            # opens another connection to the DB
+            client = Mysql2::Client.new query_options
+            begin
+              # disable_referential_integrity
+              client.query("SET FOREIGN_KEY_CHECKS = 0")
+              _result = log(sql) { client.query sql }
+              while client.next_result
+                # just to make sure that all queries are finished
+                _result = client.store_result
+              end
+            ensure
+              client.close
+            end
+          end
+        when 'ActiveRecord::ConnectionAdapters::SQLite3Adapter'
+          disable_referential_integrity { log(sql) { raw_connection_or_connection.execute_batch sql } }
+        else
+          raise 'Multiple deletion is not supported with the current database adapter.'
+        end
+      end
+
+      private
+
+      def raw_connection_or_connection
+        defined?(@raw_connection) ? @raw_connection : @connection
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/controllers/aml/reject_reasons_controller_spec.rb b/spec/controllers/aml/reject_reasons_controller_spec.rb
index 6eee798e..5a2e9679 100644
--- a/spec/controllers/aml/reject_reasons_controller_spec.rb
+++ b/spec/controllers/aml/reject_reasons_controller_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe AML::RejectReasonsController, type: :controller do
   routes { AML::Engine.routes }
   let(:aml_reason) { create(:aml_reject_reason, :order_reason) }
-  let(:kind) { 'order_document_reason' }
+  let(:kind) { :order_document_reason }
 
   let(:operator) { create :aml_operator, :administrator }
   let(:user) { DummyUser.new(aml_operator: operator) }
diff --git a/spec/dummy/.ruby-version b/spec/dummy/.ruby-version
old mode 100755
new mode 100644
index e118be51..f092941a
--- a/spec/dummy/.ruby-version
+++ b/spec/dummy/.ruby-version
@@ -1 +1 @@
-ruby-2.4.4
\ No newline at end of file
+3.2.8
diff --git a/spec/dummy/app/assets/config/manifest.js b/spec/dummy/app/assets/config/manifest.js
index 13d968b3..5155a1a1 100755
--- a/spec/dummy/app/assets/config/manifest.js
+++ b/spec/dummy/app/assets/config/manifest.js
@@ -1,4 +1,5 @@
 //= link_tree ../images
 //= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
+//= link application.css
 //= link aml_manifest.js
diff --git a/spec/dummy/app/assets/javascripts/application.js b/spec/dummy/app/assets/javascripts/application.js
index e99f4a1f..22dab352 100755
--- a/spec/dummy/app/assets/javascripts/application.js
+++ b/spec/dummy/app/assets/javascripts/application.js
@@ -16,7 +16,6 @@
 //= require moment/ru
 //= require bootstrap
 //= require bootstrap-datetimepicker
-//= require activestorage
 //= require turbolinks
 //= require noty_flash
 //= require best_in_place
diff --git a/spec/dummy/app/assets/javascripts/cable.js b/spec/dummy/app/assets/javascripts/cable.js
deleted file mode 100755
index 739aa5f0..00000000
--- a/spec/dummy/app/assets/javascripts/cable.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Action Cable provides the framework to deal with WebSockets in Rails.
-// You can generate new channels where WebSocket features live using the `rails generate channel` command.
-//
-//= require action_cable
-//= require_self
-//= require_tree ./channels
-
-(function() {
-  this.App || (this.App = {});
-
-  App.cable = ActionCable.createConsumer();
-
-}).call(this);
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index 83568cff..bb296890 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -1,13 +1,23 @@
 require_relative 'boot'
 
-require 'rails/all'
+# Fix Ruby 3.2+ Rails 6.1 compatibility by ensuring Logger is loaded
+require 'logger'
+
+# Require Rails components individually to avoid logger issues
+require 'active_model/railtie'
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'action_mailer/railtie'
+require 'rails/test_unit/railtie'
+require 'sprockets/railtie'
+require 'active_storage/engine'
 
 Bundler.require(*Rails.groups)
 
 require 'archivable'
 require 'sorcery'
 require "aml"
-require 'enumerize'
 require 'authority'
 require 'carrierwave'
 require 'valid_email'
@@ -16,7 +26,7 @@
 require 'money'
 require 'money-rails'
 require 'slim-rails'
-require 'axlsx_rails'
+require 'caxlsx_rails'
 require 'kaminari'
 require 'jquery-rails'
 require 'jquery-ui-rails'
@@ -38,12 +48,17 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    # config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
     # the framework and any gems in your application.
+
+    # Fix Money rounding mode warning
+    config.after_initialize do
+      Money.rounding_mode = BigDecimal::ROUND_HALF_UP
+    end
   end
 end
 
diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb
index c9aef85d..d4d4f8d1 100644
--- a/spec/dummy/config/boot.rb
+++ b/spec/dummy/config/boot.rb
@@ -1,5 +1,15 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../Gemfile', __dir__)
 
+require 'logger'
+
+# Fix for Ruby 3.2+ and Rails 6.1 compatibility
+module ActiveSupport
+  module LoggerThreadSafeLevel
+    Logger = ::Logger
+  end
+end
+
+require 'concurrent-ruby'
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)
diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml
index 5af6cc6f..ab0230b1 100755
--- a/spec/dummy/config/database.yml
+++ b/spec/dummy/config/database.yml
@@ -8,9 +8,10 @@ default: &default
   adapter: mysql2
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
   timeout: 5000
-  username: <%= ENV['MYSQL_USERNAME'] %>
-  # The password associated with the postgres role (username).
-  password: <%= ENV['MYSQL_PASSWORD'] %>
+  username: <%= ENV.fetch('MYSQL_USERNAME') { 'root' } %>
+  host: <%= ENV.fetch('MYSQL_HOST') { '127.0.0.1' } %>
+  # The password associated with the mysql role (username).
+  password: <%= ENV.fetch('MYSQL_PASSWORD') { 'password' } %>
 
 development:
   <<: *default
@@ -21,4 +22,4 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: aml_dummy_test
+  database: <%= ENV.fetch('MYSQL_DATABASE', 'aml_dummy_test') %>
diff --git a/spec/dummy/config/environment.rb b/spec/dummy/config/environment.rb
index 426333bb..b675920f 100644
--- a/spec/dummy/config/environment.rb
+++ b/spec/dummy/config/environment.rb
@@ -2,4 +2,5 @@
 require_relative 'application'
 
 # Initialize the Rails application.
+require 'logger'
 Rails.application.initialize!
diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
index 0a38fd3c..add0530c 100644
--- a/spec/dummy/config/environments/test.rb
+++ b/spec/dummy/config/environments/test.rb
@@ -29,7 +29,8 @@
   config.action_controller.allow_forgery_protection = false
 
   # Store uploaded files on the local file system in a temporary directory
-  config.active_storage.service = :test
+  # Note: This project uses CarrierWave, not Active Storage
+  # config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false
 
@@ -41,6 +42,13 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Fix timezone deprecation warning for Rails 8.1
+  config.active_support.to_time_preserves_timezone = :zone
+
+  # Configure assets for test environment
+  config.assets.compile = true
+  config.assets.digest = false
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb
index f417f5e7..72227999 100644
--- a/spec/dummy/db/schema.rb
+++ b/spec/dummy/db/schema.rb
@@ -2,18 +2,17 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_01_23_055912) do
-
-  create_table "aml_agreement_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_agreement_id", null: false
+ActiveRecord::Schema[8.0].define(version: 2019_01_23_055912) do
+  create_table "aml_agreement_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_agreement_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -23,14 +22,14 @@
     t.index ["locale"], name: "index_aml_agreement_translations_on_locale"
   end
 
-  create_table "aml_agreements", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_agreements", charset: "utf8", force: :cascade do |t|
     t.string "url"
     t.timestamp "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
-  create_table "aml_check_lists", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_check_lists", charset: "utf8", force: :cascade do |t|
     t.string "title", null: false
     t.string "url"
     t.integer "position", default: 0, null: false
@@ -40,7 +39,7 @@
     t.index ["title"], name: "index_aml_check_lists_on_title", unique: true
   end
 
-  create_table "aml_client_agreements", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_client_agreements", charset: "utf8", force: :cascade do |t|
     t.bigint "aml_client_id", null: false
     t.bigint "aml_agreement_id", null: false
     t.string "remote_ip", null: false
@@ -53,7 +52,7 @@
     t.index ["aml_client_id"], name: "index_aml_client_agreements_on_aml_client_id"
   end
 
-  create_table "aml_client_infos", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_client_infos", charset: "utf8", force: :cascade do |t|
     t.bigint "aml_client_id", null: false
     t.string "first_name"
     t.string "maiden_name"
@@ -73,7 +72,7 @@
     t.index ["aml_client_id"], name: "index_aml_client_infos_on_aml_client_id_uniq", unique: true
   end
 
-  create_table "aml_clients", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_clients", charset: "utf8", force: :cascade do |t|
     t.string "first_name"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -98,7 +97,7 @@
     t.index ["orders_count"], name: "index_aml_clients_on_orders_count"
   end
 
-  create_table "aml_document_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_document_fields", charset: "utf8", force: :cascade do |t|
     t.string "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -108,7 +107,7 @@
     t.index ["order_document_id", "document_kind_field_definition_id"], name: "client_document_fields_index", unique: true
   end
 
-  create_table "aml_document_group_to_statuses", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_document_group_to_statuses", charset: "utf8", force: :cascade do |t|
     t.bigint "aml_document_group_id", null: false
     t.bigint "aml_status_id", null: false
     t.index ["aml_document_group_id", "aml_status_id"], name: "aml_dgts_uniq", unique: true
@@ -116,8 +115,8 @@
     t.index ["aml_status_id"], name: "index_aml_document_group_to_statuses_on_aml_status_id"
   end
 
-  create_table "aml_document_group_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_document_group_id", null: false
+  create_table "aml_document_group_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_document_group_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -127,7 +126,7 @@
     t.index ["locale"], name: "index_aml_document_group_translations_on_locale"
   end
 
-  create_table "aml_document_groups", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_document_groups", charset: "utf8", force: :cascade do |t|
     t.integer "position", null: false
     t.timestamp "archived_at"
     t.datetime "created_at", null: false
@@ -135,8 +134,8 @@
     t.boolean "card_required", default: false, null: false
   end
 
-  create_table "aml_document_kind_field_definition_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_document_kind_field_definition_id", null: false
+  create_table "aml_document_kind_field_definition_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_document_kind_field_definition_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -145,7 +144,7 @@
     t.index ["locale"], name: "index_aml_document_kind_field_definition_translations_on_locale"
   end
 
-  create_table "aml_document_kind_field_definitions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_document_kind_field_definitions", charset: "utf8", force: :cascade do |t|
     t.string "key", null: false
     t.datetime "archived_at"
     t.datetime "created_at", null: false
@@ -155,8 +154,8 @@
     t.index ["document_kind_id", "key"], name: "index_aml_document_kind_field_definitions_on_key", unique: true
   end
 
-  create_table "aml_document_kind_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_document_kind_id", null: false
+  create_table "aml_document_kind_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_document_kind_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -167,7 +166,7 @@
     t.index ["locale"], name: "index_aml_document_kind_translations_on_locale"
   end
 
-  create_table "aml_document_kinds", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_document_kinds", charset: "utf8", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.timestamp "archived_at"
@@ -178,7 +177,7 @@
     t.index ["aml_document_group_id"], name: "index_aml_document_kinds_on_aml_document_group_id"
   end
 
-  create_table "aml_notification_templates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_notification_templates", charset: "utf8", force: :cascade do |t|
     t.string "locale", null: false
     t.string "template_id"
     t.datetime "created_at", null: false
@@ -188,7 +187,7 @@
     t.index ["aml_notification_id"], name: "index_aml_notification_templates_on_aml_notification_id"
   end
 
-  create_table "aml_notifications", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_notifications", charset: "utf8", force: :cascade do |t|
     t.string "title", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -196,7 +195,7 @@
     t.index ["title"], name: "index_aml_notifications_on_title", unique: true
   end
 
-  create_table "aml_operators", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_operators", charset: "utf8", force: :cascade do |t|
     t.string "legacy_email"
     t.string "crypted_password"
     t.string "salt"
@@ -216,7 +215,7 @@
     t.index ["reset_password_token"], name: "index_aml_operators_on_reset_password_token"
   end
 
-  create_table "aml_order_checks", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_order_checks", charset: "utf8", force: :cascade do |t|
     t.bigint "aml_order_id", null: false
     t.bigint "aml_check_list_id", null: false
     t.string "workflow_state", default: "none", null: false
@@ -227,7 +226,7 @@
     t.index ["aml_order_id"], name: "index_aml_order_checks_on_aml_order_id"
   end
 
-  create_table "aml_order_documents", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_order_documents", charset: "utf8", force: :cascade do |t|
     t.bigint "document_kind_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -242,7 +241,7 @@
     t.index ["order_id"], name: "index_aml_order_documents_on_order_id"
   end
 
-  create_table "aml_orders", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_orders", charset: "utf8", force: :cascade do |t|
     t.string "first_name"
     t.string "surname"
     t.string "patronymic"
@@ -273,7 +272,7 @@
     t.index ["workflow_state", "pending_at"], name: "index_aml_orders_on_workflow_state_and_pending_at"
   end
 
-  create_table "aml_payment_card_orders", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_payment_card_orders", charset: "utf8", force: :cascade do |t|
     t.string "card_brand"
     t.string "card_bin"
     t.string "card_suffix"
@@ -293,7 +292,7 @@
     t.index ["workflow_state", "pending_at"], name: "index_aml_payment_card_orders_on_workflow_state_and_pending_at"
   end
 
-  create_table "aml_payment_cards", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_payment_cards", charset: "utf8", force: :cascade do |t|
     t.string "card_brand", null: false
     t.string "card_bin", limit: 8, null: false
     t.string "card_suffix", limit: 4, null: false
@@ -306,8 +305,8 @@
     t.index ["aml_payment_card_order_id"], name: "index_aml_payment_cards_on_aml_payment_card_order_id"
   end
 
-  create_table "aml_reject_reason_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_reject_reason_id", null: false
+  create_table "aml_reject_reason_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_reject_reason_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -316,15 +315,15 @@
     t.index ["locale"], name: "index_aml_reject_reason_translations_on_locale"
   end
 
-  create_table "aml_reject_reasons", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_reject_reasons", charset: "utf8", force: :cascade do |t|
     t.timestamp "archived_at"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "kind", null: false
   end
 
-  create_table "aml_status_translations", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
-    t.integer "aml_status_id", null: false
+  create_table "aml_status_translations", charset: "utf8", force: :cascade do |t|
+    t.bigint "aml_status_id", null: false
     t.string "locale", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -334,7 +333,7 @@
     t.index ["locale"], name: "index_aml_status_translations_on_locale"
   end
 
-  create_table "aml_statuses", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "aml_statuses", charset: "utf8", force: :cascade do |t|
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "position", null: false
diff --git a/spec/models/aml/order_spec.rb b/spec/models/aml/order_spec.rb
index 40bf7be5..f85d30c4 100644
--- a/spec/models/aml/order_spec.rb
+++ b/spec/models/aml/order_spec.rb
@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 RSpec.describe AML::Order, type: :model do
+  let(:risk_category) { AML::Client.risk_categories.values.first }
   let!(:aml_document_kind) { create :aml_document_kind }
   let(:aml_status) { create :aml_status, :default }
   let!(:aml_client) {
     create :aml_client,
     aml_status: aml_status,
-    risk_category: AML::Client.risk_category.values.first
+    risk_category:
   }
   let!(:operator) { create :aml_operator }
 
@@ -37,9 +38,7 @@
   end
 
   describe 'при создани изаявки она становится текущей' do
-    let!(:client) { create :aml_client, first_name: nil,
-                    risk_category: AML::Client.risk_category.values.first
-    }
+    let!(:client) { create :aml_client, first_name: nil, risk_category: }
 
     context 'статус клиента обновляется если принятая заявка его увеличивает' do
       let!(:status2) { create :aml_status, position: aml_status.position + 1 }
@@ -121,7 +120,7 @@
 
         context 'можно принять заявку если документы приняты' do
           before do
-            subject.client.update_column :risk_category, AML::Client.risk_category.values.first
+            subject.client.update_column :risk_category, risk_category
             subject.order_documents.take.accept!
             subject.accept!
           end
diff --git a/spec/models/aml/payment_card_order_spec.rb b/spec/models/aml/payment_card_order_spec.rb
index 4940ee32..fec18b98 100644
--- a/spec/models/aml/payment_card_order_spec.rb
+++ b/spec/models/aml/payment_card_order_spec.rb
@@ -42,7 +42,7 @@
     end
 
     context 'when notify' do
-      let(:notification_key) { :on_pending_notification }
+      let(:notification_key) { 'on_pending_notification' }
       let!(:notification)    { create :aml_notification, key: notification_key }
       let(:template_id)      { SecureRandom.hex(6) }
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 9408b9ae..f9bca5f4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -40,7 +40,11 @@
 RSpec.configure do |config|
   config.full_backtrace = ENV['RSPEC_SKIP_BACKTRACE'].blank?
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # config.fixture_path = "#{::Rails.root}/spec/fixtures" # Deprecated in newer RSpec versions
+
+  # Disable fixtures since we use FactoryBot
+  config.use_transactional_fixtures = false
+
   config.include FactoryBot::Syntax::Methods
   config.include Sorcery::TestHelpers::Rails::Controller, type: :controller
   config.include Sorcery::TestHelpers::Rails::Integration, type: :feature
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index da99ba9f..976c12e3 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,6 +7,10 @@
 require 'factory_bot'
 require 'pry'
 
+# Load DatabaseRewinder patch to fix MySQL connection password issue
+require_relative '../lib/database_rewinder_patch'
+
+
 # Плохо работает с DatabaseRewinder :(
 # require 'test_prof/recipes/rspec/let_it_be'
 #
@@ -34,6 +38,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  config.include ActionDispatch::TestProcess::FixtureFile
 	config.backtrace_exclusion_patterns = [
 		/\/lib\d*\/ruby\//,
 		/bin\//,
@@ -58,6 +63,8 @@
 	end
 
 	config.before(:suite) do
+    # Ensure database connection is established before cleaning
+    ActiveRecord::Base.connection
     DatabaseRewinder.clean_all
     FactoryBot.find_definitions
   end
diff --git a/spec/test_files/test.png b/spec/test_files/test.png
new file mode 100644
index 00000000..8c503ca6
Binary files /dev/null and b/spec/test_files/test.png differ