Run rubocop autocorrect -A & add remaining offenses to todo file

Co-authored-by: Nate Vick <[email protected]>

.rubocop.yml

@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 require:
   - rubocop-rspec
   - rubocop-rails
@@ -49,7 +51,7 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 Layout/LineLength:
-  Max: 100
+  Max: 243
 Metrics/BlockLength:
   Exclude:
     - Rakefile
@@ -64,7 +66,7 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Max: 20
 Metrics/AbcSize:
-  Max: 30
+  Max: 35
 Layout/CaseIndentation:
   Enabled: true
   EnforcedStyle: case

.rubocop_todo.yml

@@ -0,0 +1,71 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2023-11-03 23:21:49 UTC using RuboCop version 1.57.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 243
+
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'app/policies/user_policy.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedParentClasses.
+Lint/MissingSuper:
+  Exclude:
+    - 'app/policies/dashboard_policy.rb'
+    - 'app/policies/user_policy.rb'
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 34
+
+# Offense count: 4
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 81
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 9
+
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/need.rb'
+    - 'app/models/user.rb'
+
+# Offense count: 16
+Rails/I18nLocaleTexts:
+  Exclude:
+    - 'app/admin/site_status.rb'
+    - 'app/admin/users.rb'
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/needs_controller.rb'
+    - 'app/controllers/shift_surveys_controller.rb'
+    - 'app/controllers/shifts_controller.rb'
+    - 'app/controllers/verifications_controller.rb'
+    - 'app/mailers/user_mailer.rb'
+    - 'app/models/age_range.rb'
+    - 'app/models/need.rb'
+    - 'app/models/user.rb'

app/admin/shift_survey.rb

@@ -32,54 +32,35 @@ def to_param
 
   show do
     attributes_table do
-      row 'Shift Survey ID' do |s|
-        s.id
-      end
-      row 'Survey Status' do |s|
-        s.status
-      end
+      row 'Shift Survey ID', &:id
+      row 'Survey Status', &:status
       row 'Questions' do
         table_for shift_survey do
-          column 'Did you have adequate supplies to care for the child(ren) during your time at the office?' do |s|
-            s.supplies
-          end
-          column 'Comments' do |s|
-            s.supplies_text
-          end
+          column 'Did you have adequate supplies to care for the child(ren) during your time at the office?',
+                 &:supplies
+          column 'Comments', &:supplies_text
         end
         table_for shift_survey do
-          column 'Did the assigned social worker respond to questions or concerns in a timely manner?' do |s|
-            s.response_time
-          end
-          column 'Comments' do |s|
-            s.response_time_text
-          end
+          column 'Did the assigned social worker respond to questions or concerns in a timely manner?',
+                 &:response_time
+          column 'Comments', &:response_time_text
         end
         table_for shift_survey do
-          column 'Did the hours you signed up for match the hours you volunteered?' do |s|
-            s.hours_match
-          end
-          column 'Comments' do |s|
-            s.hours_match_text
-          end
+          column 'Did the hours you signed up for match the hours you volunteered?', &:hours_match
+          column 'Comments', &:hours_match_text
         end
         table_for shift_survey do
           column 'How are you feeling after your shift at the child welfare office? (check all that apply)' do |s|
             s.ratings.nil? ? nil : JSON.parse(s.ratings)
           end
-          column 'Comments' do |s|
-            s.ratings_text
-          end
+          column 'Comments', &:ratings_text
         end
         table_for shift_survey do
-          column 'Your feedback is important to us, and we love hearing from our volunteers! Do you have any comments or kudos you’d like to pass along?' do |s|
-            s.comments
-          end
+          column 'Your feedback is important to us, and we love hearing from our volunteers! Do you have any comments or kudos you’d like to pass along?',
+                 &:comments
         end
         table_for shift_survey do
-          column 'Any questions for your Volunteer Coordinator?' do |s|
-            s.questions
-          end
+          column 'Any questions for your Volunteer Coordinator?', &:questions
         end
       end
 
@@ -95,9 +76,7 @@ def to_param
       end
       row :shifts do
         table_for shift_survey.need.shifts.where(user_id: shift_survey.user_id) do
-          column 'Shift Duration(s)' do |s|
-            s.duration_in_words
-          end
+          column 'Shift Duration(s)', &:duration_in_words
         end
       end
       row 'Children' do |shift_survey|

app/admin/users.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ActiveAdmin.register User do # rubocop:disable Metrics/BlockLength
+ActiveAdmin.register User do
 
   config.sort_order = 'last_name_asc'
 
@@ -18,9 +18,7 @@
 
   %w(deactivate activate).each do |activation_type|
     member_action activation_type.to_sym, method: :post do
-      unless resource.update(deactivated: !resource.deactivated)
-        flash[:alert] = 'There was an issue updating this user.'
-      end
+      flash[:alert] = 'There was an issue updating this user.' unless resource.update(deactivated: !resource.deactivated)
       redirect_to admin_users_path
     end
   end

app/controllers/dashboard_controller.rb

@@ -33,11 +33,14 @@ def query
 
     @office = Office.find(params[:office_id]) if params[:office_id].present?
 
-    params[:start_date] = Time.now.beginning_of_month.to_date.to_s if params[:start_date].blank?
+    if params[:start_date].blank?
+      params[:start_date] =
+        Time.zone.now.beginning_of_month.to_date.to_s
+    end
 
     @start_date = params[:start_date]
 
-    params[:end_date] = Time.now.end_of_month.to_date.to_s if params[:end_date].blank?
+    params[:end_date] = Time.zone.now.end_of_month.to_date.to_s if params[:end_date].blank?
 
     @end_date = params[:end_date]
 

app/controllers/needs_controller.rb

@@ -97,7 +97,7 @@ def office_social_workers
   private
 
   def check_need_creation_disabled?
-    return unless need_creation_disabled?
+    return false unless need_creation_disabled?
 
     flash[:error] = redis.get('need_creation_disabled_msg').presence || 'Need creation disabled'
     redirect_to root_path

app/controllers/shift_surveys_controller.rb

@@ -13,15 +13,13 @@ def edit
 
     return unless @shift_survey.status == 'Complete'
 
-    flash[:notice] = 'You have already submitted your survey'
+    flash.now[:notice] = 'You have already submitted your survey'
     render 'thanks'
   end
 
   def update
     @shift_survey = ShiftSurvey.find_by(token: params[:token])
-    params[:shift_survey][:ratings] = params[:shift_survey][:ratings].select do |feeling|
-      feeling.present?
-    end
+    params[:shift_survey][:ratings] = params[:shift_survey][:ratings].select(&:present?)
     @shift_survey.assign_attributes(permitted_attributes(@shift_survey))
     if @shift_survey.save
       @shift_survey.update(status: 'Complete')

app/helpers/application_helper.rb

@@ -8,10 +8,10 @@ def flash_classes
   end
 
   def invite_options_for_select
-    User::ROLES.map do |role|
+    User::ROLES.filter_map do |role|
       u = User.new(role: role)
       [u.role_display, role] if policy(u).new?
-    end.compact
+    end
   end
 
   def offices_for_select(scope)

app/lib/includers/shift_update_event_helper.rb

@@ -26,7 +26,7 @@ def notifiable_office_users_and_need_user
   end
 
   def notifiable_office_users
-    users_with_notifiable_role = User.where('role IN (?)', NOTIFIABLE_ROLES)
+    users_with_notifiable_role = User.where(role: NOTIFIABLE_ROLES)
     need.office
         .users
         .merge(User.notifiable(users_with_notifiable_role))

app/lib/services/dashboard_queries.rb

@@ -19,7 +19,7 @@ def users_by_hours_volunteered
     end
 
     def hours_volunteered
-      find_users_by_hours.map { |_key, value| value }.sum
+      find_users_by_hours.sum { |_key, value| value }
     end
 
     def users_by_needs_created

app/lib/services/notifications/shifts/recipients/update.rb

@@ -13,9 +13,7 @@ class Update
                    to: :shift
 
           def recipients
-            if shift_user_is_current_user? || current_user_left_shift?
-              return notifiable_office_users_and_need_user
-            end
+            return notifiable_office_users_and_need_user if shift_user_is_current_user? || current_user_left_shift?
             return notifiable_office_users_and_need_user | [user] if scheduler_with_user?
             return notifiable_office_users_and_need_user | [user_was] if scheduler_without_user?
 

app/models/address.rb

@@ -32,7 +32,7 @@ def validate_and_geocode?
   end
 
   def validate_and_geocode
-    address = ADDRESS_FIELDS.map { |v| send(v).presence }.compact.join(', ')
+    address = ADDRESS_FIELDS.filter_map { |v| send(v).presence }.join(', ')
     return if address.blank?
 
     verifier = MainStreet::AddressVerifier.new(address)

app/models/announcement.rb

@@ -3,8 +3,7 @@
 class Announcement < ApplicationRecord
   belongs_to :author, class_name: 'User'
 
-  validates :author,
-            :user_ids,
+  validates :user_ids,
             presence: true
 
   validates :message,

app/models/child.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Child < ApplicationRecord
   belongs_to :need
   enum sex: { male: 0, female: 1, non_binary: 2 }

app/models/need.rb

@@ -22,8 +22,6 @@ class Need < ApplicationRecord
 
   validates :start_at,
             :expected_duration,
-            :office,
-            :user,
             presence: true
   validates :expected_duration,
             numericality: { greater_than_or_equal_to: 60,

app/models/shift.rb

@@ -31,7 +31,7 @@ def self.for_survey_notification
                 .group(:user_id, :need_id)
 
     # Get whole records based on subquery above
-    join_sql = <<~SQL
+    join_sql = <<~SQL.squish
       INNER JOIN (#{subquery.to_sql}) sub ON (
         sub.user_id = shifts.user_id
         AND sub.need_id = shifts.need_id
@@ -44,7 +44,7 @@ def self.for_survey_notification
     joins(join_sql)
       .where('start_at + make_interval(mins := duration) < ?', 30.minutes.ago)
       .joins('LEFT JOIN shift_surveys on (shift_surveys.need_id = shifts.need_id AND shift_surveys.user_id = shifts.user_id)')
-      .where('shift_surveys.id IS NULL')
+      .where(shift_surveys: { id: nil })
   end
 
   def duration_in_words

app/models/shift_survey.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ShiftSurvey < ApplicationRecord
   extend DateRangeFilterHelper
 

app/models/user.rb

@@ -197,15 +197,15 @@ def role_display
 
   # standard E.164 format used by Twilio
   def e164_phone
-    '+1' + phone.gsub(/\D/, '')
+    "+1#{phone.gsub(/\D/, '')}"
   end
 
   def office_notification_ids
     office_users.notifiable.pluck(:office_id)
   end
 
   def office_notification_ids=(ids)
-    ids = ids.reject(&:blank?).map(&:to_i)
+    ids = ids.compact_blank.map(&:to_i)
     office_users.each do |ou|
       ou.update!(send_notifications: ou.office_id.in?(ids))
     end

app/policies/shift_survey_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ShiftSurveyPolicy < ApplicationPolicy
   def permitted_attributes
     [

app/workers/remind_worker.rb

@@ -17,15 +17,15 @@ def send_daily_messages
     needs = Need.joins(:shifts)
       .where('shifts.start_at > ?', 12.hours.from_now)
       .where('needs.created_at < ?', 12.hours.ago)
-      .where('shifts.user_id IS NULL').distinct
+      .where(shifts: { user_id: nil }).distinct
     send_messages(needs)
   end
 
   def send_hourly_messages
     needs = Need.joins(:shifts)
       .where('shifts.created_at BETWEEN ? AND ?', 12.hours.ago, 1.hour.ago)
       .where('shifts.start_at BETWEEN ? AND ?', Time.zone.now, 12.hours.from_now)
-      .where('shifts.user_id IS NULL').distinct
+      .where(shifts: { user_id: nil }).distinct
     send_messages(needs)
   end