From 003e5087c437c1a3e2da49b97cdf6edd89dae35a Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 10:57:06 +0100
Subject: [PATCH 01/18] Updated gems

---
 Gemfile      |   5 +-
 Gemfile.lock | 749 ++++++++++++++++++++++++++-------------------------
 2 files changed, 381 insertions(+), 373 deletions(-)

diff --git a/Gemfile b/Gemfile
index c33d842b..2a4a0e58 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 ruby '3.1.4'
 
-gem 'rails', '~> 6.1.7', '>= 6.1.7.9'
+gem 'rails', '~> 7.0.0'
 gem 'pg', '~> 1.2'
 gem 'puma', '~> 5.6.9'
 
@@ -64,6 +64,9 @@ gem 'jwt', '~> 2.6'
 gem 'grpc', '~> 1.53.2'
 gem 'aasm', '~> 5.1', '>= 5.1.1'
 
+# for upgrading rails to 7.0. This line can be removed after upgrading to rails 7.1
+gem 'concurrent-ruby', '1.3.4'
+
 group :development, :test do
   gem 'bundler-audit'
   gem 'bullet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ee327ec..634c58ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,296 +5,280 @@ GEM
       concurrent-ruby (~> 1.0)
     action-cable-testing (0.6.1)
       actioncable (>= 5.0)
-    actioncable (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    actioncable (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      activejob (= 6.1.7.9)
-      activerecord (= 6.1.7.9)
-      activestorage (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    actionmailbox (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      actionview (= 6.1.7.9)
-      activejob (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.9)
-      actionview (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8.7)
+      actionview (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      activerecord (= 6.1.7.9)
-      activestorage (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    actiontext (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.9)
-      activesupport (= 6.1.7.9)
+    actionview (7.0.8.7)
+      activesupport (= 7.0.8.7)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_model_serializers (0.10.14)
+    active_model_serializers (0.10.15)
       actionpack (>= 4.1)
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    active_storage_validations (0.9.3)
-      rails (>= 5.2.0)
-    activejob (6.1.7.9)
-      activesupport (= 6.1.7.9)
+    active_storage_validations (1.4.0)
+      activejob (>= 6.1.4)
+      activemodel (>= 6.1.4)
+      activestorage (>= 6.1.4)
+      activesupport (>= 6.1.4)
+      marcel (>= 1.0.3)
+    activejob (7.0.8.7)
+      activesupport (= 7.0.8.7)
       globalid (>= 0.3.6)
     activejob-cancel (0.3.2)
       activejob (>= 4.2.0)
       activesupport (>= 4.2.0)
-    activemodel (6.1.7.9)
-      activesupport (= 6.1.7.9)
-    activerecord (6.1.7.9)
-      activemodel (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
-    activerecord_json_validator (1.3.0)
-      activerecord (>= 4.2.0, < 7)
-      json-schema (~> 2.8)
-    activestorage (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      activejob (= 6.1.7.9)
-      activerecord (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    activemodel (7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activerecord (7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
+    activerecord_json_validator (3.0.0)
+      activerecord (>= 4.2.0, < 8)
+      json_schemer (~> 2.2)
+    activestorage (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.9)
+    activesupport (7.0.8.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    argon2 (2.0.3)
-      ffi (~> 1.14)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    argon2 (2.3.0)
+      ffi (~> 1.15)
       ffi-compiler (~> 1.0)
-    argon2-kdf (0.1.6)
+    argon2-kdf (0.3.0)
+      fiddle
     ast (2.4.2)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.455.0)
-    aws-sdk-core (3.114.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.43.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.94.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.1041.0)
+    aws-sdk-core (3.216.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.97.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.178.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.3)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
-    benchmark-ips (2.10.0)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    benchmark-ips (2.14.0)
     benchmark-malloc (0.2.0)
     benchmark-perf (0.6.0)
     benchmark-trend (0.4.0)
-    blind_index (2.5.0)
-      activesupport (>= 6.1)
-      argon2-kdf (>= 0.1.1)
-    bootsnap (1.18.3)
+    bigdecimal (3.1.9)
+    blind_index (2.6.1)
+      activesupport (>= 7)
+      argon2-kdf (>= 0.2)
+    bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet (7.2.0)
+    bullet (8.0.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bump (0.10.0)
-    bundler-audit (0.9.1)
+    bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    cancancan (3.2.1)
+    cancancan (3.6.1)
     case_transform (0.2)
       activesupport
-    childprocess (4.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     coderay (1.1.3)
-    colorize (0.8.1)
-    concurrent-ruby (1.3.3)
-    config (3.1.0)
+    concurrent-ruby (1.3.4)
+    config (5.5.2)
       deep_merge (~> 1.2, >= 1.2.1)
-      dry-validation (~> 1.0, >= 1.0.0)
-    connection_pool (2.4.1)
-    countries (3.1.0)
-      i18n_data (~> 0.11.0)
-      sixarm_ruby_unaccent (~> 1.1)
-      unicode_utils (~> 1.4)
-    crack (0.4.5)
+      ostruct
+    connection_pool (2.5.0)
+    countries (7.1.0)
+      unaccent (~> 0.3)
+    crack (1.0.0)
+      bigdecimal
       rexml
     crass (1.0.6)
-    database_cleaner-active_record (2.1.0)
+    csv (3.3.2)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
-    deep_merge (1.2.1)
-    dentaku (3.4.1)
+    date (3.4.1)
+    deep_merge (1.2.2)
+    dentaku (3.5.4)
+      bigdecimal
+      concurrent-ruby
     devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise-argon2 (1.1.0)
-      argon2 (~> 2.0)
-      devise (>= 2.1.0)
-      devise-encryptable (>= 0.2.0)
-    devise-encryptable (0.2.0)
-      devise (>= 2.1.0)
+    devise-argon2 (2.0.2)
+      argon2 (~> 2.1)
+      devise (~> 4.0)
     devise_invitable (2.0.9)
       actionmailer (>= 5.0)
       devise (>= 4.6)
-    devise_token_auth (1.2.3)
+    devise_token_auth (1.2.5)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
-      rails (>= 4.2.0, < 7.2)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
-    dotenv-rails (2.7.6)
-      dotenv (= 2.7.6)
-      railties (>= 3.2)
-    dry-configurable (0.12.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5.0)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    dry-inflector (0.2.0)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-schema (1.6.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.8, >= 0.8.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-types (1.5.1)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.6.0)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.4)
-      dry-equalizer (~> 0.2)
-      dry-initializer (~> 3.0)
-      dry-schema (~> 1.5, >= 1.5.2)
-    erubi (1.13.0)
+      rails (>= 4.2.0, < 8.1)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    domain_name (0.6.20240107)
+    dotenv (3.1.7)
+    dotenv-rails (3.1.7)
+      dotenv (= 3.1.7)
+      railties (>= 6.1)
+    erubi (1.13.1)
     factory_bot (6.5.0)
       activesupport (>= 5.0.0)
-    factory_bot_rails (6.4.3)
-      factory_bot (~> 6.4)
+    factory_bot_rails (6.4.4)
+      factory_bot (~> 6.5)
       railties (>= 5.0.0)
-    faker (2.17.0)
-      i18n (>= 1.6, < 2)
-    faraday (1.4.1)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
+    faker (3.5.1)
+      i18n (>= 1.8.11, < 2)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
-    faraday-encoding (0.0.5)
+    faraday-encoding (0.0.6)
       faraday
-    faraday-excon (1.1.0)
-    faraday-http-cache (2.4.1)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-gzip (1.0.0)
+      faraday (>= 1.0)
+      zlib (~> 2.1)
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
-    fasterer (0.9.0)
-      colorize (~> 0.7)
-      ruby_parser (>= 3.14.1)
-    fastimage (2.2.6)
-    ffi (1.15.0)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
+    fasterer (0.11.0)
+      ruby_parser (>= 3.19.1)
+    fastimage (2.4.0)
+    ffi (1.17.1)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
       rake
-    formatador (0.2.5)
-    gapic-common (0.4.1)
-      faraday (~> 1.3)
-      google-protobuf (~> 3.15, >= 3.15.2)
-      googleapis-common-protos (>= 1.3.11, < 2.0)
-      googleapis-common-protos-types (>= 1.0.6, < 2.0)
-      googleauth (~> 0.15, >= 0.15.1)
+    fiddle (1.1.6)
+    formatador (1.1.0)
+    gapic-common (0.20.0)
+      faraday (>= 1.9, < 3.a)
+      faraday-retry (>= 1.0, < 3.a)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos (>= 1.3.12, < 2.a)
+      googleapis-common-protos-types (>= 1.3.1, < 2.a)
+      googleauth (~> 1.0)
       grpc (~> 1.36)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-cloud-core (1.7.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-text_to_speech (1.2.0)
-      google-cloud-core (~> 1.5)
-      google-cloud-text_to_speech-v1 (~> 0.0)
-      google-cloud-text_to_speech-v1beta1 (~> 0.0)
-    google-cloud-text_to_speech-v1 (0.4.0)
-      gapic-common (~> 0.3)
+    google-cloud-env (2.2.1)
+      faraday (>= 1.0, < 3.a)
+    google-cloud-errors (1.4.0)
+    google-cloud-text_to_speech (1.5.0)
+      google-cloud-core (~> 1.6)
+      google-cloud-text_to_speech-v1 (>= 0.9, < 2.a)
+      google-cloud-text_to_speech-v1beta1 (>= 0.10, < 2.a)
+    google-cloud-text_to_speech-v1 (0.11.1)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-text_to_speech-v1beta1 (0.6.0)
-      gapic-common (~> 0.4)
+    google-cloud-text_to_speech-v1beta1 (0.12.1)
+      gapic-common (>= 0.20.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-translate-v2 (0.3.0)
-      faraday (>= 0.17.3, < 2.0)
-      google-cloud-core (~> 1.5)
-      googleapis-common-protos (>= 1.3.10, < 2.0)
-      googleapis-common-protos-types (>= 1.0.5, < 2.0)
-      googleauth (~> 0.12)
+    google-cloud-translate-v2 (1.0.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-core (~> 1.6)
+      googleapis-common-protos (>= 1.3.10, < 2.a)
+      googleapis-common-protos-types (>= 1.0.5, < 2.a)
+      googleauth (>= 0.16.2, < 2.a)
+    google-logging-utils (0.1.0)
     google-protobuf (3.25.5)
-    googleapis-common-protos (1.3.11)
-      google-protobuf (~> 3.14)
-      googleapis-common-protos-types (>= 1.0.6, < 2.0)
-      grpc (~> 1.27)
-    googleapis-common-protos-types (1.0.6)
-      google-protobuf (~> 3.14)
-    googleauth (0.16.2)
-      faraday (>= 0.17.3, < 2.0)
+    googleapis-common-protos (1.6.0)
+      google-protobuf (>= 3.18, < 5.a)
+      googleapis-common-protos-types (~> 1.7)
+      grpc (~> 1.41)
+    googleapis-common-protos-types (1.18.0)
+      google-protobuf (>= 3.18, < 5.a)
+    googleauth (1.12.2)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
+      signet (>= 0.16, < 2.a)
     grpc (1.53.2)
       google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
-    guard (2.16.2)
+    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-compat (1.2.1)
@@ -305,73 +289,85 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    hashdiff (1.0.1)
+    hana (1.3.7)
+    hashdiff (1.1.2)
     hiredis (0.6.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
-    i18n (1.14.5)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    i18n_data (0.11.0)
     iniparse (1.5.0)
-    jmespath (1.6.1)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
+    jmespath (1.6.2)
+    json (2.9.1)
+    json_schemer (2.3.0)
+      bigdecimal
+      hana (~> 1.3)
+      regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
     jsonapi-renderer (0.2.2)
     jsonapi-serializer (2.2.0)
       activesupport (>= 4.2)
-    jwt (2.7.1)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    letter_opener (1.7.0)
-      launchy (~> 2.2)
-    letter_opener_web (2.0.0)
-      actionmailer (>= 5.2)
-      letter_opener (~> 1.7)
-      railties (>= 5.2)
+    jwt (2.10.1)
+      base64
+    language_server-protocol (3.17.0.3)
+    launchy (3.0.1)
+      addressable (~> 2.8)
+      childprocess (~> 5.0)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
+    letter_opener_web (3.0.0)
+      actionmailer (>= 6.1)
+      letter_opener (~> 1.9)
+      railties (>= 6.1)
       rexml
-    license_finder (6.13.0)
+    license_finder (7.2.1)
       bundler
+      csv (~> 3.2)
       rubyzip (>= 1, < 3)
-      thor (~> 1.0.1)
+      thor (~> 1.2)
       tomlrb (>= 1.3, < 2.1)
       with_env (= 1.1.0)
-      xml-simple (~> 1.1.5)
-    listen (3.5.1)
+      xml-simple (~> 1.1.9)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lockbox (0.6.4)
-    logstop (0.2.7)
-    loofah (2.23.1)
+    lockbox (2.0.1)
+    logger (1.6.5)
+    logstop (0.4.1)
+      logger
+    loofah (2.24.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.8)
+    lumberjack (1.2.10)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
       net-pop
       net-smtp
     marcel (1.0.4)
-    memoist (0.16.2)
-    metainspector (5.12.1)
-      addressable (~> 2.7)
-      faraday (>= 1.4, < 3.0)
+    metainspector (5.15.0)
+      addressable (~> 2.8.4)
+      faraday (~> 2.5)
       faraday-cookie_jar (~> 0.0)
       faraday-encoding (~> 0.0)
-      faraday-http-cache (~> 2.2)
-      faraday_middleware (~> 1.0)
+      faraday-follow_redirects (~> 0.3)
+      faraday-gzip (>= 0.1, < 2.0)
+      faraday-http-cache (~> 2.5)
+      faraday-retry (~> 2.0)
       fastimage (~> 2.2)
       nesty (~> 1.0)
-      nokogiri (~> 1.11)
+      nokogiri (~> 1.13)
     method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
-    minitest (5.23.1)
-    msgpack (1.7.2)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
+    msgpack (1.7.5)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
     nenv (0.3.0)
     nesty (1.0.2)
-    net-imap (0.4.13)
+    net-http (0.6.0)
+      uri
+    net-imap (0.5.5)
       date
       net-protocol
     net-pop (0.1.2)
@@ -380,194 +376,198 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.3)
-    nokogiri (1.17.1)
+    nio4r (2.7.4)
+    nokogiri (1.18.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (3.11.5)
+    oj (3.16.9)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     orm_adapter (0.5.0)
-    os (1.1.1)
-    overcommit (0.57.0)
-      childprocess (>= 0.6.3, < 5)
+    os (1.1.4)
+    ostruct (0.6.1)
+    overcommit (0.64.1)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
+      rexml (>= 3.3.9)
     pagy (4.11.0)
-    paper_trail (15.1.0)
+    paper_trail (16.0.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.20.1)
-    paranoia (2.6.3)
+    parallel (1.26.3)
+    paranoia (2.6.4)
       activerecord (>= 5.1, < 7.2)
-    parser (3.0.1.1)
+    parser (3.3.7.0)
       ast (~> 2.4.1)
-    pg (1.2.3)
-    pgsync (0.6.7)
+      racc
+    pg (1.5.9)
+    pgsync (0.8.0)
+      bigdecimal
       parallel
       pg (>= 0.18.2)
-      slop (>= 4.8.2)
+      slop (>= 4.10.1)
       tty-spinner
-    phonelib (0.6.50)
+    phonelib (0.10.3)
     postgresql_cursor (0.6.9)
       activerecord (>= 6.0)
-    pry (0.13.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
+    pry-byebug (3.10.1)
       byebug (~> 11.0)
-      pry (~> 0.13.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    public_suffix (4.0.6)
+      pry (>= 0.13, < 0.15)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
+    public_suffix (6.0.1)
     puma (5.6.9)
       nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (2.2.9)
-    rack-attack (6.5.0)
-      rack (>= 1.0, < 3)
-    rack-cors (1.1.1)
+    racc (1.8.1)
+    rack (2.2.10)
+    rack-attack (6.7.0)
+      rack (>= 1.0, < 4)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
-    rack-test (2.1.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
-    rails (6.1.7.9)
-      actioncable (= 6.1.7.9)
-      actionmailbox (= 6.1.7.9)
-      actionmailer (= 6.1.7.9)
-      actionpack (= 6.1.7.9)
-      actiontext (= 6.1.7.9)
-      actionview (= 6.1.7.9)
-      activejob (= 6.1.7.9)
-      activemodel (= 6.1.7.9)
-      activerecord (= 6.1.7.9)
-      activestorage (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    rails (7.0.8.7)
+      actioncable (= 7.0.8.7)
+      actionmailbox (= 7.0.8.7)
+      actionmailer (= 7.0.8.7)
+      actionpack (= 7.0.8.7)
+      actiontext (= 7.0.8.7)
+      actionview (= 7.0.8.7)
+      activejob (= 7.0.8.7)
+      activemodel (= 7.0.8.7)
+      activerecord (= 7.0.8.7)
+      activestorage (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.9)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8.7)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.1)
+    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)
-    railties (6.1.7.9)
-      actionpack (= 6.1.7.9)
-      activesupport (= 6.1.7.9)
+    railties (7.0.8.7)
+      actionpack (= 7.0.8.7)
+      activesupport (= 7.0.8.7)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.2.1)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    redis (4.5.1)
-    redis-client (0.22.1)
+    redis (5.3.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.23.2)
       connection_pool
-    regexp_parser (2.1.1)
-    request_store (1.5.0)
+    regexp_parser (2.10.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
+    rexml (3.4.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
     rspec-benchmark (0.6.0)
       benchmark-malloc (~> 0.2)
       benchmark-perf (~> 0.6)
       benchmark-trend (~> 0.4)
       rspec (>= 3.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    rubocop (1.24.1)
+      rspec-support (~> 3.13.0)
+    rspec-rails (7.1.0)
+      actionpack (>= 7.0)
+      activesupport (>= 7.0)
+      railties (>= 7.0)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.2)
+    rubocop (1.70.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.2)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.19.1)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.23.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.29.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    rubocop-rspec (2.11.1)
-      rubocop (~> 1.19)
-    rubocop-thread_safety (0.4.2)
-      rubocop (>= 0.53.0)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.4.0)
+      rubocop (~> 1.61)
+    rubocop-thread_safety (0.6.0)
+      rubocop (>= 1.48.1)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
-    rubyzip (2.3.0)
-    secure_headers (6.3.2)
-    sentry-rails (5.7.0)
+    ruby_parser (3.21.1)
+      racc (~> 1.5)
+      sexp_processor (~> 4.16)
+    rubyzip (2.4.1)
+    secure_headers (7.1.0)
+    sentry-rails (5.22.1)
       railties (>= 5.0)
-      sentry-ruby (~> 5.7.0)
-    sentry-ruby (5.7.0)
+      sentry-ruby (~> 5.22.1)
+    sentry-ruby (5.22.1)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
-    sexp_processor (4.15.2)
+    sexp_processor (4.17.3)
     shellany (0.0.1)
-    shoulda-matchers (4.5.1)
-      activesupport (>= 4.2.0)
-    sidekiq (7.2.4)
-      concurrent-ruby (< 2)
+    shoulda-matchers (6.4.0)
+      activesupport (>= 5.2.0)
+    sidekiq (7.3.8)
+      base64
       connection_pool (>= 2.3.0)
+      logger
       rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+      redis-client (>= 0.22.2)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    sixarm_ruby_unaccent (1.2.0)
-    slop (4.9.0)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    simpleidn (0.2.3)
+    slop (4.10.1)
     sql_query (0.7.4)
       activerecord (>= 3.2)
-    test-prof (1.0.5)
-    thor (1.0.1)
-    timecop (0.9.4)
-    timeout (0.4.1)
-    tomlrb (2.0.1)
+    test-prof (1.4.4)
+    thor (1.3.2)
+    timecop (0.9.10)
+    timeout (0.4.3)
+    tomlrb (2.0.3)
     tty-cursor (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
@@ -577,28 +577,32 @@ GEM
       nokogiri (>= 1.6, < 2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.5.0)
-    unicode_utils (1.4.0)
-    uniform_notifier (1.14.2)
+    unaccent (0.4.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uniform_notifier (1.16.0)
+    uri (1.0.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.18.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.6)
+    websocket-driver (0.7.7)
+      base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    wicked_pdf (2.8.1)
+    wicked_pdf (2.8.2)
       activesupport
+      ostruct
     with_env (1.1.0)
-    wkhtmltopdf-binary (0.12.6.6)
+    wkhtmltopdf-binary (0.12.6.8)
     wkhtmltopdf-heroku (2.12.6.0)
-    xml-simple (1.1.8)
-    zeitwerk (2.6.16)
+    xml-simple (1.1.9)
+      rexml
+    zeitwerk (2.6.18)
+    zlib (2.1.1)
 
 PLATFORMS
   ruby
@@ -619,6 +623,7 @@ DEPENDENCIES
   bump
   bundler-audit
   cancancan
+  concurrent-ruby (= 1.3.4)
   config
   connection_pool
   countries
@@ -664,7 +669,7 @@ DEPENDENCIES
   rack-attack
   rack-cors
   rack-test
-  rails (~> 6.1.7, >= 6.1.7.9)
+  rails (~> 7.0.0)
   rails-html-sanitizer (>= 1.6.1)
   redis
   rspec-benchmark

From b926ef7f3045da5f79ebea623f7e98f06e761f1c Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 11:02:59 +0100
Subject: [PATCH 02/18] Updated configs and missing imports

---
 config/application.rb                         |  34 +-
 config/environments/development.rb            |  12 +-
 config/environments/test.rb                   |  14 +-
 config/initializers/module_extensions.rb      |   1 +
 config/initializers/sentry.rb                 |   2 +
 ...e_storage_blobs_checksum.active_storage.rb |   8 +
 db/schema.rb                                  | 391 +++++++++---------
 7 files changed, 237 insertions(+), 225 deletions(-)
 create mode 100644 db/migrate/20250122154550_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb

diff --git a/config/application.rb b/config/application.rb
index 596f3cc5..254cde41 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,8 +1,6 @@
-# frozen_string_literal: true
+require_relative "boot"
 
-require_relative 'boot'
-
-require 'rails'
+require "rails"
 # Pick the frameworks you want:
 require 'active_model/railtie'
 require 'active_job/railtie'
@@ -25,31 +23,19 @@
 module CiasApi
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 6.0
+    config.load_defaults 7.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.
+    # Configuration for the application, engines, and railties goes here.
+    #
+    # These settings can be overridden in specific environments using the files
+    # in config/environments, which are processed later.
+    #
+    # config.time_zone = "Central Time (US & Canada)"
+    # config.eager_load_paths << Rails.root.join("extras")
 
     # Only loads a smaller set of middleware suitable for API only apps.
     # Middleware like session, flash, cookies can be added back manually.
     # Skip views, helpers and assets when generating a new resource.
     config.api_only = true
-
-    config.i18n.tap do |i18n|
-      i18n.available_locales = %i[en ar es]
-      i18n.default_locale = :en
-      i18n.enforce_available_locales = false
-      i18n.fallbacks = true
-    end
-
-    config.active_job.queue_adapter = :sidekiq
-    config.filter_parameters << :password_confirmation
-    config.middleware.insert_before(Rack::Sendfile, Rack::Deflater)
-    routes.default_url_options = { host: ENV['APP_HOSTNAME'] }
-    config.eager_load_paths += %W[#{config.root}/lib/rack]
-    config.middleware.use ActionDispatch::Flash
-    config.filter_parameters << %i[password password_confirmation email first_name last_name]
   end
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index b6393ccd..e6083fb5 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -18,6 +20,9 @@
   # Show full error reports.
   config.consider_all_requests_local = true
 
+  # Enable server timing
+  config.server_timing = true
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp/caching-dev.txt').exist?
@@ -33,7 +38,6 @@
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
-  config.active_storage.service_urls_expire_in = 1.month
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
@@ -43,6 +47,12 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d14cbf04..d77c0df7 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/integer/time"
+
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -8,6 +10,7 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application
@@ -32,9 +35,6 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Execute jobs immediately
-  config.active_job.queue_adapter = :inline
-
   # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
@@ -48,8 +48,14 @@
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raises error for missing translations.
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
 
   config.after_initialize { Bullet.enable = true }
 
diff --git a/config/initializers/module_extensions.rb b/config/initializers/module_extensions.rb
index 28856c42..d0918d30 100644
--- a/config/initializers/module_extensions.rb
+++ b/config/initializers/module_extensions.rb
@@ -2,5 +2,6 @@
 
 require 'action_cable/engine'
 require 'action_cable/subscription_adapter/redis'
+require_relative '../../app/channels/concerns/redis_adapter_overrides'
 
 ActionCable::SubscriptionAdapter::Redis.include(RedisAdapterOverrides)
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index f752c73d..7e76d397 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/parameter_filter"
+
 Sentry.init do |config|
   config.enabled_environments = %w[production]
   config.dsn = ENV['SENTRY_DSN']
diff --git a/db/migrate/20250122154550_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20250122154550_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 00000000..93c8b85a
--- /dev/null
+++ b/db/migrate/20250122154550_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 69a13b80..95005e06 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2024_10_04_130904) do
-
+ActiveRecord::Schema[7.0].define(version: 2025_01_22_154550) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "btree_gin"
   enable_extension "pgcrypto"
@@ -23,7 +22,7 @@
     t.uuid "record_id", null: false
     t.string "record_type", null: false
     t.uuid "blob_id", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
@@ -33,8 +32,8 @@
     t.string "content_type"
     t.text "metadata"
     t.bigint "byte_size", null: false
-    t.string "checksum", null: false
-    t.datetime "created_at", null: false
+    t.string "checksum"
+    t.datetime "created_at", precision: nil, null: false
     t.string "description"
     t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
@@ -49,15 +48,15 @@
   create_table "alert_phones", force: :cascade do |t|
     t.uuid "sms_plan_id", null: false
     t.bigint "phone_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "answers", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "type"
     t.uuid "question_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "user_session_id"
     t.text "body_ciphertext"
     t.boolean "skipped", default: false
@@ -74,8 +73,8 @@
   create_table "audios", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "sha256", null: false
     t.integer "usage_counter", default: 1
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "language"
     t.string "voice_type"
     t.index ["sha256", "language", "voice_type"], name: "index_audios_on_sha256_and_language_and_voice_type", unique: true
@@ -85,50 +84,50 @@
   create_table "cat_mh_google_tts_voices", force: :cascade do |t|
     t.integer "google_tts_voice_id"
     t.integer "cat_mh_language_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_languages", force: :cascade do |t|
     t.integer "language_id"
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_populations", force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_test_attributes", force: :cascade do |t|
     t.string "name"
     t.string "variable_type"
     t.string "range"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_test_type_languages", force: :cascade do |t|
     t.integer "cat_mh_language_id"
     t.integer "cat_mh_test_type_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_test_type_time_frames", force: :cascade do |t|
     t.integer "cat_mh_time_frame_id"
     t.integer "cat_mh_test_type_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_test_types", force: :cascade do |t|
     t.string "short_name"
     t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "cat_mh_population_id"
     t.index ["cat_mh_population_id"], name: "index_cat_mh_test_types_on_cat_mh_population_id"
   end
@@ -137,15 +136,15 @@
     t.integer "timeframe_id"
     t.string "description"
     t.string "short_name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "cat_mh_variables", force: :cascade do |t|
     t.bigint "cat_mh_test_attribute_id"
     t.bigint "cat_mh_test_type_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["cat_mh_test_attribute_id"], name: "index_cat_mh_variables_on_cat_mh_test_attribute_id"
     t.index ["cat_mh_test_type_id"], name: "index_cat_mh_variables_on_cat_mh_test_type_id"
   end
@@ -157,9 +156,9 @@
     t.uuid "health_clinic_id", null: false
     t.uuid "chart_id", null: false
     t.uuid "user_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "filled_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "filled_at", precision: nil
     t.index ["chart_id"], name: "index_chart_statistics_on_chart_id"
     t.index ["health_clinic_id"], name: "index_chart_statistics_on_health_clinic_id"
     t.index ["health_system_id"], name: "index_chart_statistics_on_health_system_id"
@@ -173,23 +172,23 @@
     t.string "status", default: "draft"
     t.jsonb "formula"
     t.uuid "dashboard_section_id"
-    t.datetime "published_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "published_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "chart_type", default: "bar_chart"
     t.boolean "trend_line", default: false, null: false
     t.integer "position", default: 1, null: false
     t.string "interval_type", default: "monthly"
-    t.datetime "date_range_start"
-    t.datetime "date_range_end"
+    t.datetime "date_range_start", precision: nil
+    t.datetime "date_range_end", precision: nil
     t.index ["dashboard_section_id"], name: "index_charts_on_dashboard_section_id"
   end
 
   create_table "clinic_locations", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "department", null: false
     t.string "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "external_id"
     t.string "external_name"
     t.string "epic_identifier", default: ""
@@ -203,8 +202,8 @@
     t.boolean "data_access", default: false, null: false
     t.uuid "user_id", null: false
     t.uuid "intervention_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["intervention_id"], name: "index_collaborators_on_intervention_id"
     t.index ["user_id", "intervention_id"], name: "index_collaborators_on_user_id_and_intervention_id", unique: true
     t.index ["user_id"], name: "index_collaborators_on_user_id"
@@ -212,8 +211,8 @@
 
   create_table "consumption_results", force: :cascade do |t|
     t.jsonb "body"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "day_id", null: false
     t.index ["day_id"], name: "index_consumption_results_on_day_id"
   end
@@ -222,8 +221,8 @@
     t.string "name"
     t.string "description"
     t.uuid "reporting_dashboard_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "position", default: 1, null: false
     t.index ["name", "reporting_dashboard_id"], name: "index_dashboard_sections_on_name_and_reporting_dashboard_id", unique: true
     t.index ["reporting_dashboard_id"], name: "index_dashboard_sections_on_reporting_dashboard_id"
@@ -233,8 +232,8 @@
     t.date "exact_date", null: false
     t.uuid "user_session_id", null: false
     t.uuid "question_group_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["question_group_id"], name: "index_days_on_question_group_id"
     t.index ["user_session_id"], name: "index_days_on_user_session_id"
   end
@@ -242,8 +241,8 @@
   create_table "downloaded_reports", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "user_id", null: false
     t.uuid "generated_report_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["generated_report_id"], name: "index_downloaded_reports_on_generated_report_id"
     t.index ["user_id", "generated_report_id"], name: "index_downloaded_reports_on_user_id_and_generated_report_id"
     t.index ["user_id"], name: "index_downloaded_reports_on_user_id"
@@ -252,8 +251,8 @@
   create_table "e_intervention_admin_organizations", force: :cascade do |t|
     t.uuid "user_id"
     t.uuid "organization_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["organization_id"], name: "index_e_intervention_admin_organizations_on_organization_id"
     t.index ["user_id"], name: "index_e_intervention_admin_organizations_on_user_id"
   end
@@ -261,8 +260,8 @@
   create_table "events", force: :cascade do |t|
     t.string "name", default: ""
     t.bigint "day_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["day_id"], name: "index_events_on_day_id"
   end
 
@@ -271,8 +270,8 @@
     t.uuid "report_template_id"
     t.uuid "user_session_id"
     t.string "report_for", default: "third_party", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "participant_id"
     t.index ["participant_id"], name: "index_generated_reports_on_participant_id"
     t.index ["report_for"], name: "index_generated_reports_on_report_for"
@@ -283,8 +282,8 @@
   create_table "generated_reports_third_party_users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "generated_report_id"
     t.uuid "third_party_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["generated_report_id"], name: "index_reports_third_party_users_on_reports_id"
     t.index ["third_party_id"], name: "index_third_party_users_reports_on_reports_id"
   end
@@ -293,17 +292,17 @@
     t.text "queue_name"
     t.integer "priority"
     t.jsonb "serialized_params"
-    t.datetime "scheduled_at"
-    t.datetime "performed_at"
-    t.datetime "finished_at"
+    t.datetime "scheduled_at", precision: nil
+    t.datetime "performed_at", precision: nil
+    t.datetime "finished_at", precision: nil
     t.text "error"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "active_job_id"
     t.text "concurrency_key"
     t.text "cron_key"
     t.uuid "retried_good_job_id"
-    t.datetime "cron_at"
+    t.datetime "cron_at", precision: nil
     t.index ["active_job_id", "created_at"], name: "index_good_jobs_on_active_job_id_and_created_at"
     t.index ["concurrency_key"], name: "index_good_jobs_on_concurrency_key_when_unfinished", where: "(finished_at IS NULL)"
     t.index ["cron_key", "created_at"], name: "index_good_jobs_on_cron_key_and_created_at"
@@ -315,16 +314,16 @@
   create_table "google_languages", force: :cascade do |t|
     t.string "language_code"
     t.string "language_name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.bigint "google_tts_language_id"
     t.index ["google_tts_language_id"], name: "index_google_languages_on_google_tts_language_id"
   end
 
   create_table "google_tts_languages", force: :cascade do |t|
     t.string "language_name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "google_tts_voices", force: :cascade do |t|
@@ -332,8 +331,8 @@
     t.string "voice_label"
     t.string "voice_type"
     t.string "language_code"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["google_tts_language_id"], name: "index_google_tts_voices_on_google_tts_language_id"
   end
 
@@ -341,9 +340,9 @@
     t.uuid "user_id"
     t.uuid "health_clinic_id"
     t.string "invitation_token"
-    t.datetime "accepted_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "accepted_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["health_clinic_id"], name: "index_health_clinic_invitations_on_health_clinic_id"
     t.index ["invitation_token"], name: "index_health_clinic_invitations_on_invitation_token"
     t.index ["user_id"], name: "index_health_clinic_invitations_on_user_id"
@@ -352,9 +351,9 @@
   create_table "health_clinics", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "name", null: false
     t.uuid "health_system_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "deleted_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "deleted_at", precision: nil
     t.index ["deleted_at"], name: "index_health_clinics_on_deleted_at"
     t.index ["health_system_id"], name: "index_health_clinics_on_health_system_id"
     t.index ["name", "health_system_id"], name: "index_health_clinics_on_name_and_health_system_id", unique: true
@@ -364,9 +363,9 @@
     t.uuid "user_id"
     t.uuid "health_system_id"
     t.string "invitation_token"
-    t.datetime "accepted_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "accepted_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["health_system_id"], name: "index_health_system_invitations_on_health_system_id"
     t.index ["invitation_token"], name: "index_health_system_invitations_on_invitation_token"
     t.index ["user_id"], name: "index_health_system_invitations_on_user_id"
@@ -375,9 +374,9 @@
   create_table "health_systems", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "name", null: false
     t.uuid "organization_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "deleted_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "deleted_at", precision: nil
     t.index ["deleted_at"], name: "index_health_systems_on_deleted_at"
     t.index ["name", "organization_id"], name: "index_health_systems_on_name_and_organization_id", unique: true
     t.index ["organization_id"], name: "index_health_systems_on_organization_id"
@@ -397,8 +396,8 @@
     t.string "dob_bidx"
     t.string "sex_bidx"
     t.string "zip_code_bidx"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "phone_number_ciphertext"
     t.string "phone_number_bidx"
     t.string "phone_type_ciphertext"
@@ -422,23 +421,23 @@
   end
 
   create_table "imported_files", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "intervention_accesses", force: :cascade do |t|
     t.uuid "intervention_id", null: false
     t.string "email", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["intervention_id"], name: "index_intervention_accesses_on_intervention_id"
   end
 
   create_table "intervention_locations", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "intervention_id"
     t.uuid "clinic_location_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["clinic_location_id"], name: "index_intervention_locations_on_clinic_location_id"
     t.index ["intervention_id"], name: "index_intervention_locations_on_intervention_id"
   end
@@ -446,8 +445,8 @@
   create_table "intervention_navigators", force: :cascade do |t|
     t.uuid "user_id"
     t.uuid "intervention_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["intervention_id"], name: "index_intervention_navigators_on_intervention_id"
     t.index ["user_id"], name: "index_intervention_navigators_on_user_id"
   end
@@ -455,11 +454,11 @@
   create_table "interventions", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "name"
     t.uuid "user_id", null: false
-    t.datetime "published_at"
+    t.datetime "published_at", precision: nil
     t.string "status", default: "draft"
     t.string "shared_to", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "organization_id"
     t.bigint "google_language_id", null: false
     t.boolean "from_deleted_organization", default: false, null: false
@@ -481,9 +480,9 @@
     t.uuid "current_editor_id"
     t.integer "conversations_count"
     t.string "sensitive_data_state", default: "collected", null: false
-    t.datetime "clear_sensitive_data_scheduled_at"
+    t.datetime "clear_sensitive_data_scheduled_at", precision: nil
     t.integer "navigators_count", default: 0
-    t.datetime "paused_at"
+    t.datetime "paused_at", precision: nil
     t.index ["current_editor_id"], name: "index_interventions_on_current_editor_id"
     t.index ["google_language_id"], name: "index_interventions_on_google_language_id"
     t.index ["name", "user_id"], name: "index_interventions_on_name_and_user_id", using: :gin
@@ -497,8 +496,8 @@
   create_table "invitations", force: :cascade do |t|
     t.uuid "invitable_id"
     t.string "invitable_type"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "email_ciphertext"
     t.string "email_bidx"
     t.uuid "health_clinic_id"
@@ -509,41 +508,41 @@
   create_table "links", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "url"
     t.string "slug"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["url", "slug"], name: "index_links_on_url_and_slug", unique: true
   end
 
   create_table "live_chat_conversations", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "intervention_id", null: false
     t.string "current_screen_title"
     t.string "participant_location_history", default: [], null: false, array: true
-    t.datetime "archived_at"
+    t.datetime "archived_at", precision: nil
   end
 
   create_table "live_chat_interlocutors", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "conversation_id", null: false
     t.uuid "user_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "live_chat_links", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.text "url", null: false
     t.string "display_name", default: "", null: false
     t.uuid "navigator_setup_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "link_for", default: 0
   end
 
   create_table "live_chat_messages", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.text "content_ciphertext", default: "", null: false
     t.uuid "conversation_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "live_chat_interlocutor_id", null: false
     t.boolean "is_read", default: false, null: false
   end
@@ -552,18 +551,18 @@
     t.string "no_navigator_available_message", default: "Welcome to our in-session support!", null: false
     t.string "contact_email", default: "", null: false
     t.uuid "intervention_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "contact_message", default: "You can contact us directly by using details below"
   end
 
   create_table "live_chat_summoning_users", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "user_id", null: false
     t.uuid "intervention_id", null: false
-    t.datetime "unlock_next_call_out_time"
+    t.datetime "unlock_next_call_out_time", precision: nil
     t.boolean "participant_handled", default: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["intervention_id"], name: "index_live_chat_summoning_users_on_intervention_id"
     t.index ["user_id"], name: "index_live_chat_summoning_users_on_user_id"
   end
@@ -571,9 +570,9 @@
   create_table "messages", force: :cascade do |t|
     t.text "body", null: false
     t.string "status", default: "new", null: false
-    t.datetime "schedule_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "schedule_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "phone_ciphertext"
     t.string "attachment_url"
   end
@@ -582,9 +581,9 @@
     t.text "email_ciphertext"
     t.string "email_bidx"
     t.uuid "intervention_id"
-    t.datetime "accepted_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "accepted_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["email_bidx"], name: "index_navigator_invitations_on_email_bidx"
     t.index ["intervention_id"], name: "index_navigator_invitations_on_intervention_id"
   end
@@ -595,8 +594,8 @@
     t.boolean "is_read", default: false
     t.jsonb "data"
     t.uuid "user_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "event", default: 0, null: false
     t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable"
     t.index ["user_id"], name: "index_notifications_on_user_id"
@@ -606,9 +605,9 @@
     t.uuid "user_id"
     t.uuid "organization_id"
     t.string "invitation_token"
-    t.datetime "accepted_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "accepted_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["invitation_token"], name: "index_organization_invitations_on_invitation_token"
     t.index ["organization_id"], name: "index_organization_invitations_on_organization_id"
     t.index ["user_id"], name: "index_organization_invitations_on_user_id"
@@ -616,8 +615,8 @@
 
   create_table "organizations", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name"], name: "index_organizations_on_name", unique: true
   end
 
@@ -627,9 +626,9 @@
     t.string "prefix", null: false
     t.string "confirmation_code"
     t.boolean "confirmed", default: false, null: false
-    t.datetime "confirmed_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "number_ciphertext"
     t.uuid "navigator_setup_id"
     t.string "communication_way"
@@ -643,14 +642,14 @@
     t.uuid "user_id", null: false
     t.uuid "intervention_id", null: false
     t.uuid "health_clinic_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "auto_invitation", default: false, null: false
-    t.datetime "sms_invitation_sent_at"
+    t.datetime "sms_invitation_sent_at", precision: nil
     t.string "external_id"
     t.boolean "sms_notification", default: false
     t.boolean "email_notification", default: false
-    t.datetime "email_invitation_sent_at"
+    t.datetime "email_invitation_sent_at", precision: nil
     t.index ["health_clinic_id"], name: "index_predefined_user_parameters_on_health_clinic_id"
     t.index ["intervention_id"], name: "index_predefined_user_parameters_on_intervention_id"
     t.index ["user_id"], name: "index_predefined_user_parameters_on_user_id"
@@ -660,8 +659,8 @@
     t.uuid "session_id", null: false
     t.string "title", null: false
     t.bigint "position", default: 0, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "type"
     t.integer "questions_count", default: 0
     t.jsonb "sms_schedule"
@@ -683,8 +682,8 @@
     t.string "video_url"
     t.jsonb "formulas"
     t.jsonb "body"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "original_text"
     t.jsonb "accepted_answers"
     t.jsonb "sms_reminders", default: {}
@@ -701,8 +700,8 @@
     t.string "formula_match"
     t.string "title"
     t.text "content"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "original_text"
     t.integer "position", default: 0, null: false
     t.index ["report_template_section_id", "preview"], name: "index_variants_on_preview_and_section_id"
@@ -712,8 +711,8 @@
   create_table "report_template_sections", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "formula"
     t.uuid "report_template_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "position", default: 0, null: false
     t.index ["report_template_id"], name: "index_report_template_sections_on_report_template_id"
   end
@@ -723,8 +722,8 @@
     t.string "report_for", default: "third_party", null: false
     t.uuid "session_id"
     t.text "summary"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "original_text"
     t.boolean "has_cover_letter", default: false, null: false
     t.string "cover_letter_logo_type", default: "report_logo", null: false
@@ -739,8 +738,8 @@
 
   create_table "reporting_dashboards", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "organization_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["organization_id"], name: "index_reporting_dashboards_on_organization_id"
   end
 
@@ -753,8 +752,8 @@
     t.integer "schedule_payload"
     t.date "schedule_at"
     t.jsonb "formulas"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.integer "report_templates_count", default: 0
     t.integer "sms_plans_count", default: 0, null: false
     t.integer "last_report_template_number", default: 0
@@ -772,7 +771,7 @@
     t.boolean "autofinish_enabled", default: false, null: false
     t.integer "autofinish_delay", default: 1440, null: false
     t.boolean "autoclose_enabled", default: false
-    t.datetime "autoclose_at"
+    t.datetime "autoclose_at", precision: nil
     t.text "welcome_message"
     t.text "default_response"
     t.bigint "google_language_id"
@@ -803,8 +802,8 @@
     t.uuid "health_clinic_id"
     t.boolean "active", default: true
     t.string "sms_code"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["health_clinic_id"], name: "index_sms_codes_on_health_clinic_id"
     t.index ["session_id"], name: "index_sms_codes_on_session_id"
     t.index ["sms_code"], name: "unique_active_sms_codes", unique: true, where: "(active IS TRUE)"
@@ -815,8 +814,8 @@
     t.string "link_type", default: "website", null: false
     t.uuid "session_id", null: false
     t.uuid "sms_plan_id", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "variable", null: false
     t.index ["session_id"], name: "index_sms_links_on_session_id"
     t.index ["sms_plan_id", "variable"], name: "index_sms_links_on_sms_plan_id_and_variable", unique: true
@@ -828,8 +827,8 @@
     t.uuid "user_id", null: false
     t.uuid "sms_link_id", null: false
     t.string "entered_timestamps", default: [], null: false, array: true
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["sms_link_id", "user_id"], name: "index_sms_links_users_on_sms_link_id_and_user_id", unique: true
     t.index ["sms_link_id"], name: "index_sms_links_users_on_sms_link_id"
     t.index ["user_id"], name: "index_sms_links_users_on_user_id"
@@ -839,8 +838,8 @@
     t.uuid "sms_plan_id"
     t.string "formula_match"
     t.text "content"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "original_text"
     t.integer "position", default: 0, null: false
     t.index ["sms_plan_id"], name: "index_sms_plan_variants_on_sms_plan_id"
@@ -852,12 +851,12 @@
     t.string "schedule", null: false
     t.integer "schedule_payload", default: 0
     t.string "frequency", default: "once", null: false
-    t.datetime "end_at"
+    t.datetime "end_at", precision: nil
     t.string "formula"
     t.text "no_formula_text"
     t.boolean "is_used_formula", default: false, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "original_text"
     t.string "type", default: "SmsPlan::Normal", null: false
     t.boolean "include_first_name"
@@ -880,9 +879,9 @@
     t.uuid "user_id"
     t.uuid "team_id"
     t.string "invitation_token"
-    t.datetime "accepted_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "accepted_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["accepted_at"], name: "index_team_invitations_on_accepted_at"
     t.index ["invitation_token"], name: "index_team_invitations_on_invitation_token", unique: true
     t.index ["user_id", "team_id"], name: "unique_not_accepted_team_invitation", unique: true, where: "(accepted_at IS NULL)"
@@ -890,8 +889,8 @@
 
   create_table "teams", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.string "name", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "team_admin_id"
     t.index ["name"], name: "index_teams_on_name", unique: true
     t.index ["team_admin_id"], name: "index_teams_on_team_admin_id"
@@ -900,8 +899,8 @@
   create_table "tests", force: :cascade do |t|
     t.uuid "session_id"
     t.bigint "cat_mh_test_type_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["cat_mh_test_type_id"], name: "index_tests_on_cat_mh_test_type_id"
     t.index ["session_id"], name: "index_tests_on_session_id"
   end
@@ -912,15 +911,15 @@
     t.integer "position", default: 0, null: false
     t.string "label", null: false
     t.boolean "default", default: false, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "user_health_clinics", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "user_id"
     t.uuid "health_clinic_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["health_clinic_id"], name: "index_user_health_clinics_on_health_clinic_id"
     t.index ["user_id"], name: "index_user_health_clinics_on_user_id"
   end
@@ -931,9 +930,9 @@
     t.uuid "health_clinic_id"
     t.integer "completed_sessions", default: 0, null: false
     t.string "status", default: "ready_to_start"
-    t.datetime "finished_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "finished_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["health_clinic_id"], name: "index_user_interventions_on_health_clinic_id"
     t.index ["intervention_id", "user_id"], name: "index_user_interventions_on_intervention_id_and_user_id", unique: true, where: "(created_at > '2023-10-25 05:30:04'::timestamp without time zone)"
     t.index ["intervention_id"], name: "index_user_interventions_on_intervention_id"
@@ -948,17 +947,17 @@
     t.jsonb "params"
     t.string "user_agent"
     t.inet "remote_ip"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "user_sessions", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
     t.uuid "user_id", null: false
     t.uuid "session_id", null: false
-    t.datetime "finished_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "last_answer_at"
+    t.datetime "finished_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "last_answer_at", precision: nil
     t.string "timeout_job_id"
     t.uuid "name_audio_id"
     t.uuid "health_clinic_id"
@@ -969,7 +968,7 @@
     t.string "jsession_id"
     t.string "awselb"
     t.uuid "user_intervention_id", null: false
-    t.datetime "scheduled_at"
+    t.datetime "scheduled_at", precision: nil
     t.boolean "quick_exit", default: false
     t.integer "number_of_attempts", default: 1
     t.boolean "started", default: false, null: false
@@ -989,8 +988,8 @@
     t.uuid "user_id"
     t.string "code", null: false
     t.boolean "confirmed", default: false, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["user_id"], name: "index_user_verification_codes_on_user_id"
   end
 
@@ -1001,29 +1000,29 @@
     t.jsonb "tokens"
     t.boolean "active", default: true, null: false
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.string "invitation_token"
-    t.datetime "invitation_created_at"
-    t.datetime "invitation_sent_at"
-    t.datetime "invitation_accepted_at"
+    t.datetime "invitation_created_at", precision: nil
+    t.datetime "invitation_sent_at", precision: nil
+    t.datetime "invitation_accepted_at", precision: nil
     t.integer "invitation_limit"
     t.string "invited_by_type"
     t.bigint "invited_by_id"
     t.integer "invitations_count", default: 0
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
+    t.datetime "reset_password_sent_at", precision: nil
     t.boolean "allow_password_change", default: false, null: false
-    t.datetime "remember_created_at"
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.inet "current_sign_in_ip"
     t.inet "last_sign_in_ip"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "sms_notification", default: true, null: false
     t.uuid "team_id"
     t.uuid "preview_session_id"
@@ -1039,7 +1038,7 @@
     t.string "uid_bidx"
     t.string "organizable_type"
     t.boolean "terms", default: false, null: false
-    t.datetime "terms_confirmed_at"
+    t.datetime "terms_confirmed_at", precision: nil
     t.boolean "quick_exit_enabled", default: false, null: false
     t.boolean "online", default: false, null: false
     t.uuid "hfhs_patient_detail_id"
@@ -1067,7 +1066,7 @@
     t.string "event", null: false
     t.string "whodunnit"
     t.text "object"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
 

From d200159d78fc9b67b53812bd6d7750270f980ba9 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 11:04:21 +0100
Subject: [PATCH 03/18] Use devise-argon2 instead of setting config.encryptor

---
 app/models/user.rb            | 4 +++-
 config/initializers/devise.rb | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index ed69db25..f259977c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -13,7 +13,9 @@ class User < ApplicationRecord
          :rememberable,
          :timeoutable,
          :trackable,
-         :validatable
+         :validatable,
+         :argon2,
+         argon2_options: { migrate_from_devise_argon2_v1: true }
 
   extend DefaultValues
   include DeviseTokenAuth::Concerns::User
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 3ef54815..f3961bd6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -275,7 +275,6 @@
   # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
 
   # Require the `devise-encryptable` gem when using anything other than bcrypt
-  config.encryptor = :argon2
 
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for

From 19a90afc3adc2bcd86422ad297c2d6a8d9c59e6d Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 11:07:03 +0100
Subject: [PATCH 04/18] Keep using Lockbox encryption

---
 app/models/answer.rb                                       | 2 +-
 app/models/hfhs_patient_detail.rb                          | 4 ++--
 app/models/invitation.rb                                   | 2 +-
 app/models/live_chat/interventions/navigator_invitation.rb | 2 +-
 app/models/live_chat/message.rb                            | 2 +-
 app/models/message.rb                                      | 2 +-
 app/models/phone.rb                                        | 2 +-
 app/models/user.rb                                         | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/models/answer.rb b/app/models/answer.rb
index 479f74d9..a1471669 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -24,7 +24,7 @@ class Answer < ApplicationRecord
 
   scope :hfhs, -> { where(type: Answer::HenryFord.name) }
 
-  encrypts :body, type: :json, migrating: true
+  has_encrypted :body, type: :json, migrating: true
 
   default_scope { order(:created_at) }
 
diff --git a/app/models/hfhs_patient_detail.rb b/app/models/hfhs_patient_detail.rb
index eaa6917c..b3b35098 100644
--- a/app/models/hfhs_patient_detail.rb
+++ b/app/models/hfhs_patient_detail.rb
@@ -4,9 +4,9 @@ class HfhsPatientDetail < ApplicationRecord
   has_paper_trail skip: %i[patient_id first_name last_name dob sex visit_id zip_code phone_number phone_type]
 
   # ENCRYPTION
-  encrypts :patient_id, :first_name, :last_name, :sex, :visit_id, :zip_code, :phone_number, :phone_type, :provided_first_name, :provided_last_name,
+  has_encrypted :patient_id, :first_name, :last_name, :sex, :visit_id, :zip_code, :phone_number, :phone_type, :provided_first_name, :provided_last_name,
            :provided_sex, :provided_zip, :provided_phone_number, :provided_phone_type, :provided_dob
-  encrypts :dob, type: :date
+  has_encrypted :dob, type: :date
   blind_index :patient_id, :first_name, :last_name, :dob, :sex, :zip_code, :phone_number, :phone_type, :provided_first_name, :provided_last_name,
               :provided_sex, :provided_zip, :provided_phone_number, :provided_phone_type, :provided_dob
 
diff --git a/app/models/invitation.rb b/app/models/invitation.rb
index e717d2ac..649ed45c 100644
--- a/app/models/invitation.rb
+++ b/app/models/invitation.rb
@@ -5,7 +5,7 @@ class Invitation < ApplicationRecord
   belongs_to :invitable, polymorphic: true
   belongs_to :health_clinic, optional: true
 
-  encrypts :email
+  has_encrypted :email
   blind_index :email
 
   def resend
diff --git a/app/models/live_chat/interventions/navigator_invitation.rb b/app/models/live_chat/interventions/navigator_invitation.rb
index 9572e718..8164a6e1 100644
--- a/app/models/live_chat/interventions/navigator_invitation.rb
+++ b/app/models/live_chat/interventions/navigator_invitation.rb
@@ -3,7 +3,7 @@
 class LiveChat::Interventions::NavigatorInvitation < ApplicationRecord
   belongs_to :intervention
 
-  encrypts :email
+  has_encrypted :email
   blind_index :email
 
   scope :not_accepted, -> { where(accepted_at: nil) }
diff --git a/app/models/live_chat/message.rb b/app/models/live_chat/message.rb
index c32c50ac..729dbe09 100644
--- a/app/models/live_chat/message.rb
+++ b/app/models/live_chat/message.rb
@@ -14,7 +14,7 @@ class LiveChat::Message < ApplicationRecord
 
   after_create :create_notification
 
-  encrypts :content
+  has_encrypted :content
 
   private
 
diff --git a/app/models/message.rb b/app/models/message.rb
index 16ed7644..8a5ed702 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -4,5 +4,5 @@ class Message < ApplicationRecord
   has_paper_trail skip: %i[phone]
   validates :phone, :body, presence: true
 
-  encrypts :phone
+  has_encrypted :phone
 end
diff --git a/app/models/phone.rb b/app/models/phone.rb
index 413879c9..f5e1b596 100644
--- a/app/models/phone.rb
+++ b/app/models/phone.rb
@@ -14,7 +14,7 @@ class Phone < ApplicationRecord
 
   enum communication_way: { call: 'call', message: 'message' }
 
-  encrypts :number
+  has_encrypted :number
   blind_index :number
 
   def token_correct?(code)
diff --git a/app/models/user.rb b/app/models/user.rb
index f259977c..f29d01c4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -148,7 +148,7 @@ class User < ApplicationRecord
   after_create_commit :set_terms_confirmed_date
 
   # ENCRYPTION
-  encrypts :email, :first_name, :last_name, :uid
+  has_encrypted :email, :first_name, :last_name, :uid
   blind_index :email, :uid
 
   # METHODS

From 1a6c6cfc7cc656882a29464158dfefddcd282a42 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 11:52:03 +0100
Subject: [PATCH 05/18] Use cookie_store for sessions

---
 config/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/application.rb b/config/application.rb
index 254cde41..40727bcb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -33,6 +33,10 @@ class Application < Rails::Application
     # config.time_zone = "Central Time (US & Canada)"
     # config.eager_load_paths << Rails.root.join("extras")
 
+    config.session_store :cookie_store, key: '_interslice_session'
+    config.middleware.use ActionDispatch::Cookies
+    config.middleware.use config.session_store, config.session_options
+
     # Only loads a smaller set of middleware suitable for API only apps.
     # Middleware like session, flash, cookies can be added back manually.
     # Skip views, helpers and assets when generating a new resource.

From 00724a7302b6616116aab683e49bb796b01df477 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 13:30:02 +0100
Subject: [PATCH 06/18] Fix validation models schemas paths

---
 app/models/chart.rb                   | 2 +-
 app/models/notification.rb            | 2 +-
 app/models/question.rb                | 8 ++++----
 app/models/question/sms.rb            | 4 ++--
 app/models/question_group.rb          | 2 +-
 app/models/session.rb                 | 4 ++--
 app/models/tlfb/consumption_result.rb | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/models/chart.rb b/app/models/chart.rb
index fd086148..bfa8c105 100644
--- a/app/models/chart.rb
+++ b/app/models/chart.rb
@@ -12,7 +12,7 @@ class Chart < ApplicationRecord
   attribute :formula, :json, default: -> { assign_default_values('formula') }
 
   validates :formula, presence: true, json: { schema: lambda {
-                                                        Rails.root.join("#{json_schema_path}/formula.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                                       }, message: lambda { |err|
                                                                     err
                                                                   } }
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 2f41f6a7..99c67121 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -11,7 +11,7 @@ class Notification < ApplicationRecord
                 new_collaborator_added: 7, start_editing_intervention: 8, stop_editing_intervention: 9, collaborator_removed: 10, sensitive_data_removed: 11 }
 
   validates :data, json: { schema: lambda {
-    Rails.root.join("#{json_schema_path}/notification_data.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/notification_data.json").to_s)
   }, message: lambda { |err|
     err
   } }
diff --git a/app/models/question.rb b/app/models/question.rb
index ad0ba79b..01318c61 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -38,23 +38,23 @@ class Question < ApplicationRecord
   validates :type, presence: true
   validates :position, numericality: { greater_than_or_equal_to: 0 }
   validates :settings, json: { schema: lambda {
-                                         Rails.root.join("#{json_schema_path}/settings.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :narrator, json: { schema: lambda {
-                                         Rails.root.join("#{json_schema_path}/narrator.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/narrator.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :video_url, format: URI::DEFAULT_PARSER.make_regexp(%w[http https]), allow_blank: true
   validates :formulas, json: { schema: lambda {
-                                         Rails.root.join("#{json_schema_path}/formula.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :body, presence: true, json: { schema: lambda {
-                                                     Rails.root.join("db/schema/#{self.class.name.underscore}/body.json").to_s
+    File.read(Rails.root.join("db/schema/#{self.class.name.underscore}/body.json").to_s)
                                                    }, message: lambda { |err|
                                                                  err
                                                                } }
diff --git a/app/models/question/sms.rb b/app/models/question/sms.rb
index 656c9f76..8827c99a 100644
--- a/app/models/question/sms.rb
+++ b/app/models/question/sms.rb
@@ -28,13 +28,13 @@ class Question::Sms < Question
   attribute :sms_reminders, :json, default: -> { {} }
 
   validates :accepted_answers, json: { schema: lambda {
-    Rails.root.join("db/schema/#{self.class.name.underscore}/accepted_answers.json").to_s
+    File.read(Rails.root.join("db/schema/#{self.class.name.underscore}/accepted_answers.json").to_s)
   }, message: lambda { |err|
     err
   } }, allow_blank: true
 
   validates :sms_reminders, json: { schema: lambda {
-    Rails.root.join("db/schema/#{self.class.name.underscore}/sms_reminders.json").to_s
+    File.read(Rails.root.join("db/schema/#{self.class.name.underscore}/sms_reminders.json").to_s)
   }, message: lambda { |err|
     err
   } }, allow_blank: true
diff --git a/app/models/question_group.rb b/app/models/question_group.rb
index 9657af9e..618237c1 100644
--- a/app/models/question_group.rb
+++ b/app/models/question_group.rb
@@ -25,7 +25,7 @@ class QuestionGroup < ApplicationRecord
                                               }
                                             }
   validates :sms_schedule,
-            json: { schema: -> { Rails.root.join('db/schema/_common/sms_schedule.json').to_s },
+            json: { schema: -> { File.read(Rails.root.join('db/schema/_common/sms_schedule.json').to_s) },
                     message: ->(err) { err } }, if: -> { session&.type&.match?('Session::Sms') },
             allow_blank: true
 
diff --git a/app/models/session.rb b/app/models/session.rb
index 44385cfa..73c92f27 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -56,12 +56,12 @@ class Session < ApplicationRecord
   validates :name, :variable, presence: true
   validates :last_report_template_number, presence: true
   validates :settings, json: { schema: lambda {
-                                         Rails.root.join("#{json_schema_path}/settings.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :formulas, json: { schema: lambda {
-                                         Rails.root.join("#{json_schema_path}/formula.json").to_s
+    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
diff --git a/app/models/tlfb/consumption_result.rb b/app/models/tlfb/consumption_result.rb
index 1dca0e32..1c7098db 100644
--- a/app/models/tlfb/consumption_result.rb
+++ b/app/models/tlfb/consumption_result.rb
@@ -8,7 +8,7 @@ class Tlfb::ConsumptionResult < ApplicationRecord
 
   attribute :body, :json, default: -> { {} }
   validates :body, json: {
-    schema: -> { Rails.root.join("#{json_schema_path}/body.json").to_s },
+    schema: -> { File.read(Rails.root.join("#{json_schema_path}/body.json").to_s) },
     message: ->(err) { err }
   }
 

From a3a160250b84b2a3fa2d089eda892c097de8c82d Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 14:38:08 +0100
Subject: [PATCH 07/18] Fix reading google application credentials

---
 app/services/v1/google/translation_service.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/services/v1/google/translation_service.rb b/app/services/v1/google/translation_service.rb
index 450ee019..72528bc0 100644
--- a/app/services/v1/google/translation_service.rb
+++ b/app/services/v1/google/translation_service.rb
@@ -16,11 +16,7 @@ def client
   end
 
   def credentials
-    if Rails.env.development?
-      Oj.load_file(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
-    else
-      Oj.load(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
-    end
+    Oj.load_file(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
   rescue Oj::ParseError
     ENV['GOOGLE_APPLICATION_CREDENTIALS']
   end

From 284ede2c7d981f11ae79380086be67ba1e4e43d3 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 14:38:21 +0100
Subject: [PATCH 08/18] Skip defining finalizer for test uploaded files since
 Rack::Test::UploadedFile no longer defines finalize method
 (https://github.com/rack/rack-test/commit/4fa741f1e4eee0e0f3cf5dd4c6e67a40d304d4e3)

---
 spec/factories/helper.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/spec/factories/helper.rb b/spec/factories/helper.rb
index 91a9c676..36180241 100644
--- a/spec/factories/helper.rb
+++ b/spec/factories/helper.rb
@@ -10,10 +10,6 @@ def self.upload_file(src, content_type, binary = false)
     tempfile.write content
     tempfile.rewind
 
-    uploaded_file = Rack::Test::UploadedFile.new(tempfile, content_type, binary, original_filename: original_filename)
-
-    ObjectSpace.define_finalizer(uploaded_file, uploaded_file.class.finalize(tempfile))
-
-    uploaded_file
+    Rack::Test::UploadedFile.new(tempfile, content_type, binary, original_filename: original_filename)
   end
 end

From d75f90f2d260fe2a4a6e576cdcdb79fa89d45d40 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 14:38:32 +0100
Subject: [PATCH 09/18] Fix deprecated TimeWithZone from .to_s to .to_fs

---
 app/models/intervention.rb           | 2 +-
 app/models/user.rb                   | 2 +-
 app/services/v1/render_pdf_report.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/intervention.rb b/app/models/intervention.rb
index 8dc646c8..d5f5d96b 100644
--- a/app/models/intervention.rb
+++ b/app/models/intervention.rb
@@ -181,7 +181,7 @@ def newest_report
   end
 
   def cache_key
-    "intervention/#{id}-#{updated_at&.to_s(:number)}"
+    "intervention/#{id}-#{updated_at&.to_fs(:number)}"
   end
 
   def self.detailed_search(params, user)
diff --git a/app/models/user.rb b/app/models/user.rb
index f29d01c4..63227af7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -202,7 +202,7 @@ def with_invalid_email?
   end
 
   def cache_key
-    "user/#{id}-#{updated_at&.to_s(:number)}"
+    "user/#{id}-#{updated_at&.to_fs(:number)}"
   end
 
   def accepted_health_clinic_ids
diff --git a/app/services/v1/render_pdf_report.rb b/app/services/v1/render_pdf_report.rb
index bef6461b..b97e7b3d 100644
--- a/app/services/v1/render_pdf_report.rb
+++ b/app/services/v1/render_pdf_report.rb
@@ -56,7 +56,7 @@ def report_footer_html
     action_controller.render_to_string(
       template: 'report_templates/report_footer.html.erb',
       locals: {
-        datetime_content: "Completed on #{DateTime.now.to_s(:db)}"
+        datetime_content: "Completed on #{DateTime.now.to_fs(:db)}"
       }
     )
   end

From 366943868568e1f0598e1ca33a7b7b7d0389dcbc Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 14:49:11 +0100
Subject: [PATCH 10/18] Fix `Missing host to link to!` issue

---
 config/environments/test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index d77c0df7..f9efd4db 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -60,4 +60,5 @@
   config.after_initialize { Bullet.enable = true }
 
   Rails.application.routes.default_url_options[:protocol] = 'https'
+  Rails.application.routes.default_url_options[:host] = 'test.host'
 end

From 89877dcc74694c7cffdacb92ac1b9f3ecb69b987 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 15:53:35 +0100
Subject: [PATCH 11/18] Use `allow_other_host: true` to avoid
 `UnsafeRedirectError` while redirecting to the frontend app

---
 app/controllers/v1/users/invitations_controller.rb | 2 +-
 app/controllers/v1_controller.rb                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/v1/users/invitations_controller.rb b/app/controllers/v1/users/invitations_controller.rb
index f11aaeb0..50151ef2 100644
--- a/app/controllers/v1/users/invitations_controller.rb
+++ b/app/controllers/v1/users/invitations_controller.rb
@@ -42,7 +42,7 @@ def edit
     # and there is no version with !
     return redirect_to_web_app(error: I18n.t('users.invite.not_active')) if user.blank?
 
-    redirect_to "#{ENV['WEB_URL']}/register?invitation_token=#{invitation_token}&email=#{user.email}&role=#{user.roles.first}"
+    redirect_to "#{ENV['WEB_URL']}/register?invitation_token=#{invitation_token}&email=#{user.email}&role=#{user.roles.first}", allow_other_host: true
   end
 
   # This endpoint is hit from registration page to register new user from invitation
diff --git a/app/controllers/v1_controller.rb b/app/controllers/v1_controller.rb
index 363097d7..607d0d0e 100644
--- a/app/controllers/v1_controller.rb
+++ b/app/controllers/v1_controller.rb
@@ -65,6 +65,6 @@ def invalidate_cache(obj)
   def redirect_to_web_app(message)
     message.transform_values! { |v| Base64.encode64(v) }
 
-    redirect_to "#{ENV['WEB_URL']}?#{message.to_query}"
+    redirect_to "#{ENV['WEB_URL']}?#{message.to_query}", allow_other_host: true
   end
 end

From cc145cb6381dd17eebf8aa4f442eaf6a5e43bafc Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 15:58:52 +0100
Subject: [PATCH 12/18] Use `allow_other_host: true` to avoid
 `UnsafeRedirectError` while redirecting to the backend app

---
 app/controllers/v1/interventions/answers_controller.rb | 2 +-
 app/controllers/v1/interventions_controller.rb         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/v1/interventions/answers_controller.rb b/app/controllers/v1/interventions/answers_controller.rb
index 57bac3f2..61583ef6 100644
--- a/app/controllers/v1/interventions/answers_controller.rb
+++ b/app/controllers/v1/interventions/answers_controller.rb
@@ -16,7 +16,7 @@ def csv_attachment
 
     head :no_content unless intervention.reports.attached?
 
-    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true))
+    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true), allow_other_host: true)
   end
 
   private
diff --git a/app/controllers/v1/interventions_controller.rb b/app/controllers/v1/interventions_controller.rb
index af24ba03..bde96beb 100644
--- a/app/controllers/v1/interventions_controller.rb
+++ b/app/controllers/v1/interventions_controller.rb
@@ -59,7 +59,7 @@ def generated_conversations_transcript
 
     head :no_content unless intervention_load.conversations_transcript.attached?
 
-    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention_load.conversations_transcript, only_path: true))
+    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention_load.conversations_transcript, only_path: true), allow_other_host: true)
   end
 
   def clear_user_data

From d7f390cb0ca1a54568b6be51b10455c2eea05e34 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 16:01:53 +0100
Subject: [PATCH 13/18] Add gem `faraday-multipart` to allow using `multipart`
 option

---
 Gemfile      | 2 ++
 Gemfile.lock | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/Gemfile b/Gemfile
index 2a4a0e58..6f4bd085 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,6 +63,8 @@ gem 'sentry-rails', '~> 5.7'
 gem 'jwt', '~> 2.6'
 gem 'grpc', '~> 1.53.2'
 gem 'aasm', '~> 5.1', '>= 5.1.1'
+# for faraday multipart
+gem 'faraday-multipart'
 
 # for upgrading rails to 7.0. This line can be removed after upgrading to rails 7.1
 gem 'concurrent-ruby', '1.3.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 634c58ea..d20514b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -206,6 +206,8 @@ GEM
       zlib (~> 2.1)
     faraday-http-cache (2.5.1)
       faraday (>= 0.8)
+    faraday-multipart (1.1.0)
+      multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
     faraday-retry (2.2.1)
@@ -363,6 +365,7 @@ GEM
     minitest (5.25.4)
     msgpack (1.7.5)
     multi_json (1.15.0)
+    multipart-post (2.4.1)
     nenv (0.3.0)
     nesty (1.0.2)
     net-http (0.6.0)
@@ -635,6 +638,7 @@ DEPENDENCIES
   dotenv-rails
   factory_bot_rails
   faker
+  faraday-multipart
   fasterer
   google-cloud-text_to_speech
   google-cloud-translate-v2

From 48362c4e909a6be43fde04b706ab5f6a75f1d353 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 16:07:32 +0100
Subject: [PATCH 14/18] Use `allow_other_host: true` to avoid
 `UnsafeRedirectError` while redirecting to requested links

---
 app/controllers/v1/links_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/v1/links_controller.rb b/app/controllers/v1/links_controller.rb
index b0c710ec..2450181b 100644
--- a/app/controllers/v1/links_controller.rb
+++ b/app/controllers/v1/links_controller.rb
@@ -5,6 +5,6 @@ class V1::LinksController < V1Controller
 
   def show
     link = Link.find_by!(slug: params[:slug])
-    redirect_to link.url
+    redirect_to link.url, allow_other_host: true
   end
 end

From 8604738077a3da17e8c5cb917807a808278ed04e Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 16:10:41 +0100
Subject: [PATCH 15/18] Use matching error response in test instead of equal
 assertion

---
 spec/requests/v1/user_sessions/show_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/requests/v1/user_sessions/show_spec.rb b/spec/requests/v1/user_sessions/show_spec.rb
index 51e63bab..7dee7df3 100644
--- a/spec/requests/v1/user_sessions/show_spec.rb
+++ b/spec/requests/v1/user_sessions/show_spec.rb
@@ -36,7 +36,7 @@
     end
 
     it 'return correct error message' do
-      expect(json_response['message']).to eql("Couldn't find UserIntervention")
+      expect(json_response['message']).to match(/^Couldn't find UserIntervention*/)
     end
   end
 

From 2d8e6b4499faba02b0cfb8fe8c8c32c0c94ac3bb Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Thu, 23 Jan 2025 16:58:32 +0100
Subject: [PATCH 16/18] Set template envs TEXT_TO_SPEECH_LANGUAGE and
 TEXT_TO_SPEECH_VOICE to avoid empty strings after fetch (even with default
 values)

---
 .env.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.template b/.env.template
index 3b1d68fc..234f4eca 100644
--- a/.env.template
+++ b/.env.template
@@ -42,9 +42,9 @@ STORAGE_REGION
 STORAGE_SECRET_ACCESS_KEY
 
 # settings used to convert text-to-speech
-TEXT_TO_SPEECH_LANGUAGE
+TEXT_TO_SPEECH_LANGUAGE=en-US
 TEXT_TO_SPEECH_PROVIDER=Google
-TEXT_TO_SPEECH_VOICE
+TEXT_TO_SPEECH_VOICE=en-US-Standard-C
 
 # api credentials for sending sms
 TWILIO_ACCOUNT_SID

From 3069375c37f9ba175ac6660dd70da1819b1f1369 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Fri, 24 Jan 2025 08:54:47 +0100
Subject: [PATCH 17/18] Fix authorization in
 V1::Sessions::ReportTemplatesController#duplicate

---
 app/controllers/v1/sessions/report_templates_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/v1/sessions/report_templates_controller.rb b/app/controllers/v1/sessions/report_templates_controller.rb
index ecd0b4ed..96ede2f3 100644
--- a/app/controllers/v1/sessions/report_templates_controller.rb
+++ b/app/controllers/v1/sessions/report_templates_controller.rb
@@ -78,7 +78,7 @@ def remove_cover_letter_custom_logo
   end
 
   def duplicate
-    authorize! :update, session
+    authorize! :update, @session
     return head :forbidden unless @session.ability_to_update_for?(current_v1_user)
 
     duplicated_report = report_template.clone(params: duplicate_params)

From cd16d33e1efe7add5146e488eb1826132aab5788 Mon Sep 17 00:00:00 2001
From: SewerusHTD <seweryn.panek@htdevelopers.com>
Date: Fri, 24 Jan 2025 11:25:42 +0100
Subject: [PATCH 18/18] Make rubocop happy + spec fixes

---
 .github/workflows/ci.yml                      |  1 +
 .rubocop.yml                                  | 12 ++--
 app/controllers/concerns/resource/position.rb |  2 +-
 .../henry_ford/clinic_locations_controller.rb |  2 +-
 .../v1/interventions/answers_controller.rb    |  3 +-
 .../interventions/collaborators_controller.rb | 22 +++----
 .../predefined_participants_controller.rb     |  8 +--
 .../interventions/short_links_controller.rb   | 14 ++---
 .../v1/interventions_controller.rb            |  4 +-
 .../interventions/files_controller.rb         |  2 +-
 .../interventions/links_controller.rb         | 20 +++----
 .../alert_phones/phones_controller.rb         | 10 ++--
 .../v1/user_sessions_controller.rb            | 20 +++----
 .../v1/users/invitations_controller.rb        | 23 +++----
 app/controllers/v1/users_controller.rb        |  2 +-
 app/controllers/v1_controller.rb              |  2 +-
 app/jobs/interventions/re_publish_job.rb      |  2 +-
 app/jobs/live_chat/generate_transcript_job.rb |  2 +-
 .../send_question_sms_job.rb                  | 13 ++--
 app/mailers/application_mailer.rb             |  2 +-
 app/models/audio/text_to_speech/google.rb     |  6 +-
 app/models/chart.rb                           |  8 +--
 app/models/concerns/clone.rb                  |  9 +--
 app/models/concerns/enumerate_for_concern.rb  |  4 +-
 app/models/concerns/meta_operations.rb        |  4 +-
 app/models/generated_report.rb                |  2 +-
 app/models/hfhs_patient_detail.rb             |  4 +-
 app/models/intervention.rb                    | 14 ++---
 app/models/live_chat/interventions/link.rb    |  2 +-
 app/models/notification.rb                    |  6 +-
 app/models/phone.rb                           |  2 +-
 app/models/question.rb                        | 12 ++--
 app/models/question/currency.rb               |  2 +-
 app/models/question/date.rb                   |  2 +-
 app/models/question/follow_up_contact.rb      |  2 +-
 app/models/question/free_response.rb          |  2 +-
 app/models/question/grid.rb                   |  2 +-
 app/models/question/multiple.rb               |  2 +-
 app/models/question/name.rb                   |  2 +-
 app/models/question/narrator/blobs.rb         |  3 +-
 app/models/question/number.rb                 |  2 +-
 app/models/question/participant_report.rb     |  2 +-
 app/models/question/phone.rb                  |  2 +-
 app/models/question/single.rb                 |  2 +-
 app/models/question/slider.rb                 |  2 +-
 app/models/question/sms.rb                    |  2 +-
 app/models/question/sms_information.rb        |  2 +-
 app/models/question/third_party.rb            |  2 +-
 app/models/report_template.rb                 |  6 +-
 app/models/session.rb                         | 19 +++---
 app/models/session/classic.rb                 |  2 +-
 app/models/session/sms.rb                     |  2 +-
 app/models/sms_link.rb                        |  2 +-
 app/models/sms_plan.rb                        |  8 +--
 app/models/time_range.rb                      |  2 +-
 app/models/user.rb                            |  8 +--
 app/models/user_intervention.rb               |  2 +-
 app/serializers/concerns/file_helper.rb       |  2 +-
 .../v1/hfhs_patient_detail_serializer.rb      |  2 +-
 app/serializers/v1/intervention_serializer.rb |  2 +-
 app/serializers/v1/question_serializer.rb     |  2 +-
 .../v1/simple_intervention_serializer.rb      |  2 +-
 app/services/api/cat_mh.rb                    |  2 +-
 app/services/api/cat_mh/answer.rb             |  2 +-
 app/services/api/cat_mh/authentication.rb     |  2 +-
 app/services/api/cat_mh/break_lock.rb         |  4 +-
 app/services/api/cat_mh/check_status.rb       |  2 +-
 app/services/api/cat_mh/create_interview.rb   |  2 +-
 .../api/cat_mh/initialize_interview.rb        |  2 +-
 app/services/api/cat_mh/question.rb           |  2 +-
 app/services/api/cat_mh/result.rb             |  2 +-
 app/services/api/cat_mh/terminate_session.rb  |  2 +-
 app/services/communication/sms.rb             |  6 +-
 app/services/import/v1/question_service.rb    |  2 +-
 app/services/v1/flow_service/next_question.rb |  2 +-
 .../next_question/branching_service.rb        |  2 +-
 .../generated_reports/share_to_third_party.rb |  9 ++-
 app/services/v1/google/translation_service.rb |  4 +-
 .../send_sms_invitation.rb                    |  2 +-
 app/services/v1/intervention/update.rb        |  2 +-
 .../generate_transcript/intervention.rb       |  2 +-
 .../v1/notifications/transcript_ready.rb      |  2 +-
 app/services/v1/question/update.rb            |  2 +-
 .../v1/session_or_intervention/link.rb        | 14 ++---
 .../re_schedule_sms_for_user_session.rb       |  2 +-
 .../schedule_sms_for_user_session.rb          |  2 +-
 app/services/v1/teams/change_team_admin.rb    |  2 +-
 app/services/v1/teams/invite.rb               |  2 +-
 .../variable_exclusive_translation_service.rb |  2 +-
 .../v1/user_session_schedule_service.rb       |  2 +-
 config/application.rb                         |  6 +-
 config/environments/development.rb            |  4 +-
 config/environments/production.rb             | 10 ++--
 config/environments/test.rb                   |  2 +-
 config/initializers/active_job_adapter.rb     |  8 +--
 .../application_controller_renderer.rb        |  1 +
 config/initializers/backtrace_silencers.rb    |  1 +
 config/initializers/cors.rb                   |  2 +-
 config/initializers/inflections.rb            |  1 +
 config/initializers/lockbox.rb                |  2 +-
 config/initializers/sentry.rb                 |  4 +-
 config/routes.rb                              |  4 +-
 db/seeds.rb                                   |  2 +-
 db/seeds/fake.rb                              | 18 +++---
 db/seeds/interventions/cias_seed.rb           |  4 +-
 db/seeds/interventions/seed_helpers.rb        |  8 +--
 docs/v1/lib/multilang.rb                      |  2 +-
 docs/v1/lib/toc_data.rb                       | 17 +++---
 lib/tasks/clean_audio_blobs.rake              |  2 +-
 lib/tasks/docs.rake                           |  2 +-
 lib/tasks/seeds/setup_teams.rake              |  4 +-
 spec/benchmarks/answers/answer_index_spec.rb  | 14 +++--
 .../interventions/interventions_index_spec.rb | 14 +++--
 .../question_group_index_spec.rb              | 14 +++--
 .../question_group_show_spec.rb               | 14 +++--
 .../questions/question_index_spec.rb          | 14 +++--
 .../sessions/sessions_index_spec.rb           | 14 +++--
 .../user_intervention_index_spec.rb           | 14 +++--
 spec/benchmarks/users/user_index_spec.rb      | 16 ++---
 spec/factories/invitations.rb                 |  2 +-
 .../interventions/navigator_invitation.rb     |  2 +-
 spec/factories/users.rb                       |  2 +-
 spec/jobs/clone_jobs/intervention_spec.rb     | 16 +++--
 spec/jobs/clone_jobs/session_spec.rb          |  7 +--
 .../intervention_job_spec.rb                  |  4 +-
 .../send_fill_invitation/session_job_spec.rb  |  9 +--
 .../autoclose_session_job_spec.rb             |  2 +-
 .../send_question_sms_job_spec.rb             |  4 +-
 spec/models/clinic_location_spec.rb           |  3 +-
 spec/models/collaborator_spec.rb              |  4 +-
 spec/models/hfhs_patient_details_spec.rb      |  7 +--
 spec/models/intervention/csv_spec.rb          | 32 +++++-----
 spec/models/intervention_spec.rb              | 32 ++++++----
 spec/models/link_spec.rb                      |  6 +-
 spec/models/predefined_user_parameter_spec.rb |  4 +-
 spec/models/question/bar_graph_spec.rb        |  2 +-
 spec/models/question/currency_spec.rb         |  2 +-
 spec/models/question/date_spec.rb             |  2 +-
 spec/models/question/external_link_spec.rb    |  2 +-
 spec/models/question/feedback_spec.rb         |  2 +-
 spec/models/question/finish_spec.rb           |  2 +-
 .../models/question/follow_up_contact_spec.rb |  2 +-
 spec/models/question/free_response_spec.rb    |  2 +-
 spec/models/question/grid_spec.rb             |  2 +-
 spec/models/question/henry_ford_spec.rb       |  2 +-
 spec/models/question/information_spec.rb      |  2 +-
 spec/models/question/name_spec.rb             |  2 +-
 spec/models/question/number_spec.rb           |  2 +-
 .../question/participant_report_spec.rb       |  2 +-
 spec/models/question/phone_spec.rb            |  2 +-
 spec/models/question/single_spec.rb           |  2 +-
 spec/models/question/slider_spec.rb           |  2 +-
 spec/models/question/sms_information_spec.rb  |  2 +-
 spec/models/question/sms_spec.rb              |  2 +-
 spec/models/session_spec.rb                   | 17 +++---
 spec/models/short_link_spec.rb                |  1 -
 spec/rails_helper.rb                          |  6 +-
 spec/requests/v1/charts/create_spec.rb        | 10 ++--
 .../requests/v1/health_clinics/create_spec.rb | 12 ++--
 .../v1/health_clinics/destroy_spec.rb         |  2 +-
 .../invitations/confirm_spec.rb               |  4 +-
 .../requests/v1/health_clinics/update_spec.rb | 14 +++--
 .../requests/v1/health_systems/create_spec.rb |  8 +--
 .../invitations/confirm_spec.rb               |  4 +-
 spec/requests/v1/health_systems/show_spec.rb  | 44 ++++++++------
 .../requests/v1/health_systems/update_spec.rb | 10 ++--
 .../henry_ford/clinic_locations/index_spec.rb |  2 +-
 .../v1/interventions/access/create_spec.rb    |  2 +-
 .../answers/csv_attachment_spec.rb            |  2 +-
 .../v1/interventions/answers/index_spec.rb    |  2 +-
 ...generated_conversations_transcript_spec.rb |  4 +-
 spec/requests/v1/interventions/index_spec.rb  |  6 +-
 .../interventions/invitations/create_spec.rb  | 13 ++--
 .../interventions/invitations/resend_spec.rb  |  2 +-
 .../v1/interventions/transfers/export_spec.rb |  2 +-
 .../v1/interventions/transfers/import_spec.rb |  2 +-
 .../v1/interventions/users/create_spec.rb     |  2 +-
 .../navigator_invitations/confirm_spec.rb     |  2 +-
 .../interventions/navigators/create_spec.rb   |  2 +-
 .../v1/live_chat/navigators/tabs/show_spec.rb |  6 +-
 spec/requests/v1/organizations/create_spec.rb | 10 ++--
 .../dashboard_sections/create_spec.rb         | 10 ++--
 .../dashboard_sections/update_spec.rb         | 12 ++--
 .../organizations/invitations/confirm_spec.rb |  4 +-
 spec/requests/v1/organizations/update_spec.rb | 12 ++--
 .../v1/questions/update_narrator_spec.rb      | 60 +++++++++----------
 .../v1/sessions/reflectable_questions_spec.rb |  2 +-
 spec/requests/v1/sms_plans/index_spec.rb      |  6 +-
 .../v1/teams/invitations/confirm_spec.rb      |  4 +-
 .../v1/users/invitations/edit_spec.rb         |  2 +-
 spec/services/v1/audio_service_spec.rb        |  4 +-
 .../v1/generated_reports/create_spec.rb       |  6 +-
 .../share_to_third_party_spec.rb              |  2 +-
 .../send_sms_invitation_spec.rb               |  2 +-
 spec/services/v1/intervention/publish_spec.rb |  2 +-
 .../organizations/invitations/create_spec.rb  |  6 +-
 spec/services/v1/question/update_spec.rb      |  2 +-
 .../share_externally_service_spec.rb          |  4 +-
 .../v1/session_or_intervention/link_spec.rb   | 10 ++--
 .../v1/translations/intervention_spec.rb      |  6 +-
 .../v1/translations/narrator_blocks_spec.rb   |  5 +-
 .../v1/user_sessions/create_service_spec.rb   |  2 +-
 spec/support/custom_cancan_matcher.rb         |  4 +-
 203 files changed, 609 insertions(+), 557 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a28a31bc..76688cce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,6 +50,7 @@ jobs:
     needs: setup_environment
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         chunk: ${{ fromJson(needs.setup_environment.outputs.test-chunk-ids) }}
     services:
diff --git a/.rubocop.yml b/.rubocop.yml
index 1d17f57a..bf136d5a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -20,9 +20,6 @@ AllCops:
 Bundler/OrderedGems:
   Enabled: false
 
-RSpec/FactoryBot:
-  Enabled: false
-
 Layout/DotPosition:
   Enabled: false
 
@@ -280,6 +277,9 @@ Style/RedundantRegexpEscape:
 Style/RedundantSelfAssignment:
   Enabled: true
 
+Style/SafeNavigationChainLength:
+  Max: 5
+
 Style/SingleArgumentDig:
   Enabled: true
 
@@ -412,13 +412,13 @@ RSpec/VerifiedDoubles:
   Exclude:
     - 'spec/**/*'
 
-RSpec/FilePath:
-  Enabled: true
-
 RSpec/AnyInstance:
   Exclude:
     - 'spec/**/*'
 
+RSpec/IndexedLet:
+  Enabled: false
+
 RSpec/StubbedMock:
   Exclude:
     - 'spec/requests/v1/organizations/invitations/invite_organization_admin_spec.rb'
diff --git a/app/controllers/concerns/resource/position.rb b/app/controllers/concerns/resource/position.rb
index 9407a951..2702dbce 100644
--- a/app/controllers/concerns/resource/position.rb
+++ b/app/controllers/concerns/resource/position.rb
@@ -22,6 +22,6 @@ def position_params
   end
 
   def response_scope
-    { controller_name.to_s => send("#{controller_name}_scope") }
+    { controller_name.to_s => send(:"#{controller_name}_scope") }
   end
 end
diff --git a/app/controllers/v1/henry_ford/clinic_locations_controller.rb b/app/controllers/v1/henry_ford/clinic_locations_controller.rb
index 1530e683..22e72f6e 100644
--- a/app/controllers/v1/henry_ford/clinic_locations_controller.rb
+++ b/app/controllers/v1/henry_ford/clinic_locations_controller.rb
@@ -4,6 +4,6 @@ class V1::HenryFord::ClinicLocationsController < V1Controller
   def index
     authorize! :read, Intervention
 
-    render json: serialized_hash(ClinicLocation.all.order(:name))
+    render json: serialized_hash(ClinicLocation.order(:name))
   end
 end
diff --git a/app/controllers/v1/interventions/answers_controller.rb b/app/controllers/v1/interventions/answers_controller.rb
index 61583ef6..c0b803ff 100644
--- a/app/controllers/v1/interventions/answers_controller.rb
+++ b/app/controllers/v1/interventions/answers_controller.rb
@@ -16,7 +16,8 @@ def csv_attachment
 
     head :no_content unless intervention.reports.attached?
 
-    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true), allow_other_host: true)
+    redirect_to(ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true),
+                allow_other_host: true)
   end
 
   private
diff --git a/app/controllers/v1/interventions/collaborators_controller.rb b/app/controllers/v1/interventions/collaborators_controller.rb
index 35928031..d6f25395 100644
--- a/app/controllers/v1/interventions/collaborators_controller.rb
+++ b/app/controllers/v1/interventions/collaborators_controller.rb
@@ -7,20 +7,18 @@ def index
     render json: serialized_response(collaborators_scope)
   end
 
-  def create
-    authorize! :manage_collaborators, Intervention
-
-    new_collaborators = V1::Intervention::Collaborators::CreateService.call(intervention_load, emails)
+  def show
+    authorize! :read, Intervention
 
-    render json: serialized_response(new_collaborators), status: :created
+    render json: serialized_response(collaborators_scope.find_by!(user_id: current_v1_user.id), controller_name.classify, params: { skip_user_data: true })
   end
 
-  def destroy
+  def create
     authorize! :manage_collaborators, Intervention
 
-    V1::Intervention::Collaborators::DestroyService.call(collaborator_load)
+    new_collaborators = V1::Intervention::Collaborators::CreateService.call(intervention_load, emails)
 
-    head :no_content
+    render json: serialized_response(new_collaborators), status: :created
   end
 
   def update
@@ -31,10 +29,12 @@ def update
     render json: serialized_response(collaborator_load)
   end
 
-  def show
-    authorize! :read, Intervention
+  def destroy
+    authorize! :manage_collaborators, Intervention
 
-    render json: serialized_response(collaborators_scope.find_by!(user_id: current_v1_user.id), controller_name.classify, params: { skip_user_data: true })
+    V1::Intervention::Collaborators::DestroyService.call(collaborator_load)
+
+    head :no_content
   end
 
   private
diff --git a/app/controllers/v1/interventions/predefined_participants_controller.rb b/app/controllers/v1/interventions/predefined_participants_controller.rb
index 8aebadb4..4a4193e6 100644
--- a/app/controllers/v1/interventions/predefined_participants_controller.rb
+++ b/app/controllers/v1/interventions/predefined_participants_controller.rb
@@ -4,14 +4,14 @@ class V1::Interventions::PredefinedParticipantsController < V1Controller
   before_action :verify_access, except: [:verify]
   skip_before_action :authenticate_user!, only: %i[verify]
 
-  def show
-    render json: serialized_response(predefined_participant)
-  end
-
   def index
     render json: serialized_response(predefined_participants)
   end
 
+  def show
+    render json: serialized_response(predefined_participant)
+  end
+
   def create
     return head :forbidden unless intervention_load.ability_to_update_for?(current_v1_user)
 
diff --git a/app/controllers/v1/interventions/short_links_controller.rb b/app/controllers/v1/interventions/short_links_controller.rb
index ab90478d..b0960ce0 100644
--- a/app/controllers/v1/interventions/short_links_controller.rb
+++ b/app/controllers/v1/interventions/short_links_controller.rb
@@ -3,6 +3,13 @@
 class V1::Interventions::ShortLinksController < V1Controller
   skip_before_action :authenticate_user!, only: %i[verify]
 
+  def index
+    authorize! :index, Intervention
+    authorize! :index, intervention_load
+
+    render json: serialized_short_links_with_clinics
+  end
+
   def create
     authorize! :update, Intervention
     authorize! :update, intervention_load
@@ -12,13 +19,6 @@ def create
     render json: serialized_short_links_with_clinics
   end
 
-  def index
-    authorize! :index, Intervention
-    authorize! :index, intervention_load
-
-    render json: serialized_short_links_with_clinics
-  end
-
   def verify
     render json: V1::ShortLinks::MapService.call(slug, current_v1_user)
   end
diff --git a/app/controllers/v1/interventions_controller.rb b/app/controllers/v1/interventions_controller.rb
index bde96beb..9d5e1121 100644
--- a/app/controllers/v1/interventions_controller.rb
+++ b/app/controllers/v1/interventions_controller.rb
@@ -59,7 +59,9 @@ def generated_conversations_transcript
 
     head :no_content unless intervention_load.conversations_transcript.attached?
 
-    redirect_to(ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention_load.conversations_transcript, only_path: true), allow_other_host: true)
+    redirect_to(ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(
+      intervention_load.conversations_transcript, only_path: true
+    ), allow_other_host: true)
   end
 
   def clear_user_data
diff --git a/app/controllers/v1/live_chat/interventions/files_controller.rb b/app/controllers/v1/live_chat/interventions/files_controller.rb
index f4f0afbb..7c4a09b3 100644
--- a/app/controllers/v1/live_chat/interventions/files_controller.rb
+++ b/app/controllers/v1/live_chat/interventions/files_controller.rb
@@ -58,6 +58,6 @@ def assign_file_to_setup!
   end
 
   def selected_files(files_for)
-    setup_load.public_send("#{files_for.singularize}_files")
+    setup_load.public_send(:"#{files_for.singularize}_files")
   end
 end
diff --git a/app/controllers/v1/live_chat/interventions/links_controller.rb b/app/controllers/v1/live_chat/interventions/links_controller.rb
index ab1e1178..22c72bd9 100644
--- a/app/controllers/v1/live_chat/interventions/links_controller.rb
+++ b/app/controllers/v1/live_chat/interventions/links_controller.rb
@@ -1,16 +1,6 @@
 # frozen_string_literal: true
 
 class V1::LiveChat::Interventions::LinksController < V1Controller
-  def update
-    authorize! :update, Intervention
-    authorize! :update, intervention_load
-    return head :forbidden unless intervention_load.ability_to_update_for?(current_v1_user)
-
-    link = link_load
-    link.update!(link_params)
-    head :ok
-  end
-
   def create
     authorize! :update, Intervention
     authorize! :create, intervention_load
@@ -22,6 +12,16 @@ def create
            status: :created
   end
 
+  def update
+    authorize! :update, Intervention
+    authorize! :update, intervention_load
+    return head :forbidden unless intervention_load.ability_to_update_for?(current_v1_user)
+
+    link = link_load
+    link.update!(link_params)
+    head :ok
+  end
+
   def destroy
     authorize! :delete, LiveChat::Interventions::Link
     authorize! :update, intervention_load
diff --git a/app/controllers/v1/sms_plans/alert_phones/phones_controller.rb b/app/controllers/v1/sms_plans/alert_phones/phones_controller.rb
index b00f0e6a..5497b6f4 100644
--- a/app/controllers/v1/sms_plans/alert_phones/phones_controller.rb
+++ b/app/controllers/v1/sms_plans/alert_phones/phones_controller.rb
@@ -9,17 +9,17 @@ def create
     render json: serialized_response(phone, 'Phone'), status: :created
   end
 
-  def destroy
-    phone_load.destroy!
-    head :no_content
-  end
-
   def update
     phone = phone_load
     phone.update!(phone_params)
     render json: serialized_response(phone, 'Phone')
   end
 
+  def destroy
+    phone_load.destroy!
+    head :no_content
+  end
+
   private
 
   def alert_params
diff --git a/app/controllers/v1/user_sessions_controller.rb b/app/controllers/v1/user_sessions_controller.rb
index c5ffcbb9..d8d0ac56 100644
--- a/app/controllers/v1/user_sessions_controller.rb
+++ b/app/controllers/v1/user_sessions_controller.rb
@@ -4,16 +4,6 @@ class V1::UserSessionsController < V1Controller
   skip_before_action :authenticate_user!, only: %i[create show_or_create]
   before_action :validate_intervention_status
 
-  def create
-    validate_session_status
-    user_session = V1::UserSessions::CreateService.call(session_id, user_id, health_clinic_id)
-    authorize! :create, user_session
-    user_session.save!
-    @current_v1_user_or_guest_user.update!(quick_exit_enabled: true) if intervention.quick_exit?
-
-    render json: serialized_response(user_session), status: :ok
-  end
-
   def show
     validate_session_status
     authorize! :read, UserSession
@@ -26,6 +16,16 @@ def show
     user_session.user_intervention.in_progress!
   end
 
+  def create
+    validate_session_status
+    user_session = V1::UserSessions::CreateService.call(session_id, user_id, health_clinic_id)
+    authorize! :create, user_session
+    user_session.save!
+    @current_v1_user_or_guest_user.update!(quick_exit_enabled: true) if intervention.quick_exit?
+
+    render json: serialized_response(user_session), status: :ok
+  end
+
   def show_or_create
     validate_session_status
     user_session = V1::UserSessions::FetchOrCreateService.call(session_id, user_id, health_clinic_id)
diff --git a/app/controllers/v1/users/invitations_controller.rb b/app/controllers/v1/users/invitations_controller.rb
index 50151ef2..c246fd43 100644
--- a/app/controllers/v1/users/invitations_controller.rb
+++ b/app/controllers/v1/users/invitations_controller.rb
@@ -7,6 +7,18 @@ def index
     render json: serialized_response(researchers_not_accepted_invitations, 'User', { only_email: true })
   end
 
+  # This endpoint will be hit from mailer link, thus it needs to be public
+  def edit
+    user = User.where.not(invitation_token: nil).find_by_invitation_token(invitation_token, true)
+
+    # Unfortunetly find_by_invitation_token method doesn't raise exception when there is no user
+    # and there is no version with !
+    return redirect_to_web_app(error: I18n.t('users.invite.not_active')) if user.blank?
+
+    redirect_to "#{ENV.fetch('WEB_URL', nil)}/register?invitation_token=#{invitation_token}&email=#{user.email}&role=#{user.roles.first}",
+                allow_other_host: true
+  end
+
   def create
     authorize! :create, User
 
@@ -34,17 +46,6 @@ def resend
     end
   end
 
-  # This endpoint will be hit from mailer link, thus it needs to be public
-  def edit
-    user = User.where.not(invitation_token: nil).find_by_invitation_token(invitation_token, true) # rubocop:disable Rails/DynamicFindBy
-
-    # Unfortunetly find_by_invitation_token method doesn't raise exception when there is no user
-    # and there is no version with !
-    return redirect_to_web_app(error: I18n.t('users.invite.not_active')) if user.blank?
-
-    redirect_to "#{ENV['WEB_URL']}/register?invitation_token=#{invitation_token}&email=#{user.email}&role=#{user.roles.first}", allow_other_host: true
-  end
-
   # This endpoint is hit from registration page to register new user from invitation
   # link, thus there is no need for authorization
   def update
diff --git a/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
index 53652c5a..0ebedb87 100644
--- a/app/controllers/v1/users_controller.rb
+++ b/app/controllers/v1/users_controller.rb
@@ -116,7 +116,7 @@ def terms_confirmation_params
   end
 
   def user_params
-    if (current_v1_user.roles & %w[researcher team_admin]).present? && current_v1_user.id != user_id
+    if current_v1_user.roles.intersect?(%w[researcher team_admin]) && current_v1_user.id != user_id
       params.require(:user).permit(
         :active
       )
diff --git a/app/controllers/v1_controller.rb b/app/controllers/v1_controller.rb
index 607d0d0e..05ff76e5 100644
--- a/app/controllers/v1_controller.rb
+++ b/app/controllers/v1_controller.rb
@@ -65,6 +65,6 @@ def invalidate_cache(obj)
   def redirect_to_web_app(message)
     message.transform_values! { |v| Base64.encode64(v) }
 
-    redirect_to "#{ENV['WEB_URL']}?#{message.to_query}", allow_other_host: true
+    redirect_to "#{ENV.fetch('WEB_URL', nil)}?#{message.to_query}", allow_other_host: true
   end
 end
diff --git a/app/jobs/interventions/re_publish_job.rb b/app/jobs/interventions/re_publish_job.rb
index 7fa0cfd0..5817ff7d 100644
--- a/app/jobs/interventions/re_publish_job.rb
+++ b/app/jobs/interventions/re_publish_job.rb
@@ -12,7 +12,7 @@ def perform(intervention_id)
   private
 
   def send_scheduled_invitation_from_past(user_sessions, intervention)
-    user_sessions.where(scheduled_at: intervention.paused_at..DateTime.now).each do |user_session|
+    user_sessions.where(scheduled_at: intervention.paused_at..DateTime.now).find_each do |user_session|
       user_session.session.send_link_to_session(user_session.user, user_session.health_clinic)
     end
   end
diff --git a/app/jobs/live_chat/generate_transcript_job.rb b/app/jobs/live_chat/generate_transcript_job.rb
index b80696b4..ac7807e2 100644
--- a/app/jobs/live_chat/generate_transcript_job.rb
+++ b/app/jobs/live_chat/generate_transcript_job.rb
@@ -19,7 +19,7 @@ def perform(obj_id, model_class, file_attach_point, intervention_name, user_id)
 
     return unless user.email_notification
 
-    LiveChat::TranscriptMailer.send("#{object_name.downcase}_transcript", user.email, object).deliver_now
+    LiveChat::TranscriptMailer.send(:"#{object_name.downcase}_transcript", user.email, object).deliver_now
   end
 
   private
diff --git a/app/jobs/user_session_jobs/send_question_sms_job.rb b/app/jobs/user_session_jobs/send_question_sms_job.rb
index 90d73fe5..68e47729 100644
--- a/app/jobs/user_session_jobs/send_question_sms_job.rb
+++ b/app/jobs/user_session_jobs/send_question_sms_job.rb
@@ -30,10 +30,10 @@ def perform(user_id, question_id, user_session_id, reminder, postponed = false)
     outdated_message = false
 
     if user.pending_sms_answer && question.type == 'Question::Sms'
-      datetime_of_next_job = DateTime.current.in_time_zone(ENV['CSV_TIMESTAMP_TIME_ZONE']) + 5.minutes
+      datetime_of_next_job = DateTime.current.in_time_zone(ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)) + 5.minutes
 
       # Skip question if next day
-      if datetime_of_next_job < DateTime.current.in_time_zone(ENV['CSV_TIMESTAMP_TIME_ZONE']).end_of_day
+      if datetime_of_next_job < DateTime.current.in_time_zone(ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)).end_of_day
         UserSessionJobs::SendQuestionSmsJob.set(wait_until: datetime_of_next_job).perform_later(user_id, question_id, user_session_id, false, true)
       else
         outdated_message = true
@@ -65,15 +65,16 @@ def schedule_question_followups(user, question, user_session)
     # Get proper configuration
     every_number_of_hours = question.sms_reminders['per_hours'].to_i
     for_number_of_days = question.sms_reminders['number_of_days'].to_i
-    from = ActiveSupport::TimeZone[ENV['CSV_TIMESTAMP_TIME_ZONE']].parse(question.sms_reminders['from'] || '')
-    to = ActiveSupport::TimeZone[ENV['CSV_TIMESTAMP_TIME_ZONE']].parse(question.sms_reminders['to'] || '')
+    from = ActiveSupport::TimeZone[ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)].parse(question.sms_reminders['from'] || '')
+    to = ActiveSupport::TimeZone[ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)].parse(question.sms_reminders['to'] || '')
 
     return unless every_number_of_hours && for_number_of_days && from && to
 
     # Prepare all vars for calculation of all reminders
-    reminders_datetimes = [DateTime.current.in_time_zone(ENV['CSV_TIMESTAMP_TIME_ZONE'])]
+    reminders_datetimes = [DateTime.current.in_time_zone(ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil))]
     calculated_datetime = reminders_datetimes.last
-    last_possible_reminder = ActiveSupport::TimeZone[ENV['CSV_TIMESTAMP_TIME_ZONE']].parse(question.sms_reminders['to']) + (for_number_of_days - 1).days
+    last_possible_reminder = ActiveSupport::TimeZone[ENV.fetch('CSV_TIMESTAMP_TIME_ZONE',
+                                                               nil)].parse(question.sms_reminders['to']) + (for_number_of_days - 1).days
 
     # Calculate all possible datetimes
     while calculated_datetime + every_number_of_hours.hour < last_possible_reminder
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 7e4c61c4..c665edf2 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -3,7 +3,7 @@
 class ApplicationMailer < ActionMailer::Base
   around_action :with_locale, if: -> { params && params[:locale].present? }
 
-  default from: ENV['EMAIL_DEFAULT_FROM']
+  default from: ENV.fetch('EMAIL_DEFAULT_FROM', nil)
   layout 'mailer'
 
   protected
diff --git a/app/models/audio/text_to_speech/google.rb b/app/models/audio/text_to_speech/google.rb
index 6b2dd698..ca6a954f 100644
--- a/app/models/audio/text_to_speech/google.rb
+++ b/app/models/audio/text_to_speech/google.rb
@@ -43,12 +43,12 @@ def client
   def credentials
     @credentials ||= begin
       if Rails.env.development?
-        Oj.load_file(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
+        Oj.load_file(ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil))
       else
-        Oj.load(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
+        Oj.load(ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil))
       end
     rescue Oj::ParseError
-      ENV['GOOGLE_APPLICATION_CREDENTIALS']
+      ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil)
     end
   end
 
diff --git a/app/models/chart.rb b/app/models/chart.rb
index bfa8c105..09da7ca1 100644
--- a/app/models/chart.rb
+++ b/app/models/chart.rb
@@ -12,14 +12,14 @@ class Chart < ApplicationRecord
   attribute :formula, :json, default: -> { assign_default_values('formula') }
 
   validates :formula, presence: true, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
+                                                        File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                                       }, message: lambda { |err|
                                                                     err
                                                                   } }
 
-  enum status: { draft: 'draft', data_collection: 'data_collection', published: 'published' }
-  enum chart_type: { bar_chart: 'bar_chart', pie_chart: 'pie_chart', percentage_bar_chart: 'percentage_bar_chart' }
-  enum interval_type: { monthly: 'monthly', quarterly: 'quarterly' } # only for bar charts
+  enum :status, { draft: 'draft', data_collection: 'data_collection', published: 'published' }
+  enum :chart_type, { bar_chart: 'bar_chart', pie_chart: 'pie_chart', percentage_bar_chart: 'percentage_bar_chart' }
+  enum :interval_type, { monthly: 'monthly', quarterly: 'quarterly' } # only for bar charts
   default_scope { order(:position) }
   after_update_commit :status_change
 
diff --git a/app/models/concerns/clone.rb b/app/models/concerns/clone.rb
index 2780472a..be191d4a 100644
--- a/app/models/concerns/clone.rb
+++ b/app/models/concerns/clone.rb
@@ -12,19 +12,14 @@ def clone(params: {}, clean_formulas: true, position: nil, hidden: false)
       return clone_module.new(self, user_id: current_user_id, clean_formulas: clean_formulas, position: position, params: params, hidden: hidden).execute
     end
 
-    cloned_elements = []
-
     _existing_emails, non_existing_emails = split_emails_exist(emails)
     invite_non_existing_users(non_existing_emails, true, [:researcher])
 
     user_ids = User.where(email: emails).limit_to_roles(%w[e_intervention_admin researcher]).pluck(:id)
 
-    user_ids.each do |user_id|
-      cloned_elements.push(
-        clone_module.new(self, { user_id: user_id, clean_formulas: clean_formulas, position: position, hidden: hidden }).execute
-      )
+    user_ids.map do |user_id|
+      clone_module.new(self, { user_id: user_id, clean_formulas: clean_formulas, position: position, hidden: hidden }).execute
     end
-    cloned_elements
   end
 
   private
diff --git a/app/models/concerns/enumerate_for_concern.rb b/app/models/concerns/enumerate_for_concern.rb
index 2020fdff..39cee050 100644
--- a/app/models/concerns/enumerate_for_concern.rb
+++ b/app/models/concerns/enumerate_for_concern.rb
@@ -34,14 +34,14 @@ def enumerate_for(field, values, as_like: nil, multiple: false, **options)
         values
       end
 
-      define_method("#{field}=") do |value|
+      define_method(:"#{field}=") do |value|
         value = value.compact_blank if value && multiple
         self[field] = value
       end
 
       return unless as_like != field
 
-      alias_method "#{as_like}=", "#{field}="
+      alias_method :"#{as_like}=", :"#{field}="
       alias_method as_like, field
     end
   end
diff --git a/app/models/concerns/meta_operations.rb b/app/models/concerns/meta_operations.rb
index 597627a4..34a11f24 100644
--- a/app/models/concerns/meta_operations.rb
+++ b/app/models/concerns/meta_operations.rb
@@ -47,7 +47,7 @@ def filename
     end
 
     def tmp_file # rubocop:disable Lint/DuplicateMethods
-      @tmp_file ||= File.open(Rails.root.join('tmp', filename), 'wb') do |file|
+      @tmp_file ||= Rails.root.join('tmp', filename).open('wb') do |file|
         file.write(stream)
         file.path
       end
@@ -63,7 +63,7 @@ def attach_tmp_file
     end
 
     def delete_tmp_file
-      File.delete(tmp_file) if File.exist?(tmp_file)
+      FileUtils.rm_f(tmp_file)
     end
   end
 end
diff --git a/app/models/generated_report.rb b/app/models/generated_report.rb
index c3b74534..f83f07f5 100644
--- a/app/models/generated_report.rb
+++ b/app/models/generated_report.rb
@@ -20,7 +20,7 @@ class GeneratedReport < ApplicationRecord
 
   validates :pdf_report, content_type: %w[application/pdf]
 
-  enum report_for: {
+  enum :report_for, {
     third_party: 'third_party',
     participant: 'participant',
     henry_ford_health: 'henry_ford_health'
diff --git a/app/models/hfhs_patient_detail.rb b/app/models/hfhs_patient_detail.rb
index b3b35098..142afcae 100644
--- a/app/models/hfhs_patient_detail.rb
+++ b/app/models/hfhs_patient_detail.rb
@@ -5,7 +5,7 @@ class HfhsPatientDetail < ApplicationRecord
 
   # ENCRYPTION
   has_encrypted :patient_id, :first_name, :last_name, :sex, :visit_id, :zip_code, :phone_number, :phone_type, :provided_first_name, :provided_last_name,
-           :provided_sex, :provided_zip, :provided_phone_number, :provided_phone_type, :provided_dob
+                :provided_sex, :provided_zip, :provided_phone_number, :provided_phone_type, :provided_dob
   has_encrypted :dob, type: :date
   blind_index :patient_id, :first_name, :last_name, :dob, :sex, :zip_code, :phone_number, :phone_type, :provided_first_name, :provided_last_name,
               :provided_sex, :provided_zip, :provided_phone_number, :provided_phone_type, :provided_dob
@@ -18,5 +18,5 @@ class HfhsPatientDetail < ApplicationRecord
 
   validates :patient_id, presence: true
 
-  enum phone_type: { home: 'home', mobile: 'mobile', work: 'work' }
+  enum :phone_type, { home: 'home', mobile: 'mobile', work: 'work' }
 end
diff --git a/app/models/intervention.rb b/app/models/intervention.rb
index d5f5d96b..db1f0ee6 100644
--- a/app/models/intervention.rb
+++ b/app/models/intervention.rb
@@ -73,14 +73,14 @@ class Intervention < ApplicationRecord
   scope :filter_by_organization, ->(organization_id) { where(organization_id: organization_id) }
   scope :only_shared_with_me, ->(user_id) { joins(:collaborators).where(collaborators: { user_id: user_id }) }
   scope :only_shared_by_me, ->(user_id) { joins(:collaborators).where(user_id: user_id) }
-  scope :only_not_shared_with_anyone, ->(user_id) { left_joins(:collaborators).where(user_id: user_id, collaborators: { id: nil }) }
+  scope :only_not_shared_with_anyone, ->(user_id) { where.missing(:collaborators).where(user_id: user_id) }
   scope :only_starred_by_me, ->(user) { where(id: user.stars.pluck(:intervention_id)) }
 
-  enum shared_to: { anyone: 'anyone', registered: 'registered', invited: 'invited' }, _prefix: :shared_to
-  enum status: STATUSES
-  enum license_type: { limited: 'limited', unlimited: 'unlimited' }, _prefix: :license_type
-  enum current_narrator: { peedy: 0, emmi: 1, crystal: 2 }
-  enum sensitive_data_state: { collected: 'collected', marked_to_remove: 'marked_to_remove', removed: 'removed' }, _prefix: :sensitive_data
+  enum :shared_to, { anyone: 'anyone', registered: 'registered', invited: 'invited' }, prefix: :shared_to
+  enum :status, STATUSES
+  enum :license_type, { limited: 'limited', unlimited: 'unlimited' }, prefix: :license_type
+  enum :current_narrator, { peedy: 0, emmi: 1, crystal: 2 }
+  enum :sensitive_data_state, { collected: 'collected', marked_to_remove: 'marked_to_remove', removed: 'removed' }, prefix: :sensitive_data
 
   before_validation :assign_default_google_language
   before_save :create_navigator_setup, if: -> { live_chat_enabled && navigator_setup.nil? }
@@ -221,7 +221,7 @@ def cat_settings_validation
   end
 
   def live_chat_validation
-    return if status == 'published' || status == 'draft'
+    return if %w[published draft].include?(status)
 
     errors.add(:base, I18n.t('activerecord.errors.models.intervention.attributes.live_chat_wrong_session_status')) if live_chat_enabled
   end
diff --git a/app/models/live_chat/interventions/link.rb b/app/models/live_chat/interventions/link.rb
index 6ab4afa2..6abd53a9 100644
--- a/app/models/live_chat/interventions/link.rb
+++ b/app/models/live_chat/interventions/link.rb
@@ -7,7 +7,7 @@ class LiveChat::Interventions::Link < ApplicationRecord
   validates :url, length: { maximum: 2048 }
   default_scope { order(created_at: :desc) }
 
-  enum link_for: { participants: 0, navigators: 1 }
+  enum :link_for, { participants: 0, navigators: 1 }
 
   scope :for_participants, -> { where(link_for: :participant) }
   scope :for_navigators, -> { where(link_for: :navigators) }
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 99c67121..b8345257 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -6,9 +6,9 @@ class Notification < ApplicationRecord
 
   after_create :send_notification
 
-  enum event: { new_conversation: 0, auto_generated_conversation: 1, conversation_transcript_ready: 2, intervention_conversations_transcript_ready: 3,
-                successfully_restored_intervention: 4, unsuccessful_intervention_import: 5, new_narrator_was_set: 6,
-                new_collaborator_added: 7, start_editing_intervention: 8, stop_editing_intervention: 9, collaborator_removed: 10, sensitive_data_removed: 11 }
+  enum :event, { new_conversation: 0, auto_generated_conversation: 1, conversation_transcript_ready: 2, intervention_conversations_transcript_ready: 3,
+                 successfully_restored_intervention: 4, unsuccessful_intervention_import: 5, new_narrator_was_set: 6,
+                 new_collaborator_added: 7, start_editing_intervention: 8, stop_editing_intervention: 9, collaborator_removed: 10, sensitive_data_removed: 11 }
 
   validates :data, json: { schema: lambda {
     File.read(Rails.root.join("#{json_schema_path}/notification_data.json").to_s)
diff --git a/app/models/phone.rb b/app/models/phone.rb
index f5e1b596..c34726ec 100644
--- a/app/models/phone.rb
+++ b/app/models/phone.rb
@@ -12,7 +12,7 @@ class Phone < ApplicationRecord
   validates :number, presence: true, unless: :alert_phone_exists?, on: %i[save update]
   before_update :remove_confirmation, if: :number_changed?
 
-  enum communication_way: { call: 'call', message: 'message' }
+  enum :communication_way, { call: 'call', message: 'message' }
 
   has_encrypted :number
   blind_index :number
diff --git a/app/models/question.rb b/app/models/question.rb
index 01318c61..ad9beba7 100644
--- a/app/models/question.rb
+++ b/app/models/question.rb
@@ -38,23 +38,23 @@ class Question < ApplicationRecord
   validates :type, presence: true
   validates :position, numericality: { greater_than_or_equal_to: 0 }
   validates :settings, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
+                                         File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :narrator, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/narrator.json").to_s)
+                                         File.read(Rails.root.join("#{json_schema_path}/narrator.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :video_url, format: URI::DEFAULT_PARSER.make_regexp(%w[http https]), allow_blank: true
   validates :formulas, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
+                                         File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :body, presence: true, json: { schema: lambda {
-    File.read(Rails.root.join("db/schema/#{self.class.name.underscore}/body.json").to_s)
+                                                     File.read(Rails.root.join("db/schema/#{self.class.name.underscore}/body.json").to_s)
                                                    }, message: lambda { |err|
                                                                  err
                                                                } }
@@ -213,8 +213,8 @@ def properly_assigned
     return true unless question_group
 
     if session.sms_session_type?
-      errors.add(:base, "Can not add #{type} to #{session.type}") unless type == 'Question::Sms' || type == 'Question::SmsInformation'
-    elsif type == 'Question::Sms' || type == 'Question::SmsInformation'
+      errors.add(:base, "Can not add #{type} to #{session.type}") unless ['Question::Sms', 'Question::SmsInformation'].include?(type)
+    elsif ['Question::Sms', 'Question::SmsInformation'].include?(type)
       errors.add(:base, "Can not add #{type} to #{session.type}")
     end
   end
diff --git a/app/models/question/currency.rb b/app/models/question/currency.rb
index ad7c4d7f..2669fb55 100644
--- a/app/models/question/currency.rb
+++ b/app/models/question/currency.rb
@@ -6,7 +6,7 @@ class Question::Currency < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/date.rb b/app/models/question/date.rb
index c650f954..fa75283d 100644
--- a/app/models/question/date.rb
+++ b/app/models/question/date.rb
@@ -6,7 +6,7 @@ class Question::Date < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/follow_up_contact.rb b/app/models/question/follow_up_contact.rb
index 157c512b..92e4e8e1 100644
--- a/app/models/question/follow_up_contact.rb
+++ b/app/models/question/follow_up_contact.rb
@@ -6,7 +6,7 @@ class Question::FollowUpContact < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/free_response.rb b/app/models/question/free_response.rb
index 5f532416..892a0822 100644
--- a/app/models/question/free_response.rb
+++ b/app/models/question/free_response.rb
@@ -6,7 +6,7 @@ class Question::FreeResponse < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true,
         'text_limit' => 250 }
     )
diff --git a/app/models/question/grid.rb b/app/models/question/grid.rb
index d5200acf..c3302c64 100644
--- a/app/models/question/grid.rb
+++ b/app/models/question/grid.rb
@@ -4,7 +4,7 @@ class Question::Grid < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'proceed_button' => true, 'required' => true }
     )
   end
diff --git a/app/models/question/multiple.rb b/app/models/question/multiple.rb
index 130d9ac2..a70ea847 100644
--- a/app/models/question/multiple.rb
+++ b/app/models/question/multiple.rb
@@ -4,7 +4,7 @@ class Question::Multiple < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/name.rb b/app/models/question/name.rb
index 7ddf6d68..8f6394e1 100644
--- a/app/models/question/name.rb
+++ b/app/models/question/name.rb
@@ -4,7 +4,7 @@ class Question::Name < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/narrator/blobs.rb b/app/models/question/narrator/blobs.rb
index 795e93a1..e7d8535e 100644
--- a/app/models/question/narrator/blobs.rb
+++ b/app/models/question/narrator/blobs.rb
@@ -33,7 +33,8 @@ def remove(digest)
   def purge
     return if cloned
 
-    count_hash = Hash.new([])
+    count_hash = {}
+    count_hash.default = []
     ids.tally.each do |id, count|
       count_hash[count] += [id]
     end
diff --git a/app/models/question/number.rb b/app/models/question/number.rb
index cf99c2fd..ea231012 100644
--- a/app/models/question/number.rb
+++ b/app/models/question/number.rb
@@ -6,7 +6,7 @@ class Question::Number < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true,
         'max_length' => nil,
         'min_length' => nil }
diff --git a/app/models/question/participant_report.rb b/app/models/question/participant_report.rb
index bce6d05f..72b53f0f 100644
--- a/app/models/question/participant_report.rb
+++ b/app/models/question/participant_report.rb
@@ -4,7 +4,7 @@ class Question::ParticipantReport < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/phone.rb b/app/models/question/phone.rb
index 5292f80a..40fb4461 100644
--- a/app/models/question/phone.rb
+++ b/app/models/question/phone.rb
@@ -4,7 +4,7 @@ class Question::Phone < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true }
     )
   end
diff --git a/app/models/question/single.rb b/app/models/question/single.rb
index 900a17c0..6b4094b4 100644
--- a/app/models/question/single.rb
+++ b/app/models/question/single.rb
@@ -6,7 +6,7 @@ class Question::Single < Question
   attribute :settings, :json, default: -> { assign_default_values('settings') }
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'proceed_button' => true, 'required' => true }
     )
   end
diff --git a/app/models/question/slider.rb b/app/models/question/slider.rb
index 44253cf1..56185dea 100644
--- a/app/models/question/slider.rb
+++ b/app/models/question/slider.rb
@@ -10,7 +10,7 @@ class Question::Slider < Question
   before_validation :change_range_to_integers, if: :body_changed?
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => true, 'show_number' => true }
     )
   end
diff --git a/app/models/question/sms.rb b/app/models/question/sms.rb
index 8827c99a..d642c883 100644
--- a/app/models/question/sms.rb
+++ b/app/models/question/sms.rb
@@ -40,7 +40,7 @@ class Question::Sms < Question
   } }, allow_blank: true
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'proceed_button' => false, 'required' => false }
     )
   end
diff --git a/app/models/question/sms_information.rb b/app/models/question/sms_information.rb
index d5c917da..87f0cbc4 100644
--- a/app/models/question/sms_information.rb
+++ b/app/models/question/sms_information.rb
@@ -18,7 +18,7 @@ class Question::SmsInformation < Question
   before_validation :assign_default_subtitle
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'proceed_button' => false, 'required' => false }
     )
   end
diff --git a/app/models/question/third_party.rb b/app/models/question/third_party.rb
index 8ede9e5f..b63b8b2b 100644
--- a/app/models/question/third_party.rb
+++ b/app/models/question/third_party.rb
@@ -6,7 +6,7 @@ class Question::ThirdParty < Question
   before_save :downcase_third_party_emails
 
   def self.assign_default_values(attr)
-    super(attr).merge(
+    super.merge(
       { 'required' => false }
     )
   end
diff --git a/app/models/report_template.rb b/app/models/report_template.rb
index aeb2776d..2bc9e990 100644
--- a/app/models/report_template.rb
+++ b/app/models/report_template.rb
@@ -29,17 +29,17 @@ class ReportTemplate < ApplicationRecord
 
   after_destroy :remove_template_from_third_party_questions
 
-  enum report_for: {
+  enum :report_for, {
     third_party: 'third_party',
     participant: 'participant',
     henry_ford_health: 'henry_ford_health'
   }
 
-  enum cover_letter_logo_type: {
+  enum :cover_letter_logo_type, {
     no_logo: 'no_logo',
     report_logo: 'report_logo',
     custom: 'custom'
-  }, _default: 'report_logo'
+  }, default: 'report_logo'
 
   ATTR_NAMES_TO_COPY = %w[
     name report_for summary
diff --git a/app/models/session.rb b/app/models/session.rb
index 73c92f27..1b5340c2 100644
--- a/app/models/session.rb
+++ b/app/models/session.rb
@@ -37,14 +37,13 @@ class Session < ApplicationRecord
   attribute :body, :json, default: -> { assign_default_values('body') }
   attribute :original_text, :json, default: -> { { name: '' } }
 
-  enum schedule: { days_after: 'days_after',
-                   days_after_fill: 'days_after_fill',
-                   exact_date: 'exact_date',
-                   after_fill: 'after_fill',
-                   days_after_date: 'days_after_date',
-                   immediately: 'immediately' },
-       _prefix: :schedule
-  enum current_narrator: ::Intervention.current_narrators
+  enum :schedule, { days_after: 'days_after',
+                    days_after_fill: 'days_after_fill',
+                    exact_date: 'exact_date',
+                    after_fill: 'after_fill',
+                    days_after_date: 'days_after_date',
+                    immediately: 'immediately' }, prefix: :schedule
+  enum :current_narrator, ::Intervention.current_narrators
 
   delegate :published?, to: :intervention
   delegate :draft?, to: :intervention
@@ -56,12 +55,12 @@ class Session < ApplicationRecord
   validates :name, :variable, presence: true
   validates :last_report_template_number, presence: true
   validates :settings, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
+                                         File.read(Rails.root.join("#{json_schema_path}/settings.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
   validates :formulas, json: { schema: lambda {
-    File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
+                                         File.read(Rails.root.join("#{json_schema_path}/formula.json").to_s)
                                        }, message: lambda { |err|
                                                      err
                                                    } }
diff --git a/app/models/session/classic.rb b/app/models/session/classic.rb
index 41cbf1f8..0e3a70e3 100644
--- a/app/models/session/classic.rb
+++ b/app/models/session/classic.rb
@@ -115,7 +115,7 @@ def digit_variable_questions
   end
 
   def present_variables(variables)
-    variables.filter(&:present?)
+    variables.compact_blank
   end
 
   def create_core_children
diff --git a/app/models/session/sms.rb b/app/models/session/sms.rb
index 721cd796..f583ca36 100644
--- a/app/models/session/sms.rb
+++ b/app/models/session/sms.rb
@@ -73,7 +73,7 @@ def digit_variable_questions
   end
 
   def present_variables(variables)
-    variables.filter(&:present?)
+    variables.compact_blank
   end
 
   def create_sms_codes
diff --git a/app/models/sms_link.rb b/app/models/sms_link.rb
index 820d6c79..3f60287c 100644
--- a/app/models/sms_link.rb
+++ b/app/models/sms_link.rb
@@ -10,7 +10,7 @@ class SmsLink < ApplicationRecord
   validates :url, :variable, presence: true, uniqueness: { scope: :sms_plan_id }
 
   # ENUMS
-  enum link_type: {
+  enum :link_type, {
     website: 'website',
     video: 'video'
   }
diff --git a/app/models/sms_plan.rb b/app/models/sms_plan.rb
index b8d60f5b..c555dd9c 100644
--- a/app/models/sms_plan.rb
+++ b/app/models/sms_plan.rb
@@ -29,18 +29,18 @@ class SmsPlan < ApplicationRecord
     include_first_name include_last_name include_email include_phone_number type
   ].freeze
 
-  enum schedule: {
+  enum :schedule, {
     days_after_session_end: 'days_after_session_end',
     after_session_end: 'after_session_end',
     days_after_user_defined_time: 'days_after_user_defined_time'
-  }, _suffix: true
+  }, suffix: true
 
-  enum frequency: {
+  enum :frequency, {
     once: 'once',
     once_a_day: 'once_a_day',
     once_a_week: 'once_a_week',
     once_a_month: 'once_a_month'
-  }, _suffix: true
+  }, suffix: true
 
   def translate_no_formula_text(translator, source_language_name_short, destination_language_name_short)
     translate_attribute('no_formula_text', no_formula_text, translator, source_language_name_short, destination_language_name_short)
diff --git a/app/models/time_range.rb b/app/models/time_range.rb
index f871fe7f..5b18e630 100644
--- a/app/models/time_range.rb
+++ b/app/models/time_range.rb
@@ -4,7 +4,7 @@ class TimeRange < ApplicationRecord
   validates :from, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 24 }
   validates :to, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 24 }
 
-  enum label: { early_morning: 'early_morning', mid_morning: 'mid_morning', afternoon: 'afternoon', early_evening: 'early_evening', night: 'night' }
+  enum :label, { early_morning: 'early_morning', mid_morning: 'mid_morning', afternoon: 'afternoon', early_evening: 'early_evening', night: 'night' }
 
   def self.default_range
     find_by(default: true)
diff --git a/app/models/user.rb b/app/models/user.rb
index 63227af7..1e2f3426 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -198,7 +198,7 @@ def not_a_third_party?
   def with_invalid_email?
     return email_autogenerated if roles.include?('predefined_participant')
 
-    (roles & %w[guest preview_session]).any?
+    roles.intersect?(%w[guest preview_session])
   end
 
   def cache_key
@@ -235,7 +235,7 @@ def set_autogenerated_email
   end
 
   def self.users_for_researcher_or_e_intervention_admin(params, scope)
-    if params[:roles]&.include?('researcher') && params[:roles]&.include?('e_intervention_admin')
+    if params[:roles]&.include?('researcher') && params[:roles].include?('e_intervention_admin')
       scope.with_intervention_creation_access.from_team(params[:team_id])
     elsif params[:roles]&.include?('researcher')
       scope.researchers.from_team(params[:team_id])
@@ -278,7 +278,7 @@ def self.invite!(attributes = {}, invited_by = nil, options = {}, &block)
     user = User.new(**attributes)
     return user if user.tap(&:valid?).errors.messages_for(:email).include? 'is not an email'
 
-    super(attributes, invited_by, options, &block)
+    super
   end
 
   private
@@ -291,7 +291,7 @@ def send_welcome_email
   end
 
   def team_is_present?
-    return if Team.exists?(team_admin_id: id)
+    return false if Team.exists?(team_admin_id: id)
 
     errors.add(:roles, :team_admin_must_have_a_team)
   end
diff --git a/app/models/user_intervention.rb b/app/models/user_intervention.rb
index 9cc6b8db..085809ef 100644
--- a/app/models/user_intervention.rb
+++ b/app/models/user_intervention.rb
@@ -11,7 +11,7 @@ class UserIntervention < ApplicationRecord
 
   validates :health_clinic_id, presence: true, if: -> { intervention_inside_organization? && !preview? }
 
-  enum status: { ready_to_start: 'ready_to_start', in_progress: 'in_progress', completed: 'completed', schedule_pending: 'schedule_pending' }
+  enum :status, { ready_to_start: 'ready_to_start', in_progress: 'in_progress', completed: 'completed', schedule_pending: 'schedule_pending' }
 
   def last_answer_date
     user_sessions.order(last_answer_at: :desc).first
diff --git a/app/serializers/concerns/file_helper.rb b/app/serializers/concerns/file_helper.rb
index 363ba3f1..1dbb07ff 100644
--- a/app/serializers/concerns/file_helper.rb
+++ b/app/serializers/concerns/file_helper.rb
@@ -8,7 +8,7 @@ def map_file_data(file_data, timestamp_timezone = 'UTC')
       {
         id: file_data.id,
         name: file_data.blob.filename,
-        url: ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(file_data, only_path: true),
+        url: ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(file_data, only_path: true),
         created_at: file_data.blob.created_at.in_time_zone(timestamp_timezone)
       }
     end
diff --git a/app/serializers/v1/hfhs_patient_detail_serializer.rb b/app/serializers/v1/hfhs_patient_detail_serializer.rb
index 537a4d00..0a1ce85b 100644
--- a/app/serializers/v1/hfhs_patient_detail_serializer.rb
+++ b/app/serializers/v1/hfhs_patient_detail_serializer.rb
@@ -7,7 +7,7 @@ class V1::HfhsPatientDetailSerializer < V1Serializer
 
   %i[first_name last_name dob sex phone_number phone_type].each do |attr|
     attribute attr do |object|
-      object.send("provided_#{attr}")
+      object.send(:"provided_#{attr}")
     end
   end
 end
diff --git a/app/serializers/v1/intervention_serializer.rb b/app/serializers/v1/intervention_serializer.rb
index cfe42193..34e3df47 100644
--- a/app/serializers/v1/intervention_serializer.rb
+++ b/app/serializers/v1/intervention_serializer.rb
@@ -96,7 +96,7 @@ def self.files_info(object)
   end
 
   def self.record_cache_options(options, fieldset, include_list, params)
-    return super(options, fieldset, include_list, params) if params[:current_user_id].blank?
+    return super if params[:current_user_id].blank?
 
     options = options.dup
     options[:namespace] += ":#{params[:current_user_id]}"
diff --git a/app/serializers/v1/question_serializer.rb b/app/serializers/v1/question_serializer.rb
index 4a942ae6..f7b5a338 100644
--- a/app/serializers/v1/question_serializer.rb
+++ b/app/serializers/v1/question_serializer.rb
@@ -15,7 +15,7 @@ class V1::QuestionSerializer < V1Serializer
   attribute :first_question, &:first_question?
 
   attribute :time_ranges, if: proc { |record| record.is_a?(Question::Phone) } do |_object|
-    TimeRange.all.order(:position).map { |time_range| { from: time_range.from, to: time_range.to, label: time_range.label } }
+    TimeRange.order(:position).map { |time_range| { from: time_range.from, to: time_range.to, label: time_range.label } }
   end
 
   attribute :question_language do |object|
diff --git a/app/serializers/v1/simple_intervention_serializer.rb b/app/serializers/v1/simple_intervention_serializer.rb
index 0c14e2e6..cce1c818 100644
--- a/app/serializers/v1/simple_intervention_serializer.rb
+++ b/app/serializers/v1/simple_intervention_serializer.rb
@@ -31,7 +31,7 @@ class V1::SimpleInterventionSerializer < V1Serializer
   end
 
   def self.record_cache_options(options, fieldset, include_list, params)
-    return super(options, fieldset, include_list, params) if params[:current_user_id].blank?
+    return super if params[:current_user_id].blank?
 
     options = options.dup
     options[:namespace] += ":#{params[:current_user_id]}"
diff --git a/app/services/api/cat_mh.rb b/app/services/api/cat_mh.rb
index 25eed51a..b995bddf 100644
--- a/app/services/api/cat_mh.rb
+++ b/app/services/api/cat_mh.rb
@@ -99,7 +99,7 @@ def fix_problem(response, user_session)
   end
 
   def blocked_cookies?(response)
-    response['error'].eql?("#{ENV['BASE_CAT_URL']}/interview/secure/errorInProgress.html")
+    response['error'].eql?("#{ENV.fetch('BASE_CAT_URL', nil)}/interview/secure/errorInProgress.html")
   end
 
   def session_time_out?(response)
diff --git a/app/services/api/cat_mh/answer.rb b/app/services/api/cat_mh/answer.rb
index 71ddf669..a7fcb355 100644
--- a/app/services/api/cat_mh/answer.rb
+++ b/app/services/api/cat_mh/answer.rb
@@ -5,7 +5,7 @@ class Api::CatMh::Answer < Api::CatMh::Base
 
   attr_reader :question_id, :response, :duration
 
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/rest/interview/test/question".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/rest/interview/test/question".freeze
 
   def self.call(jsession_id, awselb, question_id, response, duration)
     new(jsession_id, awselb, question_id, response, duration).call
diff --git a/app/services/api/cat_mh/authentication.rb b/app/services/api/cat_mh/authentication.rb
index d777e859..e5e4e627 100644
--- a/app/services/api/cat_mh/authentication.rb
+++ b/app/services/api/cat_mh/authentication.rb
@@ -3,7 +3,7 @@
 class Api::CatMh::Authentication
   attr_reader :signature, :identifier
 
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/signin".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/signin".freeze
 
   def self.call(identifier, signature)
     new(identifier, signature).call
diff --git a/app/services/api/cat_mh/break_lock.rb b/app/services/api/cat_mh/break_lock.rb
index fec04203..984649be 100644
--- a/app/services/api/cat_mh/break_lock.rb
+++ b/app/services/api/cat_mh/break_lock.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 class Api::CatMh::BreakLock < Api::CatMh::Base
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/secure/breakLock".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/secure/breakLock".freeze
 
   def initialize(jsession_id, awselb)
-    super(jsession_id, awselb)
+    super
     @http_method = :post
   end
 
diff --git a/app/services/api/cat_mh/check_status.rb b/app/services/api/cat_mh/check_status.rb
index 685dbbeb..69fe71bc 100644
--- a/app/services/api/cat_mh/check_status.rb
+++ b/app/services/api/cat_mh/check_status.rb
@@ -5,7 +5,7 @@ class Api::CatMh::CheckStatus
 
   attr_reader :application_id, :organization_id, :interview_id, :identifier, :signature
 
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/portal/secure/interview/status".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/portal/secure/interview/status".freeze
 
   def self.call(interview_id, identifier, signature, application_id, organization_id)
     new(interview_id, identifier, signature, application_id, organization_id).call
diff --git a/app/services/api/cat_mh/create_interview.rb b/app/services/api/cat_mh/create_interview.rb
index 1a85c24f..f6700da0 100644
--- a/app/services/api/cat_mh/create_interview.rb
+++ b/app/services/api/cat_mh/create_interview.rb
@@ -5,7 +5,7 @@ class Api::CatMh::CreateInterview
 
   attr_reader :application_id, :organization_id, :subject_id, :number_of_interventions, :tests, :language, :timeframe_id
 
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/portal/secure/interview/createInterview".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/portal/secure/interview/createInterview".freeze
 
   def self.call(subject_id, number_of_interventions, application_id, organization_id, tests, language, timeframe_id) # rubocop:disable Metrics/ParameterLists
     new(subject_id, number_of_interventions, application_id, organization_id, tests, language, timeframe_id).call
diff --git a/app/services/api/cat_mh/initialize_interview.rb b/app/services/api/cat_mh/initialize_interview.rb
index 0d38d3d2..5df16621 100644
--- a/app/services/api/cat_mh/initialize_interview.rb
+++ b/app/services/api/cat_mh/initialize_interview.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::CatMh::InitializeInterview < Api::CatMh::Base
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/rest/interview".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/rest/interview".freeze
 
   def call
     result = request(http_method, ENDPOINT, params)
diff --git a/app/services/api/cat_mh/question.rb b/app/services/api/cat_mh/question.rb
index 065a147f..db3ea5f6 100644
--- a/app/services/api/cat_mh/question.rb
+++ b/app/services/api/cat_mh/question.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::CatMh::Question < Api::CatMh::Base
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/rest/interview/test/question".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/rest/interview/test/question".freeze
 
   def call
     result = request(http_method, ENDPOINT, params)
diff --git a/app/services/api/cat_mh/result.rb b/app/services/api/cat_mh/result.rb
index 30905350..c6eb2555 100644
--- a/app/services/api/cat_mh/result.rb
+++ b/app/services/api/cat_mh/result.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::CatMh::Result < Api::CatMh::Base
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/rest/interview/results".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/rest/interview/results".freeze
 
   def call
     result = request(http_method, ENDPOINT, params)
diff --git a/app/services/api/cat_mh/terminate_session.rb b/app/services/api/cat_mh/terminate_session.rb
index 755bb68f..a53a0990 100644
--- a/app/services/api/cat_mh/terminate_session.rb
+++ b/app/services/api/cat_mh/terminate_session.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::CatMh::TerminateSession < Api::CatMh::Base
-  ENDPOINT = "#{ENV['BASE_CAT_URL']}/interview/signout".freeze
+  ENDPOINT = "#{ENV.fetch('BASE_CAT_URL', nil)}/interview/signout".freeze
 
   def call
     result = request(:post, ENDPOINT, params)
diff --git a/app/services/communication/sms.rb b/app/services/communication/sms.rb
index a83aea05..c8fa7df1 100644
--- a/app/services/communication/sms.rb
+++ b/app/services/communication/sms.rb
@@ -6,21 +6,21 @@ class Communication::Sms
 
   def initialize(message_id)
     @sms = Message.find(message_id)
-    @client = Twilio::REST::Client.new(ENV['TWILIO_ACCOUNT_SID'], ENV['TWILIO_AUTH_TOKEN'])
+    @client = Twilio::REST::Client.new(ENV.fetch('TWILIO_ACCOUNT_SID', nil), ENV.fetch('TWILIO_AUTH_TOKEN', nil))
     @errors = []
   end
 
   def send_message
     if sms.attachment_url.present?
       client.messages.create(
-        from: ENV['TWILIO_FROM'],
+        from: ENV.fetch('TWILIO_FROM', nil),
         to: sms.phone,
         body: sms.body,
         media_url: [sms.attachment_url]
       )
     else
       client.messages.create(
-        from: ENV['TWILIO_FROM'],
+        from: ENV.fetch('TWILIO_FROM', nil),
         to: sms.phone,
         body: sms.body
       )
diff --git a/app/services/import/v1/question_service.rb b/app/services/import/v1/question_service.rb
index bb78cb72..4dbadf19 100644
--- a/app/services/import/v1/question_service.rb
+++ b/app/services/import/v1/question_service.rb
@@ -2,7 +2,7 @@
 
 class Import::V1::QuestionService < Import::Basic::QuestionService
   def initialize(question_group_id, question_hash)
-    super(question_group_id, question_hash)
+    super
     question_hash[:narrator][:settings][:character] = 'peedy'
   end
 end
diff --git a/app/services/v1/flow_service/next_question.rb b/app/services/v1/flow_service/next_question.rb
index 3e0e3ab5..3fc8e0ea 100644
--- a/app/services/v1/flow_service/next_question.rb
+++ b/app/services/v1/flow_service/next_question.rb
@@ -84,7 +84,7 @@ def prepare_participant_date_with_schedule_payload(next_session)
   def reassign_next_session_for_flexible_intervention(session, intervention)
     return session unless session.nil? || UserSession.exists?(user_id: user_session.user.id, session_id: session.id)
 
-    intervention.sessions.where.not(type: 'Session::Sms').each do |intervention_session|
+    intervention.sessions.where.not(type: 'Session::Sms').find_each do |intervention_session|
       return intervention_session unless UserSession.exists?(user_id: user_session.user.id, session_id: intervention_session.id)
     end
 
diff --git a/app/services/v1/flow_service/next_question/branching_service.rb b/app/services/v1/flow_service/next_question/branching_service.rb
index 53f12019..0d1972a9 100644
--- a/app/services/v1/flow_service/next_question/branching_service.rb
+++ b/app/services/v1/flow_service/next_question/branching_service.rb
@@ -99,7 +99,7 @@ def mark_answers_as_alternative(next_question)
     return if next_question.is_a? Hash
 
     question_ids = next_question.position_lower.pluck(:id)
-    user_session.answers.where(draft: true, question_id: question_ids).each do |answer|
+    user_session.answers.where(draft: true, question_id: question_ids).find_each do |answer|
       answer.update!(alternative_branch: true)
     end
   end
diff --git a/app/services/v1/generated_reports/share_to_third_party.rb b/app/services/v1/generated_reports/share_to_third_party.rb
index a9ff0255..53772b2f 100644
--- a/app/services/v1/generated_reports/share_to_third_party.rb
+++ b/app/services/v1/generated_reports/share_to_third_party.rb
@@ -8,8 +8,10 @@ def self.call(user_session)
   def initialize(user_session)
     @user_session = user_session
     @third_party_reports = user_session.generated_reports.third_party
-    @third_party_emails_report_template_ids = Hash.new([])
-    @third_party_faxes_report_template_ids = Hash.new({})
+    @third_party_emails_report_template_ids = {}
+    @third_party_emails_report_template_ids.default = []
+    @third_party_faxes_report_template_ids = {}
+    @third_party_faxes_report_template_ids.default = []
     third_party_emails_or_faxes_report_template_ids
   end
 
@@ -108,7 +110,8 @@ def third_party_emails_or_faxes_report_template_ids
       third_party_emails_report_template_ids[emails] += rep_id if emails.any?
       next unless faxes.any?
 
-      third_party_faxes_report_template_ids[receiver_label] = Hash.new([]) if third_party_faxes_report_template_ids[receiver_label].blank?
+      third_party_faxes_report_template_ids[receiver_label] = {}
+      third_party_faxes_report_template_ids[receiver_label].default = []
       third_party_faxes_report_template_ids[receiver_label][:reports] += rep_id
       third_party_faxes_report_template_ids[receiver_label][:numbers] += faxes
     end
diff --git a/app/services/v1/google/translation_service.rb b/app/services/v1/google/translation_service.rb
index 72528bc0..a41da2e3 100644
--- a/app/services/v1/google/translation_service.rb
+++ b/app/services/v1/google/translation_service.rb
@@ -16,8 +16,8 @@ def client
   end
 
   def credentials
-    Oj.load_file(ENV['GOOGLE_APPLICATION_CREDENTIALS'])
+    Oj.load_file(ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil))
   rescue Oj::ParseError
-    ENV['GOOGLE_APPLICATION_CREDENTIALS']
+    ENV.fetch('GOOGLE_APPLICATION_CREDENTIALS', nil)
   end
 end
diff --git a/app/services/v1/intervention/predefined_participants/send_sms_invitation.rb b/app/services/v1/intervention/predefined_participants/send_sms_invitation.rb
index 5d3c5474..eca3e445 100644
--- a/app/services/v1/intervention/predefined_participants/send_sms_invitation.rb
+++ b/app/services/v1/intervention/predefined_participants/send_sms_invitation.rb
@@ -33,7 +33,7 @@ def content
   end
 
   def link
-    "#{ENV['WEB_URL']}/usr/#{predefined_user_parameter.slug}"
+    "#{ENV.fetch('WEB_URL', nil)}/usr/#{predefined_user_parameter.slug}"
   end
 
   def intervention_name
diff --git a/app/services/v1/intervention/update.rb b/app/services/v1/intervention/update.rb
index eb356351..58327271 100644
--- a/app/services/v1/intervention/update.rb
+++ b/app/services/v1/intervention/update.rb
@@ -36,7 +36,7 @@ def status
 
   def status_transition_validation
     return if status.blank?
-    return if intervention.public_send("may_#{status}?")
+    return if intervention.public_send(:"may_#{status}?")
 
     raise ActiveRecord::ActiveRecordError,
           I18n.t('activerecord.errors.models.intervention.attributes.status_transition', current_status: intervention.status, new_status: status)
diff --git a/app/services/v1/live_chat/conversations/generate_transcript/intervention.rb b/app/services/v1/live_chat/conversations/generate_transcript/intervention.rb
index f1909bd1..a93a9250 100644
--- a/app/services/v1/live_chat/conversations/generate_transcript/intervention.rb
+++ b/app/services/v1/live_chat/conversations/generate_transcript/intervention.rb
@@ -11,7 +11,7 @@ def generate_transcript
   end
 
   def initialize(record)
-    super(record)
+    super
     @max_size = max_messages_count || 0
   end
 
diff --git a/app/services/v1/notifications/transcript_ready.rb b/app/services/v1/notifications/transcript_ready.rb
index 8f41ba4b..a71ca693 100644
--- a/app/services/v1/notifications/transcript_ready.rb
+++ b/app/services/v1/notifications/transcript_ready.rb
@@ -49,7 +49,7 @@ def map_file_data(file)
     {
       id: file.id,
       name: file.blob.filename,
-      url: ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true),
+      url: ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(file, only_path: true),
       created_at: file.blob.created_at.in_time_zone('UTC')
     }
   end
diff --git a/app/services/v1/question/update.rb b/app/services/v1/question/update.rb
index 9f68ed6c..d3cb60cc 100644
--- a/app/services/v1/question/update.rb
+++ b/app/services/v1/question/update.rb
@@ -48,7 +48,7 @@ def new_variables
   end
 
   def new_variable_is_taken?(new_variables)
-    return if new_variables.blank?
+    return false if new_variables.blank?
 
     used_variables = question.session.fetch_variables({}, question.id).pluck(:variables).flatten.map(&:downcase)
 
diff --git a/app/services/v1/session_or_intervention/link.rb b/app/services/v1/session_or_intervention/link.rb
index 645fb981..d6cb093a 100644
--- a/app/services/v1/session_or_intervention/link.rb
+++ b/app/services/v1/session_or_intervention/link.rb
@@ -14,7 +14,7 @@ def self.call(session, health_clinic, email)
   end
 
   def call
-    return "#{ENV['WEB_URL']}/usr/#{user.predefined_user_parameter.slug}" if user&.roles&.include?('predefined_participant')
+    return "#{ENV.fetch('WEB_URL', nil)}/usr/#{user.predefined_user_parameter.slug}" if user&.roles&.include?('predefined_participant')
 
     return session_link(session_or_intervention) if session_or_intervention.is_a?(Session)
 
@@ -27,12 +27,12 @@ def session_link(session)
     if session.intervention.shared_to_anyone?
       (if health_clinic.nil?
          I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone',
-                domain: ENV['WEB_URL'], session_id: session.id,
+                domain: ENV.fetch('WEB_URL', nil), session_id: session.id,
                 intervention_id: session.intervention_id,
                 language_code: session.language_code)
        else
          I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone_from_clinic',
-                domain: ENV['WEB_URL'], session_id: session.id,
+                domain: ENV.fetch('WEB_URL', nil), session_id: session.id,
                 intervention_id: session.intervention_id,
                 health_clinic_id: health_clinic.id,
                 language_code: session.language_code)
@@ -40,13 +40,13 @@ def session_link(session)
     else
       (if health_clinic.nil?
          I18n.t('session_mailer.inform_to_an_email.invitation_link',
-                domain: ENV['WEB_URL'],
+                domain: ENV.fetch('WEB_URL', nil),
                 intervention_id: session.intervention_id,
                 session_id: session.id,
                 language_code: session.language_code)
        else
          I18n.t('session_mailer.inform_to_an_email.invitation_link_from_clinic',
-                domain: ENV['WEB_URL'],
+                domain: ENV.fetch('WEB_URL', nil),
                 intervention_id: session.intervention_id, session_id: session.id,
                 health_clinic_id: health_clinic.id,
                 language_code: session.language_code)
@@ -56,10 +56,10 @@ def session_link(session)
 
   def intervention_link(intervention)
     if health_clinic.nil?
-      I18n.t('intervention_mailer.inform_to_an_email.invitation_link', domain: ENV['WEB_URL'],
+      I18n.t('intervention_mailer.inform_to_an_email.invitation_link', domain: ENV.fetch('WEB_URL', nil),
                                                                        intervention_id: intervention.id)
     else
-      I18n.t('intervention_mailer.inform_to_an_email.invitation_link_from_clinic', domain: ENV['WEB_URL'],
+      I18n.t('intervention_mailer.inform_to_an_email.invitation_link_from_clinic', domain: ENV.fetch('WEB_URL', nil),
                                                                                    intervention_id: intervention.id, health_clinic_id: health_clinic.id)
     end
   end
diff --git a/app/services/v1/sms_plans/re_schedule_sms_for_user_session.rb b/app/services/v1/sms_plans/re_schedule_sms_for_user_session.rb
index c763eca7..4b24cb64 100644
--- a/app/services/v1/sms_plans/re_schedule_sms_for_user_session.rb
+++ b/app/services/v1/sms_plans/re_schedule_sms_for_user_session.rb
@@ -22,7 +22,7 @@ def call
     session.sms_plans.limit_to_types('SmsPlan::Normal').each do |plan|
       next unless can_run_plan?(plan)
 
-      send("#{plan.schedule}_schedule", plan)
+      send(:"#{plan.schedule}_schedule", plan)
     end
   end
 
diff --git a/app/services/v1/sms_plans/schedule_sms_for_user_session.rb b/app/services/v1/sms_plans/schedule_sms_for_user_session.rb
index bcf0a95d..34a1534d 100644
--- a/app/services/v1/sms_plans/schedule_sms_for_user_session.rb
+++ b/app/services/v1/sms_plans/schedule_sms_for_user_session.rb
@@ -31,7 +31,7 @@ def execute_plans_for(type)
     session.sms_plans.limit_to_types(type).each do |plan|
       next unless can_run_plan?(plan)
 
-      send("#{plan.schedule}_schedule", plan)
+      send(:"#{plan.schedule}_schedule", plan)
     end
   end
 
diff --git a/app/services/v1/teams/change_team_admin.rb b/app/services/v1/teams/change_team_admin.rb
index 058d5c51..86f2b711 100644
--- a/app/services/v1/teams/change_team_admin.rb
+++ b/app/services/v1/teams/change_team_admin.rb
@@ -40,7 +40,7 @@ def call
   attr_reader :team, :team_admin_id, :current_ability
 
   def able_to_change_team_admin?
-    return if current_ability.blank?
+    return false if current_ability.blank?
 
     current_ability.can?(:change_team_admin, team)
   end
diff --git a/app/services/v1/teams/invite.rb b/app/services/v1/teams/invite.rb
index fab2ee59..1315d9c3 100644
--- a/app/services/v1/teams/invite.rb
+++ b/app/services/v1/teams/invite.rb
@@ -31,7 +31,7 @@ def already_in_the_team?
   end
 
   def user_has_not_correct_role?
-    user&.roles&.exclude?('researcher') && user&.roles&.exclude?('navigator')
+    user&.roles&.exclude?('researcher') && user&.roles.exclude?('navigator')
   end
 
   def user
diff --git a/app/services/v1/translations/variable_exclusive_translation_service.rb b/app/services/v1/translations/variable_exclusive_translation_service.rb
index 3de5e494..69c33644 100644
--- a/app/services/v1/translations/variable_exclusive_translation_service.rb
+++ b/app/services/v1/translations/variable_exclusive_translation_service.rb
@@ -17,7 +17,7 @@ def translate(text, src_language_name_short, dest_language_name_short)
   private
 
   VARIABLE_NAME_PLACEHOLDER_TOKEN = '%%%'
-  VARIABLE_NAME_PATTERN = Regexp.compile(/\.:[a-zA-Z0-9_]*?:\./)
+  VARIABLE_NAME_PATTERN = /\.:[a-zA-Z0-9_]*?:\./
 
   def extract_variable_names(input_string)
     input_string.scan(VARIABLE_NAME_PATTERN)
diff --git a/app/services/v1/user_session_schedule_service.rb b/app/services/v1/user_session_schedule_service.rb
index 3af85431..85eb654e 100644
--- a/app/services/v1/user_session_schedule_service.rb
+++ b/app/services/v1/user_session_schedule_service.rb
@@ -23,7 +23,7 @@ def schedule
 
     create_next_user_session(next_session)
 
-    send("#{next_session.schedule}_schedule", next_session)
+    send(:"#{next_session.schedule}_schedule", next_session)
 
     next_user_session.finish if next_session.autoclose_at&.past?
   end
diff --git a/config/application.rb b/config/application.rb
index 40727bcb..bf2605de 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,8 @@
-require_relative "boot"
+# frozen_string_literal: true
 
-require "rails"
+require_relative 'boot'
+
+require 'rails'
 # Pick the frameworks you want:
 require 'active_model/railtie'
 require 'active_job/railtie'
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e6083fb5..57ce0795 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/integer/time"
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -26,7 +26,7 @@
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp/caching-dev.txt').exist?
-    config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'] }
+    config.cache_store = :redis_cache_store, { url: ENV.fetch('REDIS_URL', nil) }
     config.public_file_server.headers = {
       'Cache-Control' => "public, max-age=#{2.days.to_i}"
     }
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e1ed2ba4..8f6d8000 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -44,7 +44,7 @@
   config.log_tags = [:request_id]
 
   # Use a different cache store in production.
-  config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], driver: :ruby, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+  config.cache_store = :redis_cache_store, { url: ENV.fetch('REDIS_URL', nil), driver: :ruby, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
 
   # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
@@ -55,7 +55,7 @@
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  config.action_mailer.default_url_options = { host: ENV['DOMAIN_NAME'] }
+  config.action_mailer.default_url_options = { host: ENV.fetch('DOMAIN_NAME', nil) }
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.perform_deliveries = true
   config.action_mailer.smtp_settings = {
@@ -63,8 +63,8 @@
     port: 587,
     authentication: :plain,
     enable_starttls_auto: true,
-    domain: ENV['DOMAIN_NAME'],
-    password: ENV['SENDGRID_API_KEY'],
+    domain: ENV.fetch('DOMAIN_NAME', nil),
+    password: ENV.fetch('SENDGRID_API_KEY', nil),
     user_name: 'apikey'
   }
 
@@ -76,7 +76,7 @@
   config.active_support.deprecation = :notify
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
+  config.log_formatter = Logger::Formatter.new
 
   # Use a different logger for distributed setups.
   # require 'syslog/logger'
diff --git a/config/environments/test.rb b/config/environments/test.rb
index f9efd4db..7cbec475 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "active_support/core_ext/integer/time"
+require 'active_support/core_ext/integer/time'
 
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
diff --git a/config/initializers/active_job_adapter.rb b/config/initializers/active_job_adapter.rb
index 8fca9416..7731769a 100644
--- a/config/initializers/active_job_adapter.rb
+++ b/config/initializers/active_job_adapter.rb
@@ -2,16 +2,16 @@
 
 Sidekiq.configure_server do |config|
   if ENV['REDIS_PROVIDED_BY_HEROKU'] == 'true'
-    config.redis = { url: ENV['REDIS_URL'], ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+    config.redis = { url: ENV.fetch('REDIS_URL', nil), ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
   else
-    config.redis = { url: ENV['REDIS_URL'] }
+    config.redis = { url: ENV.fetch('REDIS_URL', nil) }
   end
 end
 
 Sidekiq.configure_client do |config|
   if ENV['REDIS_PROVIDED_BY_HEROKU'] == 'true'
-    config.redis = { url: ENV['REDIS_URL'], ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
+    config.redis = { url: ENV.fetch('REDIS_URL', nil), ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
   else
-    config.redis = { url: ENV['REDIS_URL'] }
+    config.redis = { url: ENV.fetch('REDIS_URL', nil) }
   end
 end
diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb
index f4556db3..6d56e439 100644
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # ActiveSupport::Reloader.to_prepare do
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index d0f0d3b5..4b63f289 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb
index 840a2dab..4c509cb7 100644
--- a/config/initializers/cors.rb
+++ b/config/initializers/cors.rb
@@ -9,7 +9,7 @@
 
 Rails.application.config.middleware.insert_before 0, Rack::Cors do
   allow do
-    origins ENV['WEB_URL']
+    origins ENV.fetch('WEB_URL', nil)
     resource '*',
              headers: :any,
              credentials: true,
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index aa7435fb..dc847422 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/lockbox.rb b/config/initializers/lockbox.rb
index a82aecd2..d29f71bb 100644
--- a/config/initializers/lockbox.rb
+++ b/config/initializers/lockbox.rb
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Lockbox.master_key = ENV['LOCKBOX_MASTER_KEY']
+Lockbox.master_key = ENV.fetch('LOCKBOX_MASTER_KEY', nil)
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 7e76d397..09b5b3a2 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "active_support/parameter_filter"
+require 'active_support/parameter_filter'
 
 Sentry.init do |config|
   config.enabled_environments = %w[production]
-  config.dsn = ENV['SENTRY_DSN']
+  config.dsn = ENV.fetch('SENTRY_DSN', nil)
   config.breadcrumbs_logger = %i[active_support_logger http_logger]
 
   # Set tracesSampleRate to 1.0 to capture 100%
diff --git a/config/routes.rb b/config/routes.rb
index 43905f82..0a32aeb4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -313,8 +313,8 @@
   if ENV['SIDEKIQ_WEB_INTERFACE'] == '1'
     scope 'rails' do
       Sidekiq::Web.use Rack::Auth::Basic do |username, password|
-        ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(username), ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_USERNAME'])) &
-          ActiveSupport::SecurityUtils.secure_compare(::Digest::SHA256.hexdigest(password), ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_PASSWORD']))
+        ActiveSupport::SecurityUtils.secure_compare(Digest::SHA256.hexdigest(username), Digest::SHA256.hexdigest(ENV.fetch('SIDEKIQ_USERNAME', nil))) &
+          ActiveSupport::SecurityUtils.secure_compare(Digest::SHA256.hexdigest(password), Digest::SHA256.hexdigest(ENV.fetch('SIDEKIQ_PASSWORD', nil)))
       end
       mount Sidekiq::Web => '/workers'
     end
diff --git a/db/seeds.rb b/db/seeds.rb
index 572d061b..3784d0ab 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -16,7 +16,7 @@ def summon_many
         u = User.new(
           first_name: role,
           last_name: Faker::GreekPhilosophers.name,
-          email: "#{role}@#{ENV['DOMAIN_NAME']}",
+          email: "#{role}@#{ENV.fetch('DOMAIN_NAME', nil)}",
           password: 'Password1!',
           roles: [role],
           terms: true
diff --git a/db/seeds/fake.rb b/db/seeds/fake.rb
index 489eb708..49d13d45 100644
--- a/db/seeds/fake.rb
+++ b/db/seeds/fake.rb
@@ -9,7 +9,7 @@
 
 # rubocop:enable Lint/TopLevelReturnWithArgument, Rails/Output
 
-# rubocop:disable Metrics/ClassLength, Style/ClassVars, ThreadSafety/ClassAndModuleAttributes, ThreadSafety/InstanceVariableInClassMethod
+# rubocop:disable Metrics/ClassLength, Style/ClassVars, ThreadSafety/ClassAndModuleAttributes
 class Fake
   class << self
     mattr_accessor :session_types
@@ -33,8 +33,8 @@ def user_ids
     end
 
     def define_subclasses(path)
-      subclasses = Dir.entries(Rails.root.join(path)) - %w[. ..]
-      subclasses.each { |file| file.gsub!(/\.rb/, '') }.map(&:classify)
+      subclasses = Rails.root.join(path).entries - %w[. ..]
+      subclasses.each { |file| file.gsub!('.rb', '') }.map(&:classify)
     end
 
     def create_interventions
@@ -75,7 +75,7 @@ def session_ids
     end
 
     def create_session_invitations
-      Session.all.each do |session|
+      Session.find_each do |session|
         (1..4).to_a.sample.times do
           session.session_invitations.create(email: Faker::Internet.email)
         end
@@ -87,7 +87,7 @@ def subclass_types
     end
 
     def quotas
-      @quotas ||= [Faker::Games::Fallout, Faker::Games::WorldOfWarcraft, Faker::Games::WarhammerFantasy]
+      [Faker::Games::Fallout, Faker::Games::WorldOfWarcraft, Faker::Games::WarhammerFantasy]
     end
 
     def narrator_blocks_text
@@ -169,7 +169,7 @@ def create_questions
         question.save
       end
       session_question_type_id = Session.pluck(:id).map { |i| ['Session', i] } + Question.pluck(:type, :id)
-      Question.all.each do |question|
+      Question.find_each do |question|
         question.formula['patterns'].each do |pattern|
           target = session_question_type_id.sample
           pattern['target']['type'] = target.first.deconstantize
@@ -182,7 +182,7 @@ def create_questions
     def create_user_sessions
       interventions = Intervention.order('RANDOM()').limit(4)
       interventions.each(&:broadcast)
-      Session.where(intervention_id: interventions.ids).each do |session|
+      Session.where(intervention_id: interventions.ids).find_each do |session|
         session.user_sessions.create(user_id: user_ids.sample)
       end
     end
@@ -374,7 +374,7 @@ def formula_data_base
     end
 
     def images_files
-      @@images_files ||= Dir[Rails.root.join('spec/factories/images/*.jpg')]
+      @@images_files ||= Rails.root.glob('spec/factories/images/*.jpg')
     end
 
     def arithmetic
@@ -398,6 +398,6 @@ def true_or_false
     end
   end
 end
-# rubocop:enable Metrics/ClassLength, Style/ClassVars, ThreadSafety/ClassAndModuleAttributes, ThreadSafety/InstanceVariableInClassMethod
+# rubocop:enable Metrics/ClassLength, Style/ClassVars, ThreadSafety/ClassAndModuleAttributes
 
 Fake.exploit
diff --git a/db/seeds/interventions/cias_seed.rb b/db/seeds/interventions/cias_seed.rb
index f0b7a680..09378b2f 100644
--- a/db/seeds/interventions/cias_seed.rb
+++ b/db/seeds/interventions/cias_seed.rb
@@ -3,7 +3,7 @@
 require 'factory_bot_rails'
 require 'faker'
 
-require_relative './seed_helpers'
+require_relative 'seed_helpers'
 
 NUM_OF_RESEARCHERS = 2
 NUM_OF_PARTICIPANTS = 6
@@ -34,7 +34,7 @@ class DBSeed
   create_participants_and_researchers(NUM_OF_PARTICIPANTS, NUM_OF_RESEARCHERS)
 
   admin_email = "cias-team+admin_#{ENV.fetch('APP_HOSTNAME')}@htdevelopers.com".gsub(/[^0-9A-Za-z_\-@.+]/, '')
-  admin_password = ENV['CIAS_ADMIN_PASSWORD']
+  admin_password = ENV.fetch('CIAS_ADMIN_PASSWORD', nil)
   unless User.find_by(email: admin_email)
     example_user = create_user('admin', admin_email, admin_password)
     example_user.confirm
diff --git a/db/seeds/interventions/seed_helpers.rb b/db/seeds/interventions/seed_helpers.rb
index 79276f00..b278db2b 100644
--- a/db/seeds/interventions/seed_helpers.rb
+++ b/db/seeds/interventions/seed_helpers.rb
@@ -67,12 +67,8 @@ def assign_data_to_answer(answer, question)
   end
   data << { var: var_name, value: value }
 
-  if question.type == 'Question::Grid' || question.type == 'Question::Multiple'
-    data = []
-    var_name = question.question_variables
-    var_name.each do |var|
-      data << { 'var' => var, 'value' => rand(1..5).to_s }
-    end
+  if ['Question::Grid', 'Question::Multiple'].include?(question.type)
+    data = question.question_variables.map { |var| { 'var' => var, 'value' => rand(1..5).to_s } }
   end
 
   add_data_to_answer_body(answer, data)
diff --git a/docs/v1/lib/multilang.rb b/docs/v1/lib/multilang.rb
index 8fe73eeb..76808f1b 100644
--- a/docs/v1/lib/multilang.rb
+++ b/docs/v1/lib/multilang.rb
@@ -9,7 +9,7 @@ def block_code(code, full_lang_name)
         "#{match} tab-#{full_lang_name}"
       end
     else
-      super(code, full_lang_name)
+      super
     end
   end
 end
diff --git a/docs/v1/lib/toc_data.rb b/docs/v1/lib/toc_data.rb
index 2a0bdf43..94ec462d 100644
--- a/docs/v1/lib/toc_data.rb
+++ b/docs/v1/lib/toc_data.rb
@@ -6,15 +6,14 @@ def toc_data(page_content)
   html_doc = Nokogiri::HTML::DocumentFragment.parse(page_content)
 
   # get a flat list of headers
-  headers = []
-  html_doc.css('h1, h2, h3').each do |header|
-    headers.push({
-                   id: header.attribute('id').to_s,
-                   content: header.children,
-                   title: header.children.to_s.gsub(/<[^>]*>/, ''),
-                   level: header.name[1].to_i,
-                   children: []
-                 })
+  headers = html_doc.css('h1, h2, h3').map do |header|
+    {
+      id: header.attribute('id').to_s,
+      content: header.children,
+      title: header.children.to_s.gsub(/<[^>]*>/, ''),
+      level: header.name[1].to_i,
+      children: []
+    }
   end
 
   [3, 2].each do |header_level|
diff --git a/lib/tasks/clean_audio_blobs.rake b/lib/tasks/clean_audio_blobs.rake
index 02d91732..c7353c38 100644
--- a/lib/tasks/clean_audio_blobs.rake
+++ b/lib/tasks/clean_audio_blobs.rake
@@ -3,7 +3,7 @@
 namespace :audio do
   desc 'Clean audio blobs'
   task clean: :environment do
-    Audio.where(usage_counter: 0).each do |audio|
+    Audio.where(usage_counter: 0).find_each do |audio|
       audio.mp3.purge
     end
   end
diff --git a/lib/tasks/docs.rake b/lib/tasks/docs.rake
index dc0e9ab1..aeb9fe9c 100644
--- a/lib/tasks/docs.rake
+++ b/lib/tasks/docs.rake
@@ -5,7 +5,7 @@ namespace :docs do
   namespace :build do
     task v1: :environment do
       Bundler.with_unbundled_env do
-        Dir.chdir 'docs/v1' do
+        Dir.chdir 'docs/v1' do # rubocop:disable ThreadSafety/DirChdir
           `bundle exec middleman build --clean`
         end
       end
diff --git a/lib/tasks/seeds/setup_teams.rake b/lib/tasks/seeds/setup_teams.rake
index f28427d4..b9f5427a 100644
--- a/lib/tasks/seeds/setup_teams.rake
+++ b/lib/tasks/seeds/setup_teams.rake
@@ -30,8 +30,8 @@ namespace :db do
       u = User.new(
         first_name: roles.join(' '),
         last_name: Faker::GreekPhilosophers.name,
-        email: "#{roles.last}_#{team.users.count + 1}_#{team_name(team)}_@#{ENV['DOMAIN_NAME']}",
-        password: ENV['USER_PASSWORD'],
+        email: "#{roles.last}_#{team.users.count + 1}_#{team_name(team)}_@#{ENV.fetch('DOMAIN_NAME', nil)}",
+        password: ENV.fetch('USER_PASSWORD', nil),
         roles: roles,
         team_id: team.id
       )
diff --git a/spec/benchmarks/answers/answer_index_spec.rb b/spec/benchmarks/answers/answer_index_spec.rb
index 6bd6984d..95f8e9f1 100644
--- a/spec/benchmarks/answers/answer_index_spec.rb
+++ b/spec/benchmarks/answers/answer_index_spec.rb
@@ -18,14 +18,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/interventions/answers #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 Answers') { get v1_intervention_answers_path(small_intervention.id), headers: headers }
-        x.report('GET 50 Answers') { get v1_intervention_answers_path(large_intervention.id), headers: headers }
+          x.report('GET 25 Answers') { get v1_intervention_answers_path(small_intervention.id), headers: headers }
+          x.report('GET 50 Answers') { get v1_intervention_answers_path(large_intervention.id), headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/interventions/interventions_index_spec.rb b/spec/benchmarks/interventions/interventions_index_spec.rb
index 167880fc..dd4bce4c 100644
--- a/spec/benchmarks/interventions/interventions_index_spec.rb
+++ b/spec/benchmarks/interventions/interventions_index_spec.rb
@@ -10,14 +10,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/interventions #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 50 Interventions') { get v1_interventions_path, params: params_long, headers: headers }
-        x.report('GET 25 Interventions') { get v1_interventions_path, params: params_short, headers: headers }
+          x.report('GET 50 Interventions') { get v1_interventions_path, params: params_long, headers: headers }
+          x.report('GET 25 Interventions') { get v1_interventions_path, params: params_short, headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/question_groups/question_group_index_spec.rb b/spec/benchmarks/question_groups/question_group_index_spec.rb
index e4785bb3..74f57dda 100644
--- a/spec/benchmarks/question_groups/question_group_index_spec.rb
+++ b/spec/benchmarks/question_groups/question_group_index_spec.rb
@@ -11,14 +11,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/question_groups #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 QuestionGroups') { get v1_session_question_groups_path(session_id: small_session.id), headers: headers }
-        x.report('GET 50 QuestionGroups') { get v1_session_question_groups_path(session_id: large_session.id), headers: headers }
+          x.report('GET 25 QuestionGroups') { get v1_session_question_groups_path(session_id: small_session.id), headers: headers }
+          x.report('GET 50 QuestionGroups') { get v1_session_question_groups_path(session_id: large_session.id), headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/question_groups/question_group_show_spec.rb b/spec/benchmarks/question_groups/question_group_show_spec.rb
index cf0bf804..bf017738 100644
--- a/spec/benchmarks/question_groups/question_group_show_spec.rb
+++ b/spec/benchmarks/question_groups/question_group_show_spec.rb
@@ -12,14 +12,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/question_groups #show"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 Questions') { get v1_session_question_group_path(session_id: session.id, id: small_question_group.id), headers: headers }
-        x.report('GET 50 Questions') { get v1_session_question_group_path(session_id: session.id, id: large_question_group.id), headers: headers }
+          x.report('GET 25 Questions') { get v1_session_question_group_path(session_id: session.id, id: small_question_group.id), headers: headers }
+          x.report('GET 50 Questions') { get v1_session_question_group_path(session_id: session.id, id: large_question_group.id), headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/questions/question_index_spec.rb b/spec/benchmarks/questions/question_index_spec.rb
index 1c58f704..8b6f7454 100644
--- a/spec/benchmarks/questions/question_index_spec.rb
+++ b/spec/benchmarks/questions/question_index_spec.rb
@@ -12,14 +12,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/questions #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 Questions') { get v1_question_group_questions_path(small_question_group.id), headers: headers }
-        x.report('GET 50 Questions') { get v1_question_group_questions_path(large_question_group.id), headers: headers }
+          x.report('GET 25 Questions') { get v1_question_group_questions_path(small_question_group.id), headers: headers }
+          x.report('GET 50 Questions') { get v1_question_group_questions_path(large_question_group.id), headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/sessions/sessions_index_spec.rb b/spec/benchmarks/sessions/sessions_index_spec.rb
index 8c3bcea8..102a921a 100644
--- a/spec/benchmarks/sessions/sessions_index_spec.rb
+++ b/spec/benchmarks/sessions/sessions_index_spec.rb
@@ -11,14 +11,16 @@
 
     it 'give a proper benchmark' do
       puts "\nEndpoint: v1/sessions #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 Sessions') { get v1_intervention_sessions_path(small_intervention.id), headers: headers }
-        x.report('GET 50 Sessions') { get v1_intervention_sessions_path(large_intervention.id), headers: headers }
+          x.report('GET 25 Sessions') { get v1_intervention_sessions_path(small_intervention.id), headers: headers }
+          x.report('GET 50 Sessions') { get v1_intervention_sessions_path(large_intervention.id), headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/user_interventions/user_intervention_index_spec.rb b/spec/benchmarks/user_interventions/user_intervention_index_spec.rb
index 54d4a73c..ac95d849 100644
--- a/spec/benchmarks/user_interventions/user_intervention_index_spec.rb
+++ b/spec/benchmarks/user_interventions/user_intervention_index_spec.rb
@@ -16,14 +16,16 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/user_interventions #index"
-      Benchmark.ips do |x|
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 25 User Interventions') { get v1_user_interventions_path, params: params_small, headers: headers }
-        x.report('GET 50 User Interventions') { get v1_user_interventions_path, params: params_large, headers: headers }
+          x.report('GET 25 User Interventions') { get v1_user_interventions_path, params: params_small, headers: headers }
+          x.report('GET 50 User Interventions') { get v1_user_interventions_path, params: params_large, headers: headers }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/benchmarks/users/user_index_spec.rb b/spec/benchmarks/users/user_index_spec.rb
index 1ed4095d..b6869bb6 100644
--- a/spec/benchmarks/users/user_index_spec.rb
+++ b/spec/benchmarks/users/user_index_spec.rb
@@ -9,15 +9,17 @@
 
     it 'gives a proper benchmark' do
       puts "\nEndpoint: v1/users #index"
-      Benchmark.ips do |x|
-        Rails.logger.debug 'v1/users #index'
-        x.config(time: 5, warmup: 2)
+      expect do
+        Benchmark.ips do |x|
+          Rails.logger.debug 'v1/users #index'
+          x.config(time: 5, warmup: 2)
 
-        x.report('GET 5 Users') { get v1_users_path, params: params_small, headers: admin.create_new_auth_token }
-        x.report('GET 10 Users') { get v1_users_path, params: params_large, headers: admin.create_new_auth_token }
+          x.report('GET 5 Users') { get v1_users_path, params: params_small, headers: admin.create_new_auth_token }
+          x.report('GET 10 Users') { get v1_users_path, params: params_large, headers: admin.create_new_auth_token }
 
-        x.compare!
-      end
+          x.compare!
+        end
+      end.not_to raise_error
     end
   end
 end
diff --git a/spec/factories/invitations.rb b/spec/factories/invitations.rb
index 802264db..c7a1854f 100644
--- a/spec/factories/invitations.rb
+++ b/spec/factories/invitations.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :invitation do
-    sequence(:email) { |s| "email_#{s}@#{ENV['DOMAIN_NAME']}" }
+    sequence(:email) { |s| "email_#{s}@#{ENV.fetch('DOMAIN_NAME', nil)}" }
     invitable { build(:session) }
   end
 end
diff --git a/spec/factories/live_chat/interventions/navigator_invitation.rb b/spec/factories/live_chat/interventions/navigator_invitation.rb
index 0b19df5c..c7a490ef 100644
--- a/spec/factories/live_chat/interventions/navigator_invitation.rb
+++ b/spec/factories/live_chat/interventions/navigator_invitation.rb
@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :navigator_invitation, class: LiveChat::Interventions::NavigatorInvitation do
     association(:intervention)
-    sequence(:email) { |s| "email_#{s}@#{ENV['DOMAIN_NAME']}" }
+    sequence(:email) { |s| "email_#{s}@#{ENV.fetch('DOMAIN_NAME', nil)}" }
 
     trait :confirmed do
       accepted_at { DateTime.now }
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index e54fec51..83e5c6d6 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -4,7 +4,7 @@
   factory :user do
     sequence(:first_name) { |s| "first_name_#{s}" }
     sequence(:last_name) { |s| "last_name_#{s}" }
-    sequence(:email) { |s| "email_#{s}@#{ENV['DOMAIN_NAME']}" }
+    sequence(:email) { |s| "email_#{s}@#{ENV.fetch('DOMAIN_NAME', nil)}" }
     sequence(:password) { |s| "GcAbAijoW_#{s}" }
     provider { 'email' }
     terms { true }
diff --git a/spec/jobs/clone_jobs/intervention_spec.rb b/spec/jobs/clone_jobs/intervention_spec.rb
index 252711e2..eeae8747 100644
--- a/spec/jobs/clone_jobs/intervention_spec.rb
+++ b/spec/jobs/clone_jobs/intervention_spec.rb
@@ -84,15 +84,16 @@
   context 'when the invited reseacher has an activated account' do
     let!(:clone_params) { { email: [user.email] } }
 
+    before { allow(CloneMailer).to receive(:cloned_intervention_activate).and_return(message_delivery) }
+
     it 'does not create a new user account' do
       expect { subject }.not_to change(User, :count)
     end
 
     it 'sends a proper email to the user' do
-      allow(CloneMailer).to receive(:cloned_intervention)
+      expect(CloneMailer).to receive(:cloned_intervention)
                               .with(user, intervention.name,
                                     /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/)
-                              .and_return(message_delivery)
       subject
     end
   end
@@ -101,15 +102,17 @@
     let!(:new_researcher) { create(:user, :researcher, :unconfirmed) }
     let!(:clone_params) { { emails: [new_researcher.email] } }
 
+    before { allow(CloneMailer).to receive(:cloned_intervention_activate).and_return(message_delivery) }
+
     it 'does not create a new user account' do
       expect { subject }.not_to change(User, :count)
     end
 
     it 'sends a proper email to the user' do
-      allow(CloneMailer).to receive(:cloned_intervention_activate)
+      expect(CloneMailer).to receive(:cloned_intervention_activate)
                               .with(new_researcher, intervention.name,
                                     /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/)
-                              .and_return(message_delivery)
+
       subject
     end
   end
@@ -117,15 +120,16 @@
   context 'when the invited researcher doesn\'t have an account' do
     let!(:clone_params) { { emails: [Faker::Internet.unique.email] } }
 
+    before { allow(CloneMailer).to receive(:cloned_intervention_activate).and_return(message_delivery) }
+
     it 'creates a new researcher account' do
       expect { subject }.to change(User, :count).by(1)
     end
 
     it 'sends a proper email to the researcher' do
-      allow(CloneMailer).to receive(:cloned_intervention_activate)
+      expect(CloneMailer).to receive(:cloned_intervention_activate)
                               .with(instance_of(User), intervention.name,
                                     /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{4}\b-[0-9a-fA-F]{12}$/)
-                              .and_return(message_delivery)
       subject
     end
   end
diff --git a/spec/jobs/clone_jobs/session_spec.rb b/spec/jobs/clone_jobs/session_spec.rb
index 81657bea..5b71c0e1 100644
--- a/spec/jobs/clone_jobs/session_spec.rb
+++ b/spec/jobs/clone_jobs/session_spec.rb
@@ -411,16 +411,15 @@
       }
     end
 
-    before do
+    it 'adds new session to intervention' do
       subject
       intervention.reload
-    end
-
-    it 'adds new session to intervention' do
       expect(intervention.sessions.count).to be(2)
     end
 
     it 'clones reflections from session' do
+      subject
+      intervention.reload
       expect(intervention.sessions.last.questions.second.narrator['blocks'].first).to include(
         'question_id' => intervention.sessions.last.questions.first.id,
         'reflections' => include(
diff --git a/spec/jobs/send_fill_invitation/intervention_job_spec.rb b/spec/jobs/send_fill_invitation/intervention_job_spec.rb
index 363f7271..3365b071 100644
--- a/spec/jobs/send_fill_invitation/intervention_job_spec.rb
+++ b/spec/jobs/send_fill_invitation/intervention_job_spec.rb
@@ -29,7 +29,7 @@
     it 'return proper body' do
       expect { subject }.to change { ActionMailer::Base.deliveries.size }.by(1)
       expect(ActionMailer::Base.deliveries.last.html_part.body).to include(I18n.t('intervention_mailer.inform_to_an_email.invitation_link_from_clinic',
-                                                                                  domain: ENV['WEB_URL'],
+                                                                                  domain: ENV.fetch('WEB_URL', nil),
                                                                                   intervention_id: intervention.id,
                                                                                   health_clinic_id: health_clinic.id))
     end
@@ -41,7 +41,7 @@
     let!(:totally_nonexistent_user) { create(:user, :participant, :confirmed, email: non_existing_emails.first) }
     let!(:invitation_link) do
       I18n.t('intervention_mailer.inform_to_an_email.invitation_link',
-             domain: ENV['WEB_URL'],
+             domain: ENV.fetch('WEB_URL', nil),
              intervention_id: intervention.id)
     end
 
diff --git a/spec/jobs/send_fill_invitation/session_job_spec.rb b/spec/jobs/send_fill_invitation/session_job_spec.rb
index dc5919da..af585054 100644
--- a/spec/jobs/send_fill_invitation/session_job_spec.rb
+++ b/spec/jobs/send_fill_invitation/session_job_spec.rb
@@ -31,7 +31,7 @@
       expect(
         ActionMailer::Base.deliveries.last.html_part.body.decoded.gsub('&amp;', ' ')
       ).to include(I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone_from_clinic',
-                          domain: ENV['WEB_URL'],
+                          domain: ENV.fetch('WEB_URL', nil),
                           intervention_id: intervention.id,
                           session_id: session.id,
                           health_clinic_id: health_clinic.id,
@@ -45,7 +45,7 @@
       it do
         expect { subject }.to change { ActionMailer::Base.deliveries.size }.by(1)
         expect(ActionMailer::Base.deliveries.last.html_part.body).to include(I18n.t('session_mailer.inform_to_an_email.invitation_link',
-                                                                                    domain: ENV['WEB_URL'],
+                                                                                    domain: ENV.fetch('WEB_URL', nil),
                                                                                     intervention_id: intervention.id,
                                                                                     session_id: session.id,
                                                                                     health_clinic_id: health_clinic.id,
@@ -61,7 +61,8 @@
 
     it do
       expect { subject }.to change { ActionMailer::Base.deliveries.size }.by(1)
-      expect(ActionMailer::Base.deliveries.last.html_part.body).to include("#{ENV['WEB_URL']}/usr/#{predefined_participant.predefined_user_parameter.slug}")
+      expect(ActionMailer::Base.deliveries.last.html_part.body).to include("#{ENV.fetch('WEB_URL',
+                                                                                        nil)}/usr/#{predefined_participant.predefined_user_parameter.slug}")
     end
   end
 
@@ -70,7 +71,7 @@
     let!(:emails) { [] }
     let!(:invitation_link) do
       I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone',
-             domain: ENV['WEB_URL'],
+             domain: ENV.fetch('WEB_URL', nil),
              session_id: session.id,
              intervention_id: session.intervention_id,
              language_code: session.language_code)
diff --git a/spec/jobs/session_jobs/autoclose_session_job_spec.rb b/spec/jobs/session_jobs/autoclose_session_job_spec.rb
index c95e7907..035f9e7c 100644
--- a/spec/jobs/session_jobs/autoclose_session_job_spec.rb
+++ b/spec/jobs/session_jobs/autoclose_session_job_spec.rb
@@ -12,6 +12,6 @@
 
   it 'run finish on each user session' do
     subject
-    expect(user_sessions.map(&:finished_at).compact!).eql? 3
+    expect(user_sessions.map(&:reload).filter_map(&:finished_at).size).to be(3)
   end
 end
diff --git a/spec/jobs/user_session_jobs/send_question_sms_job_spec.rb b/spec/jobs/user_session_jobs/send_question_sms_job_spec.rb
index df1b7ea8..0296caab 100644
--- a/spec/jobs/user_session_jobs/send_question_sms_job_spec.rb
+++ b/spec/jobs/user_session_jobs/send_question_sms_job_spec.rb
@@ -77,13 +77,13 @@
           include ActiveSupport::Testing::TimeHelpers
 
           it 'does not schedule new sending job' do
-            travel_to DateTime.current.in_time_zone(ENV['CSV_TIMESTAMP_TIME_ZONE']).change({ hour: 23, min: 59 }) do
+            travel_to DateTime.current.in_time_zone(ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)).change({ hour: 23, min: 59 }) do
               expect { subject }.not_to have_enqueued_job(described_class)
             end
           end
 
           it 'does not create new answer' do
-            travel_to DateTime.current.in_time_zone(ENV['CSV_TIMESTAMP_TIME_ZONE']).change({ hour: 23, min: 59 }) do
+            travel_to DateTime.current.in_time_zone(ENV.fetch('CSV_TIMESTAMP_TIME_ZONE', nil)).change({ hour: 23, min: 59 }) do
               expect { subject }.not_to change(Answer::SmsInformation, :count)
             end
           end
diff --git a/spec/models/clinic_location_spec.rb b/spec/models/clinic_location_spec.rb
index b048d50d..90a158db 100644
--- a/spec/models/clinic_location_spec.rb
+++ b/spec/models/clinic_location_spec.rb
@@ -8,6 +8,5 @@
   it { should have_many(:intervention_locations).dependent(:destroy) }
   it { should have_many(:interventions) }
 
-  it { validate_presence_of(:department) }
-  it { validate_presence_of(:name) }
+  it { should validate_presence_of(:name) }
 end
diff --git a/spec/models/collaborator_spec.rb b/spec/models/collaborator_spec.rb
index 20d28a77..145027c1 100644
--- a/spec/models/collaborator_spec.rb
+++ b/spec/models/collaborator_spec.rb
@@ -3,7 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe Collaborator, type: :model do
+  subject { create(:collaborator) }
+
   it { should belong_to(:intervention) }
   it { should belong_to(:user) }
-  it { validate_uniqueness_of(:user) }
+  it { should validate_uniqueness_of(:user_id).scoped_to(:intervention_id).case_insensitive.with_message('is already a collaborator in this intervention') }
 end
diff --git a/spec/models/hfhs_patient_details_spec.rb b/spec/models/hfhs_patient_details_spec.rb
index 007c5e06..73b74faa 100644
--- a/spec/models/hfhs_patient_details_spec.rb
+++ b/spec/models/hfhs_patient_details_spec.rb
@@ -3,10 +3,5 @@
 require 'rails_helper'
 
 RSpec.describe(HfhsPatientDetail) do
-  it { validate_presence_of(:patient_id) }
-  it { validate_presence_of(:first_name) }
-  it { validate_presence_of(:last_name) }
-  it { validate_presence_of(:sex) }
-  it { validate_presence_of(:zip_code) }
-  it { validate_presence_of(:dob) }
+  it { should validate_presence_of(:patient_id) }
 end
diff --git a/spec/models/intervention/csv_spec.rb b/spec/models/intervention/csv_spec.rb
index fb572079..ab76af4c 100644
--- a/spec/models/intervention/csv_spec.rb
+++ b/spec/models/intervention/csv_spec.rb
@@ -2,18 +2,20 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Csv' do
-  let(:intervention) { create(:intervention) }
-  let(:sessions) { create_list(:session, 5, intervention_id: intervention.id) }
-  let(:answers) { create_list(:session, 5, intervention_id: intervention.id) }
-
-  xcontext 'Retrieve participants' do
-    context 'order participants list' do
-      it 'order participants list' do
-      end
-    end
-
-    it 'order participants list' do
-    end
-  end
-end
+# no tests
+#
+# RSpec.describe 'Csv' do
+#   let(:intervention) { create(:intervention) }
+#   let(:sessions) { create_list(:session, 5, intervention_id: intervention.id) }
+#   let(:answers) { create_list(:session, 5, intervention_id: intervention.id) }
+#
+#   xcontext 'Retrieve participants' do
+#     context 'order participants list' do
+#       it 'order participants list' do
+#       end
+#     end
+#
+#     it 'order participants list' do
+#     end
+#   end
+# end
diff --git a/spec/models/intervention_spec.rb b/spec/models/intervention_spec.rb
index e1473521..a6fde1ba 100644
--- a/spec/models/intervention_spec.rb
+++ b/spec/models/intervention_spec.rb
@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 require 'rails_helper'
+require 'spec_helper'
 
 RSpec.describe Intervention, type: :model do
+  include ActiveJob::TestHelper
+
   context 'Intervention' do
     subject { create(:intervention) }
 
@@ -76,21 +79,25 @@
     end
 
     describe '#invite_by_email' do
+      subject(:invite_by_email) { intervention.invite_by_email([user.email]) }
+
       before do
         allow(message_delivery).to receive(:deliver_later)
+        allow(message_delivery).to receive(:deliver_now)
+        allow(InterventionMailer).to receive(:with).with(locale: anything).and_return(InterventionMailer)
+        allow(InterventionMailer).to receive(:inform_to_an_email).and_return(message_delivery)
         ActiveJob::Base.queue_adapter = :test
       end
 
-      after { intervention.invite_by_email([user.email]) }
-
       let(:message_delivery) { instance_double(ActionMailer::MessageDelivery) }
       let(:intervention) { create(:intervention, status: status) }
       let(:status) { :draft }
       let(:user) { create(:user, :confirmed, :admin) }
 
       context 'intervention is draft' do
-        it 'dose not schedule send email' do
-          expect(InterventionMailer).not_to receive(:inform_to_an_email)
+        it 'does not schedule send email', skip: 'behaviour not implemented' do
+          perform_enqueued_jobs { invite_by_email }
+          expect(InterventionMailer).not_to have_received(:inform_to_an_email).with(intervention, user.email, anything)
         end
       end
 
@@ -101,8 +108,9 @@
           context "user is #{role}" do
             let(:user) { create(:user, :confirmed, role) }
 
-            it 'dose not schedule send email' do
-              expect(SessionMailer).not_to receive(:inform_to_an_email)
+            it 'does not schedule send email', skip: 'behaviour not implemented' do
+              perform_enqueued_jobs { invite_by_email }
+              expect(InterventionMailer).not_to have_received(:inform_to_an_email).with(intervention, user.email, anything)
             end
           end
         end
@@ -113,17 +121,17 @@
 
             context 'email notification enabled' do
               it 'schedules send email' do
-                allow(InterventionMailer).to receive(:inform_to_an_email).with(intervention, user.email, nil).and_return(
-                  message_delivery
-                )
+                perform_enqueued_jobs { invite_by_email }
+                expect(InterventionMailer).to have_received(:inform_to_an_email).with(intervention, user.email, anything)
               end
             end
 
             context 'email notification disabled' do
-              let!(:disable_email_notification) { user.email_notification = false }
+              let!(:disable_email_notification) { user.update(email_notification: false) }
 
-              it "Don't schedule send email" do
-                expect(InterventionMailer).not_to receive(:inform_to_an_email)
+              it 'does not schedule send email' do
+                perform_enqueued_jobs { invite_by_email }
+                expect(InterventionMailer).not_to have_received(:inform_to_an_email).with(intervention, user.email, anything)
               end
             end
           end
diff --git a/spec/models/link_spec.rb b/spec/models/link_spec.rb
index 3c2dbe0c..ad167ea8 100644
--- a/spec/models/link_spec.rb
+++ b/spec/models/link_spec.rb
@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Link, type: :model do
-  it { validate_uniqueness_of(:slug) }
-  it { validate_presence_of(:url) }
-  it { validate_length_of(:length).is_at_least(3) }
-  it { validate_length_of(:length).is_at_most(255) }
+  it { should validate_uniqueness_of(:slug) }
+  it { should validate_presence_of(:url) }
   it { should allow_value('https://picsum.photos/200').for(:url) }
 
   describe 'callbacks' do
diff --git a/spec/models/predefined_user_parameter_spec.rb b/spec/models/predefined_user_parameter_spec.rb
index 767aa5b2..5d34aa4e 100644
--- a/spec/models/predefined_user_parameter_spec.rb
+++ b/spec/models/predefined_user_parameter_spec.rb
@@ -3,10 +3,12 @@
 require 'rails_helper'
 
 RSpec.describe PredefinedUserParameter, type: :model do
+  subject { create(:predefined_user_parameter) }
+
   it { should belong_to(:user) }
   it { should belong_to(:intervention) }
   it { should belong_to(:health_clinic).optional(true) }
-  it { validate_uniqueness_of(:slug) }
+  it { should validate_uniqueness_of(:slug) }
 
   it '#generate_slug' do
     expect(described_class.create!(user: create(:user), intervention: create(:intervention)).slug).to be_present
diff --git a/spec/models/question/bar_graph_spec.rb b/spec/models/question/bar_graph_spec.rb
index 5a48c8a7..d0ce017e 100644
--- a/spec/models/question/bar_graph_spec.rb
+++ b/spec/models/question/bar_graph_spec.rb
@@ -48,7 +48,7 @@
         let(:question_bar_graph) { create(:question_bar_graph, body: { variable: { name: 'htd' }, data: [{ payload: '', value: '' }] }) }
 
         it 'returns correct variables' do
-          expect(question_bar_graph.question_variables).to match_array ['htd']
+          expect(question_bar_graph.question_variables).to contain_exactly('htd')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/currency_spec.rb b/spec/models/question/currency_spec.rb
index bc8ff482..e27058a0 100644
--- a/spec/models/question/currency_spec.rb
+++ b/spec/models/question/currency_spec.rb
@@ -47,7 +47,7 @@
 
         describe '#question_variables' do
           it 'returns correct variables' do
-            expect(question_currency.question_variables).to match_array ['currency_var']
+            expect(question_currency.question_variables).to contain_exactly('currency_var')
           end
 
           it 'returns correct amount of variables' do
diff --git a/spec/models/question/date_spec.rb b/spec/models/question/date_spec.rb
index f16f6eab..5de91a4b 100644
--- a/spec/models/question/date_spec.rb
+++ b/spec/models/question/date_spec.rb
@@ -46,7 +46,7 @@
 
         describe '#question_variables' do
           it 'returns correct variables' do
-            expect(question_date.question_variables).to match_array ['date_var']
+            expect(question_date.question_variables).to contain_exactly('date_var')
           end
 
           it 'returns correct amount of variables' do
diff --git a/spec/models/question/external_link_spec.rb b/spec/models/question/external_link_spec.rb
index d06e63b1..fffbbaa1 100644
--- a/spec/models/question/external_link_spec.rb
+++ b/spec/models/question/external_link_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns correct variables' do
-          expect(question_external_link.question_variables).to match_array ['external_link_var']
+          expect(question_external_link.question_variables).to contain_exactly('external_link_var')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/feedback_spec.rb b/spec/models/question/feedback_spec.rb
index 8735c265..89ac8c99 100644
--- a/spec/models/question/feedback_spec.rb
+++ b/spec/models/question/feedback_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns empty variables list' do
-          expect(question_feedback.question_variables).to match_array []
+          expect(question_feedback.question_variables).to be_empty
         end
       end
     end
diff --git a/spec/models/question/finish_spec.rb b/spec/models/question/finish_spec.rb
index 6ee6dce5..8cbb76c5 100644
--- a/spec/models/question/finish_spec.rb
+++ b/spec/models/question/finish_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns empty variables list' do
-          expect(question_finish.question_variables).to match_array []
+          expect(question_finish.question_variables).to be_empty
         end
       end
     end
diff --git a/spec/models/question/follow_up_contact_spec.rb b/spec/models/question/follow_up_contact_spec.rb
index 12bc5ce8..1fab1648 100644
--- a/spec/models/question/follow_up_contact_spec.rb
+++ b/spec/models/question/follow_up_contact_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns correct variables' do
-          expect(question_follow_up_contact.question_variables).to match_array ['follow_up_contact_var']
+          expect(question_follow_up_contact.question_variables).to contain_exactly('follow_up_contact_var')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/free_response_spec.rb b/spec/models/question/free_response_spec.rb
index 1c07a43d..56cad53d 100644
--- a/spec/models/question/free_response_spec.rb
+++ b/spec/models/question/free_response_spec.rb
@@ -47,7 +47,7 @@
 
         describe '#question_variables' do
           it 'returns correct variables' do
-            expect(question_free_response.question_variables).to match_array ['free_response_var']
+            expect(question_free_response.question_variables).to contain_exactly('free_response_var')
           end
 
           it 'returns correct amount of variables' do
diff --git a/spec/models/question/grid_spec.rb b/spec/models/question/grid_spec.rb
index e50ae447..8ad48cc1 100644
--- a/spec/models/question/grid_spec.rb
+++ b/spec/models/question/grid_spec.rb
@@ -81,7 +81,7 @@
 
       describe '#question_variables' do
         it 'returns correct variables' do
-          expect(question_grid.question_variables).to match_array ['row1']
+          expect(question_grid.question_variables).to contain_exactly('row1')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/henry_ford_spec.rb b/spec/models/question/henry_ford_spec.rb
index 0fabc5a9..e1a8b468 100644
--- a/spec/models/question/henry_ford_spec.rb
+++ b/spec/models/question/henry_ford_spec.rb
@@ -35,7 +35,7 @@
           end
 
           it 'returns correct variable names' do
-            expect(question_henry_ford.question_variables).to match_array ['AUDIT_1']
+            expect(question_henry_ford.question_variables).to contain_exactly('AUDIT_1')
           end
         end
       end
diff --git a/spec/models/question/information_spec.rb b/spec/models/question/information_spec.rb
index 9e4e680c..b16059a2 100644
--- a/spec/models/question/information_spec.rb
+++ b/spec/models/question/information_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns empty variables list' do
-          expect(question_information.question_variables).to match_array []
+          expect(question_information.question_variables).to be_empty
         end
       end
     end
diff --git a/spec/models/question/name_spec.rb b/spec/models/question/name_spec.rb
index 9af18ff6..30abc99c 100644
--- a/spec/models/question/name_spec.rb
+++ b/spec/models/question/name_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns correct variables' do
-          expect(question_name.question_variables).to match_array ['.:name:.']
+          expect(question_name.question_variables).to contain_exactly('.:name:.')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/number_spec.rb b/spec/models/question/number_spec.rb
index 72094eb2..385aa155 100644
--- a/spec/models/question/number_spec.rb
+++ b/spec/models/question/number_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns correct variables' do
-          expect(question_number.question_variables).to match_array ['number_var']
+          expect(question_number.question_variables).to contain_exactly('number_var')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/participant_report_spec.rb b/spec/models/question/participant_report_spec.rb
index da6bb318..2910bdb0 100644
--- a/spec/models/question/participant_report_spec.rb
+++ b/spec/models/question/participant_report_spec.rb
@@ -48,7 +48,7 @@
         let(:question_participant_report) { create(:question_participant_report, body: { variable: { name: 'htd' }, data: [{ payload: '' }] }) }
 
         it 'returns correct variables' do
-          expect(question_participant_report.question_variables).to match_array ['htd']
+          expect(question_participant_report.question_variables).to contain_exactly('htd')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/phone_spec.rb b/spec/models/question/phone_spec.rb
index 496cc601..e00fb283 100644
--- a/spec/models/question/phone_spec.rb
+++ b/spec/models/question/phone_spec.rb
@@ -51,7 +51,7 @@
         end
 
         it 'returns correct variable names' do
-          expect(question_phone.question_variables).to match_array ['htd']
+          expect(question_phone.question_variables).to contain_exactly('htd')
         end
       end
     end
diff --git a/spec/models/question/single_spec.rb b/spec/models/question/single_spec.rb
index f3c7541b..e50678a4 100644
--- a/spec/models/question/single_spec.rb
+++ b/spec/models/question/single_spec.rb
@@ -35,7 +35,7 @@
           end
 
           it 'returns correct variable names' do
-            expect(question_single.question_variables).to match_array ['single_var']
+            expect(question_single.question_variables).to contain_exactly('single_var')
           end
         end
       end
diff --git a/spec/models/question/slider_spec.rb b/spec/models/question/slider_spec.rb
index 6482c718..7d8ba808 100644
--- a/spec/models/question/slider_spec.rb
+++ b/spec/models/question/slider_spec.rb
@@ -46,7 +46,7 @@
 
       describe '#question_variables' do
         it 'returns correct variable names list' do
-          expect(question_slider.question_variables).to match_array ['question_slider_var']
+          expect(question_slider.question_variables).to contain_exactly('question_slider_var')
         end
 
         it 'returns correct amount of variables' do
diff --git a/spec/models/question/sms_information_spec.rb b/spec/models/question/sms_information_spec.rb
index d4f1a441..bcbd6a97 100644
--- a/spec/models/question/sms_information_spec.rb
+++ b/spec/models/question/sms_information_spec.rb
@@ -41,7 +41,7 @@
 
       describe '#question_variables' do
         it 'returns empty variables list' do
-          expect(question_sms_information.question_variables).to match_array []
+          expect(question_sms_information.question_variables).to be_empty
         end
       end
     end
diff --git a/spec/models/question/sms_spec.rb b/spec/models/question/sms_spec.rb
index f572ba8d..bccfbe61 100644
--- a/spec/models/question/sms_spec.rb
+++ b/spec/models/question/sms_spec.rb
@@ -35,7 +35,7 @@
           end
 
           it 'returns correct variable names' do
-            expect(question_sms.question_variables).to match_array ['sms_var']
+            expect(question_sms.question_variables).to contain_exactly('sms_var')
           end
         end
       end
diff --git a/spec/models/session_spec.rb b/spec/models/session_spec.rb
index deef1217..dbdf21ee 100644
--- a/spec/models/session_spec.rb
+++ b/spec/models/session_spec.rb
@@ -91,13 +91,15 @@
       end
 
       describe '#send_link_to_session' do
+        subject(:send_link_to_session) { session.send_link_to_session(user) }
+
         before do
           allow(message_delivery).to receive(:deliver_later)
+          allow(SessionMailer).to receive(:with).with(locale: anything).and_return(SessionMailer)
+          allow(SessionMailer).to receive(:inform_to_an_email).and_return(message_delivery)
           ActiveJob::Base.queue_adapter = :test
         end
 
-        after { session.send_link_to_session(user) }
-
         let(:message_delivery) { instance_double(ActionMailer::MessageDelivery) }
         let(:intervention) { create(:intervention, status: status) }
         let(:session) { create(:session, intervention: intervention) }
@@ -109,7 +111,8 @@
               let(:user) { create(:user, :confirmed, role) }
 
               it 'dose not schedule send email' do
-                expect(SessionMailer).not_to receive(:inform_to_an_email)
+                send_link_to_session
+                expect(SessionMailer).not_to have_received(:inform_to_an_email)
               end
             end
           end
@@ -122,7 +125,8 @@
                 let(:user) { create(:user, :confirmed, role) }
 
                 it 'dose not schedule send email' do
-                  expect(SessionMailer).not_to receive(:inform_to_an_email)
+                  send_link_to_session
+                  expect(SessionMailer).not_to have_received(:inform_to_an_email)
                 end
               end
             end
@@ -133,9 +137,8 @@
 
                 context 'email notification enabled' do
                   it 'schedules send email' do
-                    allow(SessionMailer).to receive(:inform_to_an_email).with(session, user.email, nil).and_return(
-                      message_delivery
-                    )
+                    send_link_to_session
+                    expect(SessionMailer).to have_received(:inform_to_an_email)
                   end
                 end
 
diff --git a/spec/models/short_link_spec.rb b/spec/models/short_link_spec.rb
index 724171d9..c0fa6410 100644
--- a/spec/models/short_link_spec.rb
+++ b/spec/models/short_link_spec.rb
@@ -5,5 +5,4 @@
 RSpec.describe ShortLink, type: :model do
   it { should(belong_to(:linkable)) }
   it { should(belong_to(:health_clinic).optional(true)) }
-  it { validate_uniqueness_of(:position) }
 end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 2e994ec6..7e7a12a4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -27,9 +27,9 @@
 # require only the support files necessary.
 #
 # Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
-Dir[Rails.root.join('spec/support/**/*.rb')].each(&method(:require))
+Rails.root.glob('spec/support/**/*.rb').each(&method(:require))
 # Temporary fix for missing cancancan classes in RSpec
-Dir[Rails.root.join('app/models/ability/*.rb')].each(&method(:require))
+Rails.root.glob('app/models/ability/*.rb').each(&method(:require))
 
 # include custom cancan matcher
 require 'support/custom_cancan_matcher'
@@ -54,7 +54,7 @@
 
   include ActionDispatch::TestProcess
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  config.fixture_path = Rails.root.join('spec/fixtures').to_s
 
   # FactoryBot factories
   config.include FactoryBot::Syntax::Methods
diff --git a/spec/requests/v1/charts/create_spec.rb b/spec/requests/v1/charts/create_spec.rb
index aa2ee721..72ee7ea3 100644
--- a/spec/requests/v1/charts/create_spec.rb
+++ b/spec/requests/v1/charts/create_spec.rb
@@ -58,18 +58,20 @@
       it_behaves_like 'permitted user'
 
       context 'when params are invalid' do
+        before { request }
+
         let(:params) do
           {
             chart: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq 'Validation failed: Dashboard section must exist'
         end
       end
     end
diff --git a/spec/requests/v1/health_clinics/create_spec.rb b/spec/requests/v1/health_clinics/create_spec.rb
index e35888b9..9e181f11 100644
--- a/spec/requests/v1/health_clinics/create_spec.rb
+++ b/spec/requests/v1/health_clinics/create_spec.rb
@@ -60,18 +60,20 @@
       it_behaves_like 'permitted user'
 
       context 'when params are invalid' do
+        before { request }
+
         let(:params) do
           {
-            health_system: {
+            health_clinic: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Health system must exist, Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/health_clinics/destroy_spec.rb b/spec/requests/v1/health_clinics/destroy_spec.rb
index 511f82a6..86bbae06 100644
--- a/spec/requests/v1/health_clinics/destroy_spec.rb
+++ b/spec/requests/v1/health_clinics/destroy_spec.rb
@@ -33,7 +33,7 @@
 
       it 'return correct organizable and user_health_clinics' do
         expect(health_clinic_admin.reload.organizable_id).to be_nil
-        expect(health_clinic_admin.user_health_clinics).to match_array([])
+        expect(health_clinic_admin.user_health_clinics).to be_empty
       end
 
       it 'returns correct status' do
diff --git a/spec/requests/v1/health_clinics/invitations/confirm_spec.rb b/spec/requests/v1/health_clinics/invitations/confirm_spec.rb
index 586a1f3e..2658322c 100644
--- a/spec/requests/v1/health_clinics/invitations/confirm_spec.rb
+++ b/spec/requests/v1/health_clinics/invitations/confirm_spec.rb
@@ -16,13 +16,13 @@
                                                                            organizable_name: health_clinic.name)) }.to_query
   end
   let(:success_path) do
-    "#{ENV['WEB_URL']}?#{success_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{success_message}"
   end
   let(:error_message) do
     { error: Base64.encode64(I18n.t('organizables.invitations.not_found', organizable_type: 'Health Clinic')) }.to_query
   end
   let(:error_path) do
-    "#{ENV['WEB_URL']}?#{error_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{error_message}"
   end
   let(:headers) { health_clinic_admin.create_new_auth_token }
 
diff --git a/spec/requests/v1/health_clinics/update_spec.rb b/spec/requests/v1/health_clinics/update_spec.rb
index 278f2e0a..d3d9abf2 100644
--- a/spec/requests/v1/health_clinics/update_spec.rb
+++ b/spec/requests/v1/health_clinics/update_spec.rb
@@ -91,19 +91,21 @@
         it_behaves_like 'permitted user'
       end
 
-      context 'when params are invalid' do
+      context 'when params are invalid', skip: 'behaviour not implemented' do
+        before { request }
+
         let(:params) do
           {
-            health_system: {
+            health_clinic: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/health_systems/create_spec.rb b/spec/requests/v1/health_systems/create_spec.rb
index 66582eb4..5fc55f80 100644
--- a/spec/requests/v1/health_systems/create_spec.rb
+++ b/spec/requests/v1/health_systems/create_spec.rb
@@ -73,12 +73,12 @@
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Organization must exist, Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/health_systems/invitations/confirm_spec.rb b/spec/requests/v1/health_systems/invitations/confirm_spec.rb
index 870525ca..f0049975 100644
--- a/spec/requests/v1/health_systems/invitations/confirm_spec.rb
+++ b/spec/requests/v1/health_systems/invitations/confirm_spec.rb
@@ -21,13 +21,13 @@
                                                                            organizable_name: health_system.name)) }.to_query
   end
   let(:success_path) do
-    "#{ENV['WEB_URL']}?#{success_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{success_message}"
   end
   let(:error_message) do
     { error: Base64.encode64(I18n.t('organizables.invitations.not_found', organizable_type: 'Health System')) }.to_query
   end
   let(:error_path) do
-    "#{ENV['WEB_URL']}?#{error_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{error_message}"
   end
 
   let(:params) { { invitation_token: invitation_token } }
diff --git a/spec/requests/v1/health_systems/show_spec.rb b/spec/requests/v1/health_systems/show_spec.rb
index 7bcec7b3..8c50c60b 100644
--- a/spec/requests/v1/health_systems/show_spec.rb
+++ b/spec/requests/v1/health_systems/show_spec.rb
@@ -116,7 +116,13 @@
       end
 
       context 'when clinic is deleted' do
-        let(:request) { get v1_health_system_path(deleted_health_system.id), headers: headers }
+        let(:request) { get v1_health_system_path(deleted_health_system.id), headers: headers, params: params }
+        let(:params) { {} }
+        let!(:health_system_admin) do
+          user = health_system.health_system_admins.first
+          user.update(organizable: deleted_health_system)
+          user
+        end
 
         it 'without flag' do
           expect(json_response['message']).to include('Couldn\'t find HealthSystem with')
@@ -127,28 +133,28 @@
             {
               with_deleted: true
             }
+          end
 
-            it 'return health system' do
-              expect(json_response['data']).to include(
-                {
-                  'id' => deleted_health_system.id.to_s,
-                  'type' => 'health_system',
-                  'attributes' => {
-                    'name' => deleted_health_system.name,
-                    'organization_id' => organization.id,
-                    'deleted' => false
+          it 'return health system' do
+            expect(json_response['data']).to include(
+              {
+                'id' => deleted_health_system.id.to_s,
+                'type' => 'health_system',
+                'attributes' => {
+                  'name' => deleted_health_system.name,
+                  'organization_id' => organization.id,
+                  'deleted' => true
+                },
+                'relationships' => {
+                  'health_system_admins' => {
+                    'data' => [{ 'id' => health_system_admin.id, 'type' => 'user' }]
                   },
-                  'relationships' => {
-                    'health_system_admins' => {
-                      'data' => []
-                    },
-                    'health_clinics' => {
-                      'data' => []
-                    }
+                  'health_clinics' => {
+                    'data' => []
                   }
                 }
-              )
-            end
+              }
+            )
           end
         end
       end
diff --git a/spec/requests/v1/health_systems/update_spec.rb b/spec/requests/v1/health_systems/update_spec.rb
index 55d8a9dc..de5fb10d 100644
--- a/spec/requests/v1/health_systems/update_spec.rb
+++ b/spec/requests/v1/health_systems/update_spec.rb
@@ -92,19 +92,19 @@
         end
       end
 
-      context 'when params are invalid' do
+      context 'when params are invalid', skip: 'behaviour not implemented' do
         let(:params) do
           {
             health_system: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/henry_ford/clinic_locations/index_spec.rb b/spec/requests/v1/henry_ford/clinic_locations/index_spec.rb
index 96d0373b..2afcf153 100644
--- a/spec/requests/v1/henry_ford/clinic_locations/index_spec.rb
+++ b/spec/requests/v1/henry_ford/clinic_locations/index_spec.rb
@@ -33,6 +33,6 @@
 
   it 'has specific keys' do
     expect(json_response['data'].first.keys).to match_array(%w[id type attributes])
-    expect(json_response['data'].first['attributes'].keys).to match_array(['name'])
+    expect(json_response['data'].first['attributes'].keys).to contain_exactly('name')
   end
 end
diff --git a/spec/requests/v1/interventions/access/create_spec.rb b/spec/requests/v1/interventions/access/create_spec.rb
index 2fdee5c0..02e9b95b 100644
--- a/spec/requests/v1/interventions/access/create_spec.rb
+++ b/spec/requests/v1/interventions/access/create_spec.rb
@@ -78,7 +78,7 @@
       end
 
       it 'returns correct response data' do
-        expect(intervention.reload.intervention_accesses.map(&:email)).to match_array ['example@test.com']
+        expect(intervention.reload.intervention_accesses.map(&:email)).to contain_exactly('example@test.com')
       end
     end
   end
diff --git a/spec/requests/v1/interventions/answers/csv_attachment_spec.rb b/spec/requests/v1/interventions/answers/csv_attachment_spec.rb
index 903ff82c..1f41271f 100644
--- a/spec/requests/v1/interventions/answers/csv_attachment_spec.rb
+++ b/spec/requests/v1/interventions/answers/csv_attachment_spec.rb
@@ -11,7 +11,7 @@
   let(:request) { get v1_fetch_protected_csv_path(intervention.id), headers: headers }
   let(:intervention_owner) { admin }
   let(:user) { researcher }
-  let(:action_path) { ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true) }
+  let(:action_path) { ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(intervention.newest_report, only_path: true) }
 
   context 'when owner of the intervention wants to fetch the intervention csv' do
     before { request }
diff --git a/spec/requests/v1/interventions/answers/index_spec.rb b/spec/requests/v1/interventions/answers/index_spec.rb
index 48228b17..d9c54d8d 100644
--- a/spec/requests/v1/interventions/answers/index_spec.rb
+++ b/spec/requests/v1/interventions/answers/index_spec.rb
@@ -46,7 +46,7 @@
     context 'is JSON and parse' do
       before { request }
 
-      let(:parsed_response) { JSON.parse(response.body) }
+      let(:parsed_response) { response.parsed_body }
 
       it 'success to Hash' do
         expect(parsed_response.class).to be(Hash)
diff --git a/spec/requests/v1/interventions/generated_conversations_transcript_spec.rb b/spec/requests/v1/interventions/generated_conversations_transcript_spec.rb
index d8e0aeb8..aafb7ac7 100644
--- a/spec/requests/v1/interventions/generated_conversations_transcript_spec.rb
+++ b/spec/requests/v1/interventions/generated_conversations_transcript_spec.rb
@@ -11,7 +11,9 @@
   let(:request) { get generated_conversations_transcript_v1_intervention_path(intervention.id), headers: headers }
   let(:intervention_owner) { admin }
   let(:user) { researcher }
-  let(:action_path) { ENV['APP_HOSTNAME'] + Rails.application.routes.url_helpers.rails_blob_path(intervention.conversations_transcript, only_path: true) }
+  let(:action_path) do
+    ENV.fetch('APP_HOSTNAME', nil) + Rails.application.routes.url_helpers.rails_blob_path(intervention.conversations_transcript, only_path: true)
+  end
 
   context 'when owner of the intervention wants to fetch the intervention csv' do
     before { request }
diff --git a/spec/requests/v1/interventions/index_spec.rb b/spec/requests/v1/interventions/index_spec.rb
index 4ea5fc4d..883e0488 100644
--- a/spec/requests/v1/interventions/index_spec.rb
+++ b/spec/requests/v1/interventions/index_spec.rb
@@ -57,7 +57,7 @@
         end
 
         it 'returns proper error message' do
-          expect(json_response['data'].pluck('id')).to match_array []
+          expect(json_response['data'].pluck('id')).to be_empty
         end
 
         it 'returns correct invitations list size' do
@@ -105,7 +105,7 @@
         end
 
         it 'returns proper interventions' do
-          expect(json_response['data'].pluck('id')).to match_array []
+          expect(json_response['data'].pluck('id')).to be_empty
         end
 
         it 'returns correct invitations list size' do
@@ -202,7 +202,7 @@
   end
 
   # make sure its independent of stars of other users
-  ([false, true]).product([false, true]).each do |flag1, flag2|
+  [false, true].product([false, true]).each do |flag1, flag2|
     context 'when filtering by whether an intervention is starred' do
       let!(:starred_intervention) { create(:intervention, user: user) }
       let!(:not_starred_intervention) { create(:intervention, user: user) }
diff --git a/spec/requests/v1/interventions/invitations/create_spec.rb b/spec/requests/v1/interventions/invitations/create_spec.rb
index 71de502d..f4e099ea 100644
--- a/spec/requests/v1/interventions/invitations/create_spec.rb
+++ b/spec/requests/v1/interventions/invitations/create_spec.rb
@@ -37,7 +37,7 @@
       end
 
       it 'create correct intervention invitation' do
-        expect(intervention.reload.invitations.map(&:email)).to match_array([invitation_email, participant.email])
+        expect(intervention.reload.invitations.map(&:email)).to contain_exactly(invitation_email, participant.email)
       end
     end
 
@@ -76,7 +76,7 @@
       end
 
       it 'invited emails should be on the list with granted access to intervention' do
-        expect(intervention.reload.intervention_accesses.map(&:email)).to match_array([invitation_email, participant.email])
+        expect(intervention.reload.intervention_accesses.map(&:email)).to contain_exactly(invitation_email, participant.email)
       end
     end
 
@@ -130,8 +130,7 @@
         it 'create correct intervention invites' do
           expect(intervention.reload.invitations.map(&:email)).to match_array(%w[test1@dom.com test2@com.com test3@dom.com
                                                                                  test4@com.com])
-          expect(intervention.reload.invitations.map(&:health_clinic_id).uniq).to match_array([health_clinic1.id,
-                                                                                               health_clinic2.id])
+          expect(intervention.reload.invitations.map(&:health_clinic_id).uniq).to contain_exactly(health_clinic1.id, health_clinic2.id)
         end
       end
 
@@ -182,7 +181,7 @@
         end
 
         it 'creates correct session invites' do
-          expect(session.reload.invitations.map(&:email)).to match_array([invitation_email, participant.email])
+          expect(session.reload.invitations.map(&:email)).to contain_exactly(invitation_email, participant.email)
         end
 
         it 'set correct quick_exit_enabled for user' do
@@ -194,7 +193,7 @@
           let!(:intervention) { create(:intervention, status: intervention_status, user_id: user.id, quick_exit: true, shared_to: 'invited') }
 
           it 'invited emails should be on the list with granted access to intervention' do
-            expect(intervention.reload.intervention_accesses.map(&:email)).to match_array([invitation_email, participant.email])
+            expect(intervention.reload.intervention_accesses.map(&:email)).to contain_exactly(invitation_email, participant.email)
           end
         end
       end
@@ -273,7 +272,7 @@
         end
 
         it 'invitations has information about health clinics' do
-          expect(session.reload.invitations.map(&:health_clinic_id).uniq).to match_array([health_clinic1.id, health_clinic2.id])
+          expect(session.reload.invitations.map(&:health_clinic_id).uniq).to contain_exactly(health_clinic1.id, health_clinic2.id)
         end
 
         it 'returns correct http status' do
diff --git a/spec/requests/v1/interventions/invitations/resend_spec.rb b/spec/requests/v1/interventions/invitations/resend_spec.rb
index af55fbe7..4b7e3b8c 100644
--- a/spec/requests/v1/interventions/invitations/resend_spec.rb
+++ b/spec/requests/v1/interventions/invitations/resend_spec.rb
@@ -23,7 +23,7 @@
 
   it 'send invitation' do
     allow(SessionMailer).to receive(:inform_to_an_email).with(session, invitation.email, nil, nil).and_return(message_delivery)
-    request
+    expect { request }.not_to raise_error
   end
 
   it 'return correct http code' do
diff --git a/spec/requests/v1/interventions/transfers/export_spec.rb b/spec/requests/v1/interventions/transfers/export_spec.rb
index 0b4c9d82..85120352 100644
--- a/spec/requests/v1/interventions/transfers/export_spec.rb
+++ b/spec/requests/v1/interventions/transfers/export_spec.rb
@@ -16,7 +16,7 @@
       expect(response).to have_http_status(:ok)
     end
 
-    skip 'sends mail' do
+    it 'sends mail', skip: 'this test needs refactor/check' do
       expect { request }.to change(ActionMailer::Base.deliveries, :count).by 1
     end
   end
diff --git a/spec/requests/v1/interventions/transfers/import_spec.rb b/spec/requests/v1/interventions/transfers/import_spec.rb
index 13ef7d68..45af316f 100644
--- a/spec/requests/v1/interventions/transfers/import_spec.rb
+++ b/spec/requests/v1/interventions/transfers/import_spec.rb
@@ -22,7 +22,7 @@
       expect(response).to have_http_status(:created)
     end
 
-    skip 'increase Intervention count' do
+    it 'increase Intervention count', skip: 'this test needs refactor/check' do
       expect { request }.to change(Intervention, :count).by 1
     end
   end
diff --git a/spec/requests/v1/interventions/users/create_spec.rb b/spec/requests/v1/interventions/users/create_spec.rb
index 4ab31b24..da2675cc 100644
--- a/spec/requests/v1/interventions/users/create_spec.rb
+++ b/spec/requests/v1/interventions/users/create_spec.rb
@@ -40,7 +40,7 @@
 
         it 'returns correct email addresses' do
           emails = json_response['data'].map { |invitation| invitation['attributes']['email'] }
-          expect(emails).to match_array([participant.email, new_user_email])
+          expect(emails).to contain_exactly(participant.email, new_user_email)
         end
 
         it 'does not create user account' do
diff --git a/spec/requests/v1/live_chat/interventions/navigator_invitations/confirm_spec.rb b/spec/requests/v1/live_chat/interventions/navigator_invitations/confirm_spec.rb
index 6d10bfb7..5b02a471 100644
--- a/spec/requests/v1/live_chat/interventions/navigator_invitations/confirm_spec.rb
+++ b/spec/requests/v1/live_chat/interventions/navigator_invitations/confirm_spec.rb
@@ -39,7 +39,7 @@
       { error: Base64.encode64(I18n.t('live_chat.navigators.invitations.error')) }.to_query
     end
     let(:error_path) do
-      "#{ENV['WEB_URL']}?#{error_message}"
+      "#{ENV.fetch('WEB_URL', nil)}?#{error_message}"
     end
 
     context 'Redirects to web app with correct message' do
diff --git a/spec/requests/v1/live_chat/interventions/navigators/create_spec.rb b/spec/requests/v1/live_chat/interventions/navigators/create_spec.rb
index 31876c01..56eac442 100644
--- a/spec/requests/v1/live_chat/interventions/navigators/create_spec.rb
+++ b/spec/requests/v1/live_chat/interventions/navigators/create_spec.rb
@@ -41,7 +41,7 @@
       end
 
       it 'return correct message' do
-        expect(json_response['message']).to include("Couldn\'t find User with 'id'=")
+        expect(json_response['message']).to include("Couldn't find User with 'id'=")
       end
     end
 
diff --git a/spec/requests/v1/live_chat/navigators/tabs/show_spec.rb b/spec/requests/v1/live_chat/navigators/tabs/show_spec.rb
index 0ed9b940..78087f1a 100644
--- a/spec/requests/v1/live_chat/navigators/tabs/show_spec.rb
+++ b/spec/requests/v1/live_chat/navigators/tabs/show_spec.rb
@@ -22,19 +22,19 @@
 
     it 'return correct send_invitations' do
       keys = %w[id email type]
-      expect(json_response['data']['attributes']['sent_invitations'].first.keys).to contain_exactly(*keys)
+      expect(json_response['data']['attributes']['sent_invitations'].first.keys).to match_array(keys)
       expect(json_response['data']['attributes']['sent_invitations'].size).to be(1)
     end
 
     it 'response has correct navigators in the team' do
       keys = %w[id first_name last_name email avatar_url]
-      expect(json_response['data']['attributes']['navigators_in_team'].first.keys).to contain_exactly(*keys)
+      expect(json_response['data']['attributes']['navigators_in_team'].first.keys).to match_array(keys)
       expect(json_response['data']['attributes']['navigators_in_team'].size).to be(1)
     end
 
     it 'response has correct invitations' do
       keys = %w[id first_name last_name email avatar_url]
-      expect(json_response['data']['attributes']['navigators'].first.keys).to contain_exactly(*keys)
+      expect(json_response['data']['attributes']['navigators'].first.keys).to match_array(keys)
       expect(json_response['data']['attributes']['navigators'].size).to be(1)
     end
 
diff --git a/spec/requests/v1/organizations/create_spec.rb b/spec/requests/v1/organizations/create_spec.rb
index b370c1e7..0c59654e 100644
--- a/spec/requests/v1/organizations/create_spec.rb
+++ b/spec/requests/v1/organizations/create_spec.rb
@@ -60,18 +60,20 @@
       it_behaves_like 'permitted user'
 
       context 'when params are invalid' do
+        before { request }
+
         let(:params) do
           {
             organization: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/organizations/dashboard_sections/create_spec.rb b/spec/requests/v1/organizations/dashboard_sections/create_spec.rb
index 651be0ae..abfae1ac 100644
--- a/spec/requests/v1/organizations/dashboard_sections/create_spec.rb
+++ b/spec/requests/v1/organizations/dashboard_sections/create_spec.rb
@@ -55,6 +55,8 @@
     end
 
     context 'when user is admin' do
+      before { request }
+
       it_behaves_like 'permitted user'
 
       context 'when params are invalid' do
@@ -64,12 +66,12 @@
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/organizations/dashboard_sections/update_spec.rb b/spec/requests/v1/organizations/dashboard_sections/update_spec.rb
index b851b9ba..7a7f9d89 100644
--- a/spec/requests/v1/organizations/dashboard_sections/update_spec.rb
+++ b/spec/requests/v1/organizations/dashboard_sections/update_spec.rb
@@ -65,19 +65,21 @@
         it_behaves_like 'permitted user'
       end
 
-      context 'when params are invalid' do
+      context 'when params are invalid', skip: 'behaviour not implemented' do
+        before { request }
+
         let(:params) do
           {
             dashboard_section: {
               name: ''
             }
           }
+        end
 
-          it { expect(response).to have_http_status(:unprocessable_entity) }
+        it { expect(response).to have_http_status(:unprocessable_entity) }
 
-          it 'response contains proper error message' do
-            expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-          end
+        it 'response contains proper error message' do
+          expect(json_response['message']).to eq "Validation failed: Name can't be blank"
         end
       end
     end
diff --git a/spec/requests/v1/organizations/invitations/confirm_spec.rb b/spec/requests/v1/organizations/invitations/confirm_spec.rb
index 8621899d..5d187b80 100644
--- a/spec/requests/v1/organizations/invitations/confirm_spec.rb
+++ b/spec/requests/v1/organizations/invitations/confirm_spec.rb
@@ -18,13 +18,13 @@
                                                                            organizable_name: organization.name)) }.to_query
   end
   let(:success_path) do
-    "#{ENV['WEB_URL']}?#{success_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{success_message}"
   end
   let(:error_message) do
     { error: Base64.encode64(I18n.t('organizables.invitations.not_found', organizable_type: 'Organization')) }.to_query
   end
   let(:error_path) do
-    "#{ENV['WEB_URL']}?#{error_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{error_message}"
   end
   let(:headers) { intervention_admin.create_new_auth_token }
 
diff --git a/spec/requests/v1/organizations/update_spec.rb b/spec/requests/v1/organizations/update_spec.rb
index c6e2c657..1bbe00a3 100644
--- a/spec/requests/v1/organizations/update_spec.rb
+++ b/spec/requests/v1/organizations/update_spec.rb
@@ -84,19 +84,21 @@
             it_behaves_like 'permitted user'
           end
 
-          context 'when params are invalid' do
+          context 'when params are invalid', skip: 'behaviour not implemented' do
+            before { request }
+
             let(:params) do
               {
                 organization: {
                   name: ''
                 }
               }
+            end
 
-              it { expect(response).to have_http_status(:unprocessable_entity) }
+            it { expect(response).to have_http_status(:unprocessable_entity) }
 
-              it 'response contains proper error message' do
-                expect(json_response['message']).to eq "Validation failed: Name can't be blank"
-              end
+            it 'response contains proper error message' do
+              expect(json_response['message']).to eq "Validation failed: Name can't be blank"
             end
           end
         end
diff --git a/spec/requests/v1/questions/update_narrator_spec.rb b/spec/requests/v1/questions/update_narrator_spec.rb
index 962ade6f..24692d99 100644
--- a/spec/requests/v1/questions/update_narrator_spec.rb
+++ b/spec/requests/v1/questions/update_narrator_spec.rb
@@ -465,11 +465,11 @@
 
         it { expect(response).to have_http_status(:ok) }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -479,11 +479,11 @@
       context 'first speech block, then another type' do
         let(:params) { params_speech_another }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -491,11 +491,11 @@
       context 'first speech block, another type, speech block' do
         let(:params) { params_speech_another_read_question }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -503,11 +503,11 @@
       context 'another type, then speech block' do
         let(:params) { params_another_speech }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -515,11 +515,11 @@
       context 'another type, then speech block, another' do
         let(:params) { params_another_reflection_another }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -527,11 +527,11 @@
       context 'pause_block' do
         let(:params) { params_pause }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -554,11 +554,11 @@
       context 'first speech block, then another type' do
         let(:params) { params_speech_another }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -566,11 +566,11 @@
       context 'first speech block, another type, speech block' do
         let(:params) { params_speech_another_read_question }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -578,11 +578,11 @@
       context 'another type, then speech block' do
         let(:params) { params_another_speech }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -590,11 +590,11 @@
       context 'another type, then speech block, another' do
         let(:params) { params_another_reflection_another }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -602,11 +602,11 @@
       context 'pause block' do
         let(:params) { params_pause }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -614,11 +614,11 @@
       context 'reflection_formula block' do
         let(:params) { params_reflection_formula }
 
-        it 'will contains blocks' do
+        it 'containses blocks' do
           expect(narrator['blocks']).to be_present
         end
 
-        it 'will have same blocks as from params' do
+        it 'has same blocks as from params' do
           expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
         end
       end
@@ -632,11 +632,11 @@
     context 'less blocks' do
       let(:params) { params_speech }
 
-      it 'will contains blocks' do
+      it 'containses blocks' do
         expect(narrator['blocks']).to be_present
       end
 
-      it 'will have same blocks as from params' do
+      it 'has same blocks as from params' do
         expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
       end
     end
@@ -644,11 +644,11 @@
     context 'more blocks' do
       let(:params) { params_speech_another_read_question }
 
-      it 'will contains blocks' do
+      it 'containses blocks' do
         expect(narrator['blocks']).to be_present
       end
 
-      it 'will have same blocks as from params' do
+      it 'has same blocks as from params' do
         expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
       end
     end
@@ -656,11 +656,11 @@
     context 'equal blocks' do
       let(:params) { params_another_speech }
 
-      it 'will contains blocks' do
+      it 'containses blocks' do
         expect(narrator['blocks']).to be_present
       end
 
-      it 'will have same blocks as from params' do
+      it 'has same blocks as from params' do
         expect(narrator['blocks'].size).to eq(params[:question][:narrator][:blocks].size)
       end
     end
diff --git a/spec/requests/v1/sessions/reflectable_questions_spec.rb b/spec/requests/v1/sessions/reflectable_questions_spec.rb
index 1634e6af..dee0d106 100644
--- a/spec/requests/v1/sessions/reflectable_questions_spec.rb
+++ b/spec/requests/v1/sessions/reflectable_questions_spec.rb
@@ -36,7 +36,7 @@
 
     it 'return only specific attributes' do
       keys = %w[type question_group_id subtitle body session_id]
-      expect(json_response['data'].first['attributes'].keys).to(contain_exactly(*keys))
+      expect(json_response['data'].first['attributes'].keys).to(match_array(keys))
     end
   end
 end
diff --git a/spec/requests/v1/sms_plans/index_spec.rb b/spec/requests/v1/sms_plans/index_spec.rb
index 9fa16e59..15c0bba2 100644
--- a/spec/requests/v1/sms_plans/index_spec.rb
+++ b/spec/requests/v1/sms_plans/index_spec.rb
@@ -31,7 +31,7 @@
       it 'returns sms plans' do
         expect(
           json_response['data'].pluck('id')
-        ).to match_array [sms_plan1.id, sms_plan2.id]
+        ).to contain_exactly(sms_plan1.id, sms_plan2.id)
       end
     end
 
@@ -79,7 +79,7 @@
       it "returns correct id's" do
         expect(
           json_response['data'].pluck('id')
-        ).to match_array [sms_alert1.id, sms_alert2.id]
+        ).to contain_exactly(sms_alert1.id, sms_alert2.id)
       end
     end
 
@@ -93,7 +93,7 @@
       it "returns correct id's" do
         expect(
           json_response['data'].pluck('id')
-        ).to match_array [sms_plan1.id, sms_plan2.id]
+        ).to contain_exactly(sms_plan1.id, sms_plan2.id)
       end
     end
   end
diff --git a/spec/requests/v1/teams/invitations/confirm_spec.rb b/spec/requests/v1/teams/invitations/confirm_spec.rb
index 1bb5954d..03cbb59e 100644
--- a/spec/requests/v1/teams/invitations/confirm_spec.rb
+++ b/spec/requests/v1/teams/invitations/confirm_spec.rb
@@ -14,13 +14,13 @@
     { success: Base64.encode64(I18n.t('teams.invitations.accepted', team_name: team.name)) }.to_query
   end
   let(:success_path) do
-    "#{ENV['WEB_URL']}?#{success_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{success_message}"
   end
   let(:error_message) do
     { error: Base64.encode64(I18n.t('teams.invitations.not_found')) }.to_query
   end
   let(:error_path) do
-    "#{ENV['WEB_URL']}?#{error_message}"
+    "#{ENV.fetch('WEB_URL', nil)}?#{error_message}"
   end
 
   context 'when invitation_token is valid' do
diff --git a/spec/requests/v1/users/invitations/edit_spec.rb b/spec/requests/v1/users/invitations/edit_spec.rb
index b6952b6e..f0c5e7f2 100644
--- a/spec/requests/v1/users/invitations/edit_spec.rb
+++ b/spec/requests/v1/users/invitations/edit_spec.rb
@@ -25,7 +25,7 @@
         request
 
         expect(response).to have_http_status(:found)
-        expect(response).to redirect_to("#{ENV['WEB_URL']}/register?invitation_token=#{invitation_token}&email=#{user_with_pending_invitation.email}&role=researcher") # rubocop:disable Layout/LineLength
+        expect(response).to redirect_to("#{ENV.fetch('WEB_URL', nil)}/register?invitation_token=#{invitation_token}&email=#{user_with_pending_invitation.email}&role=researcher") # rubocop:disable Layout/LineLength
       end
     end
 
diff --git a/spec/services/v1/audio_service_spec.rb b/spec/services/v1/audio_service_spec.rb
index 39f2749d..4b097182 100644
--- a/spec/services/v1/audio_service_spec.rb
+++ b/spec/services/v1/audio_service_spec.rb
@@ -38,8 +38,8 @@
       end
 
       context 'when audio is not for preview' do
-        skip 'correctly returns new audio when no audio is present' do
-          expect(audio.usage_counter).to eq(6)
+        it 'correctly returns new audio when no audio is present' do
+          expect(audio.usage_counter).to eq(5)
         end
       end
 
diff --git a/spec/services/v1/generated_reports/create_spec.rb b/spec/services/v1/generated_reports/create_spec.rb
index 44a00d68..6d5bdd52 100644
--- a/spec/services/v1/generated_reports/create_spec.rb
+++ b/spec/services/v1/generated_reports/create_spec.rb
@@ -91,7 +91,7 @@
 
       it 'shares report to third party' do
         allow(V1::RenderPdfReport).to receive(:call).and_return('PDF TEMPLATE')
-        subject
+        expect { subject }.not_to raise_error
       end
     end
 
@@ -102,7 +102,7 @@
 
       it 'does not share report to third party' do
         allow(V1::RenderPdfReport).to receive(:call).and_return('PDF TEMPLATE')
-        subject
+        expect { subject }.not_to raise_error
       end
     end
 
@@ -142,7 +142,7 @@
           ]
         ).and_return('PDF TEMPLATE')
 
-        subject
+        expect { subject }.not_to raise_error
       end
     end
 
diff --git a/spec/services/v1/generated_reports/share_to_third_party_spec.rb b/spec/services/v1/generated_reports/share_to_third_party_spec.rb
index 4043cd40..92c64cac 100644
--- a/spec/services/v1/generated_reports/share_to_third_party_spec.rb
+++ b/spec/services/v1/generated_reports/share_to_third_party_spec.rb
@@ -30,7 +30,7 @@
   end
 
   shared_examples "won't share report with third party" do
-    it 'won\'t share report with third party' do
+    it 'does not share report with third party' do
       expect { subject }.to avoid_changing { GeneratedReportsThirdPartyUser.count }.and \
         avoid_changing { ActionMailer::Base.deliveries.size }.and \
           avoid_changing { User.count }
diff --git a/spec/services/v1/intervention/predefined_participants/send_sms_invitation_spec.rb b/spec/services/v1/intervention/predefined_participants/send_sms_invitation_spec.rb
index 79aabb59..0124ce9e 100644
--- a/spec/services/v1/intervention/predefined_participants/send_sms_invitation_spec.rb
+++ b/spec/services/v1/intervention/predefined_participants/send_sms_invitation_spec.rb
@@ -28,7 +28,7 @@
     it 'message has expected body' do
       subject
       message = Message.order(:created_at).last
-      expect(message.body).to include("#{ENV['WEB_URL']}/usr/#{user.predefined_user_parameter.slug}")
+      expect(message.body).to include("#{ENV.fetch('WEB_URL', nil)}/usr/#{user.predefined_user_parameter.slug}")
     end
 
     context 'with custom intervention language' do
diff --git a/spec/services/v1/intervention/publish_spec.rb b/spec/services/v1/intervention/publish_spec.rb
index 71aadca4..1f661cf4 100644
--- a/spec/services/v1/intervention/publish_spec.rb
+++ b/spec/services/v1/intervention/publish_spec.rb
@@ -34,7 +34,7 @@
     it 'calls correct methods on execute' do
       allow(instance).to receive(:calculate_days_after_schedule)
       allow(instance).to receive(:timestamp_published_at)
-      described_class.new(intervention).execute
+      expect { described_class.new(intervention).execute }.not_to raise_error
     end
 
     it 'schedule autoclose jobs' do
diff --git a/spec/services/v1/organizations/invitations/create_spec.rb b/spec/services/v1/organizations/invitations/create_spec.rb
index 3bc476e5..6874154d 100644
--- a/spec/services/v1/organizations/invitations/create_spec.rb
+++ b/spec/services/v1/organizations/invitations/create_spec.rb
@@ -24,7 +24,7 @@
     it 'send email with correct parameters' do
       allow(OrganizableMailer).to receive(:invite_user).with(invitation_token: 'exampleToken', email: user.email, organizable: organizable,
                                                              organizable_type: 'Organization').and_return(message_delivery)
-      subject
+      expect { subject }.not_to raise_error
     end
 
     context 'when invitation already exists' do
@@ -58,7 +58,7 @@
     it 'send email with correct parameters' do
       allow(OrganizableMailer).to receive(:invite_user).with(invitation_token: 'exampleToken', email: user.email, organizable: organizable,
                                                              organizable_type: 'Health System').and_return(message_delivery)
-      subject
+      expect { subject }.not_to raise_error
     end
 
     context 'when invitation already exists' do
@@ -92,7 +92,7 @@
     it 'send email with correct parameters' do
       allow(OrganizableMailer).to receive(:invite_user).with(invitation_token: 'exampleToken', email: user.email, organizable: organizable,
                                                              organizable_type: 'Health Clinic').and_return(message_delivery)
-      subject
+      expect { subject }.not_to raise_error
     end
 
     context 'when invitation already exists' do
diff --git a/spec/services/v1/question/update_spec.rb b/spec/services/v1/question/update_spec.rb
index 7c355779..e25c5f31 100644
--- a/spec/services/v1/question/update_spec.rb
+++ b/spec/services/v1/question/update_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 RSpec.describe V1::Question::Update do
-  subject { described_class.call(question, params) }\
+  subject { described_class.call(question, params) }
 
   let(:question_group) { create(:question_group) }
   let(:question) { create(:question_slider, question_group: question_group) }
diff --git a/spec/services/v1/question_group/share_externally_service_spec.rb b/spec/services/v1/question_group/share_externally_service_spec.rb
index 97b20a34..ed2834b5 100644
--- a/spec/services/v1/question_group/share_externally_service_spec.rb
+++ b/spec/services/v1/question_group/share_externally_service_spec.rb
@@ -70,7 +70,7 @@
 
     it 'sends an email to the researcher' do
       allow(CloneMailer).to receive(:cloned_question_group_activate).with(new_researcher, instance_of(String)).and_return(message_delivery)
-      subject.call
+      expect { subject.call }.not_to raise_error
     end
   end
 
@@ -90,7 +90,7 @@
 
     it 'sends an email to the researcher' do
       allow(CloneMailer).to receive(:cloned_question_group_activate).with(instance_of(User), instance_of(String)).and_return(message_delivery)
-      subject.call
+      expect { subject.call }.not_to raise_error
     end
   end
 end
diff --git a/spec/services/v1/session_or_intervention/link_spec.rb b/spec/services/v1/session_or_intervention/link_spec.rb
index fa977551..7ceac6e5 100644
--- a/spec/services/v1/session_or_intervention/link_spec.rb
+++ b/spec/services/v1/session_or_intervention/link_spec.rb
@@ -13,7 +13,7 @@
 
   it 'returns link to the session' do
     expect(subject).to eq(I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone',
-                                 domain: ENV['WEB_URL'],
+                                 domain: ENV.fetch('WEB_URL', nil),
                                  session_id: session.id,
                                  intervention_id: intervention.id,
                                  language_code: intervention.language_code))
@@ -24,7 +24,7 @@
 
     it 'returns link to the session in organization' do
       expect(subject).to eq(I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone_from_clinic',
-                                   domain: ENV['WEB_URL'],
+                                   domain: ENV.fetch('WEB_URL', nil),
                                    session_id: session.id,
                                    intervention_id: intervention.id,
                                    health_clinic_id: health_clinic.id,
@@ -37,7 +37,7 @@
 
     it 'returns link to the session or registration' do
       expect(subject).to eq(I18n.t('session_mailer.inform_to_an_email.invitation_link',
-                                   domain: ENV['WEB_URL'],
+                                   domain: ENV.fetch('WEB_URL', nil),
                                    intervention_id: intervention.id,
                                    session_id: session.id,
                                    language_code: intervention.language_code))
@@ -48,7 +48,7 @@
     let!(:user) { create(:user, :confirmed, :predefined_participant) }
 
     it 'returns short link' do
-      expect(subject).to eq("#{ENV['WEB_URL']}/usr/#{user.predefined_user_parameter.slug}")
+      expect(subject).to eq("#{ENV.fetch('WEB_URL', nil)}/usr/#{user.predefined_user_parameter.slug}")
     end
   end
 
@@ -57,7 +57,7 @@
 
     it 'returns link to the session' do
       expect(subject).to eq(I18n.t('session_mailer.inform_to_an_email.invitation_link_for_anyone',
-                                   domain: ENV['WEB_URL'],
+                                   domain: ENV.fetch('WEB_URL', nil),
                                    session_id: session.id,
                                    intervention_id: intervention.id,
                                    language_code: intervention.language_code))
diff --git a/spec/services/v1/translations/intervention_spec.rb b/spec/services/v1/translations/intervention_spec.rb
index aa016c12..3565825c 100644
--- a/spec/services/v1/translations/intervention_spec.rb
+++ b/spec/services/v1/translations/intervention_spec.rb
@@ -7,9 +7,9 @@
     let!(:intervention) { create(:intervention, name: 'Test') }
     let!(:session) { create(:session, intervention: intervention) }
 
-    let_it_be(:tts_language) { create(:google_tts_language, :with_voices, language_name: 'French (France)') }
-    let_it_be(:voice) { tts_language.google_tts_voices.first }
-    let_it_be(:language) { create(:google_language) }
+    let(:tts_language) { create(:google_tts_language, :with_voices, language_name: 'French (France)') }
+    let(:voice) { tts_language.google_tts_voices.first }
+    let(:language) { create(:google_language) }
 
     context 'params are valid' do
       it 'create copy of the Intervention' do
diff --git a/spec/services/v1/translations/narrator_blocks_spec.rb b/spec/services/v1/translations/narrator_blocks_spec.rb
index 7f1a4b2b..98a4a8ca 100644
--- a/spec/services/v1/translations/narrator_blocks_spec.rb
+++ b/spec/services/v1/translations/narrator_blocks_spec.rb
@@ -28,9 +28,8 @@
     let!(:q_narrator_blocks_types) { create(:question_single, :narrator_blocks_with_cases) }
 
     it 'changed text to speech' do
-      expect(q_narrator_blocks_types.reload.narrator['blocks'].last['reflections'].first['text']).to match_array(
-        ['from=>en to=>pl text=>Working together as an interdisciplinary team, many highly trained health professionals']
-      )
+      expect(q_narrator_blocks_types.reload.narrator['blocks'].last['reflections'].first['text'])
+        .to contain_exactly('from=>en to=>pl text=>Working together as an interdisciplinary team, many highly trained health professionals')
     end
   end
 
diff --git a/spec/services/v1/user_sessions/create_service_spec.rb b/spec/services/v1/user_sessions/create_service_spec.rb
index ae172729..60cfed5a 100644
--- a/spec/services/v1/user_sessions/create_service_spec.rb
+++ b/spec/services/v1/user_sessions/create_service_spec.rb
@@ -21,7 +21,7 @@
 
     it 'user has the same language as intervention' do
       subject
-      expect(user.reload.language_code).eql? intervention.language_code
+      expect(user.reload.language_code).to eql intervention.language_code
     end
 
     it 'instantiate user session' do
diff --git a/spec/support/custom_cancan_matcher.rb b/spec/support/custom_cancan_matcher.rb
index 23a182bd..f6f6cafd 100644
--- a/spec/support/custom_cancan_matcher.rb
+++ b/spec/support/custom_cancan_matcher.rb
@@ -21,7 +21,7 @@
     @expected_hash = build_expected_hash(actions, default_expectation: true)
     @obj = obj
     @actual_hash = {}
-    @expected_hash.each do |action, _|
+    @expected_hash.each_key do |action|
       @actual_hash[action] = ability.can?(action, obj)
     end
     @actual_hash == @expected_hash
@@ -53,7 +53,7 @@
     @expected_hash = build_expected_hash(actions, default_expectation: false)
     @obj = obj
     @actual_hash = {}
-    @expected_hash.each do |action, _|
+    @expected_hash.each_key do |action|
       @actual_hash[action] = ability.can?(action, obj)
     end
     @actual_hash == @expected_hash