Merge pull request #855 from greenriver/release-64

Release 64

Gemfile.lock

@@ -547,7 +547,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.4)
+    rexml (3.3.6)
       strscan
     roo (2.10.1)
       nokogiri (~> 1)

app/controllers/opportunity_matches_controller.rb

@@ -105,29 +105,6 @@ def prioritized_column_values(client)
   end
   helper_method :prioritized_column_values
 
-  def priority_labels
-    supporting_data_columns = @opportunity.match_route.match_prioritization.supporting_data_columns
-    return supporting_data_columns.keys if supporting_data_columns.present?
-
-    [@opportunity.match_route.match_prioritization.title]
-  end
-  helper_method :priority_labels
-
-  def priority_values(client)
-    supporting_data_columns = @opportunity.match_route.match_prioritization.supporting_data_columns
-    return supporting_data_columns.values.map { |fn| fn.call(client) } if supporting_data_columns.present?
-
-    fn = @opportunity.match_route.match_prioritization.client_prioritization_summary_method
-    value = if client.class.column_names.include?(fn.to_s)
-      client.send(fn)
-    else
-      client.send(fn, match_route: @opportunity.match_route)
-    end
-
-    [value]
-  end
-  helper_method :priority_values
-
   def match_routes(client)
     counts = client.client_opportunity_matches.active.open.
       joins(:program, :match_route).

app/controllers/sub_programs_controller.rb

@@ -86,6 +86,7 @@ def sub_program_params
         :eligibility_requirement_notes,
         :weighting_rules_active,
         :cori_hearing_required,
+        :match_prioritization_id,
       )
   end
 

app/models/client.rb

@@ -255,8 +255,8 @@ def default_client_contacts
     @default_client_contacts ||= ClientContacts.new client: self
   end
 
-  def self.prioritized(match_route, scope)
-    match_route.match_prioritization.prioritization_for_clients(scope)
+  def self.prioritized(prioritization_scheme, scope)
+    prioritization_scheme.prioritization_for_clients(scope)
   end
 
   # A random number for prioritization that require a tie-breaker
@@ -380,6 +380,17 @@ def remote_data_source
     @remote_data_source ||= project_client&.data_source || false
   end
 
+  def required_number_of_bedrooms_or_sro_ok
+    text = required_number_of_bedrooms.to_s
+    text += ' (SRO OK)' if sro_ok
+
+    text
+  end
+
+  def assessment_type_description
+    NonHmisAssessment.declassify_title(NonHmisAssessment.title_from_type_for_matching(assessment_name))
+  end
+
   def remote_client_visible_to?(user)
     return true unless project_client.is_deidentified? || project_client.is_identified?
     return true if NonHmisClient.visible_to(user).where(id: remote_id).exists?
@@ -1230,6 +1241,16 @@ def self.prioritized_columns_data
         description: nil,
         type: 'Jsonb',
       },
+      required_number_of_bedrooms_or_sro_ok: {
+        title: 'Minimum Bedrooms',
+        description: nil,
+        type: 'String',
+      },
+      assessment_type_description: {
+        title: 'Assessment Type',
+        description: nil,
+        type: 'String',
+      },
     }
   end
 

app/models/client_opportunity_match.rb

@@ -457,16 +457,37 @@ def current_decision
   end
 
   def unsuccessful_decision
-    initialized_decisions.where.not(decline_reason_id: nil)&.first ||
-      initialized_decisions.where.not(administrative_cancel_reason_id: nil)&.first
+    return canceled_decision if canceled?
+
+    declined_decision
+  end
+
+  def unsuccessful_reason
+    return unsuccessful_decision&.administrative_cancel_reason if canceled?
+
+    unsuccessful_decision&.decline_reason
   end
 
+  # Find the latest decision in the route that was declined with a reason
+  # If that doesn't exist, pull the latest initialized decision that was declined
   def declined_decision
-    @declined_decision ||= initialized_decisions.where.not(decline_reason_id: nil)&.first
-    @declined_decision ||= initialized_decisions.where(status: :declined)&.last
+    decision_order = match_route.class.match_steps_for_reporting.keys
+    @declined_decision ||= initialized_decisions.order_as_specified(type: decision_order).where.not(decline_reason_id: nil)&.last
+    @declined_decision ||= initialized_decisions.order_as_specified(type: decision_order).where(status: :declined)&.last
     @declined_decision
   end
 
+  # Find the latest decision in the route that was canceled with a reason
+  # If that doesn't exist, pull the latest initialized decision that was canceled
+  def canceled_decision
+    return nil unless canceled?
+
+    decision_order = match_route.class.match_steps_for_reporting.keys
+    @canceled_decision ||= initialized_decisions.order_as_specified(type: decision_order).where.not(administrative_cancel_reason_id: nil)&.last
+    @canceled_decision ||= initialized_decisions.order_as_specified(type: decision_order).where(status: :canceled)&.last
+    @canceled_decision
+  end
+
   def clear_current_decision_cache!
     @current_decision = nil
   end
@@ -1021,8 +1042,8 @@ def associated_file_tags
     tags.to_h
   end
 
-  def self.prioritized_by_client(match_route, scope)
-    match_route.match_prioritization.prioritization_for_clients(scope)
+  def self.prioritized_by_client(opportunity, scope)
+    opportunity.active_prioritization_scheme.prioritization_for_clients(scope, opportunity: opportunity)
   end
 
   def self.sort_options

app/models/concerns/reporting/filter_scopes.rb

@@ -23,6 +23,12 @@ module Reporting::FilterScopes
       scope.program_type(@filter.program_types)
     end
 
+    private def filter_for_programs(scope)
+      return scope if @filter.programs.blank?
+
+      scope.program(@filter.programs)
+    end
+
     private def filter_for_agencies(scope)
       return scope if @filter.agencies.blank?
 

app/models/concerns/tc_hat_calculations.rb

@@ -46,8 +46,14 @@ def required_number_of_bedrooms
       # when 1, 2 # unnecessary, these would result in 1 bedroom
       when 3, 4
         2
-      when (5..)
+      when 5, 6
         3
+      when 7, 8
+        4
+      when 9, 10
+        5
+      when (11..)
+        6
       else
         num
       end

app/models/match_census.rb

@@ -24,7 +24,7 @@ def self.populate_from_opportunity! opp
       # Clear any existing data for this opportunity on this day, and rebuild
       where(opportunity_id: opp.id, date: Date.current).delete_all
       clients_for_route = Client.available_for_matching(opp.match_route)
-      match_prioritization = opp.match_route.match_prioritization
+      match_prioritization = opp.active_prioritization_scheme
       # IDs of prioritized clients who match this opportunity, prioritized by route configuration
       available_client_ids = opp.matching_clients(clients_for_route).map do |client|
         {

app/models/match_decisions/approve_match_housing_subsidy_admin.rb

@@ -63,10 +63,6 @@ def statuses
       }
     end
 
-    def editable?
-      super && saved_status !~ /accepted|declined/
-    end
-
     def stallable?
       true
     end

app/models/match_decisions/base.rb

@@ -86,7 +86,7 @@ def contact_name
     def editable?
       # can this decision be updated by a notification response?
       # override this default behavior in subclasses
-      initialized? && match_open?
+      initialized? && match_open? && saved_status !~ /\A(accepted|confirmed|declined|canceled|rejected|complete|completed|scheduled|no_hearing|mitigation_required|mitigation_not_required|decline_overridden|decline_overridden_returned|decline_confirmed)\z/
     end
 
     def expires?
@@ -101,6 +101,10 @@ def stallable?
       false
     end
 
+    def skipped?
+      false
+    end
+
     def show_address_field?
       match_route.show_address_field
     end

app/models/match_decisions/confirm_housing_subsidy_admin_decline_dnd_staff.rb

@@ -42,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'

app/models/match_decisions/confirm_match_success_dnd_staff.rb

@@ -44,10 +44,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && status !~ /confirmed|rejected/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'

app/models/match_decisions/confirm_shelter_agency_decline_dnd_staff.rb

@@ -6,7 +6,6 @@
 
 module MatchDecisions
   class ConfirmShelterAgencyDeclineDndStaff < Base
-
     def statuses
       {
         pending: 'Pending',
@@ -43,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def permitted_params
       super + [:prevent_matching_until]
     end
@@ -97,7 +92,5 @@ def canceled
       end
     end
     private_constant :StatusCallbacks
-
   end
-
 end

app/models/match_decisions/confirm_shelter_decline_of_hearing.rb

@@ -42,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def permitted_params
       super + [:prevent_matching_until]
     end

app/models/match_decisions/confirm_shelter_decline_of_housed.rb

@@ -42,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def permitted_params
       super + [:prevent_matching_until]
     end

app/models/match_decisions/confirm_shelter_decline_of_hsa_approval.rb

@@ -42,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def permitted_params
       super + [:prevent_matching_until]
     end

app/models/match_decisions/eight/eight_assign_manager.rb

@@ -96,10 +96,6 @@ def started?
       status&.to_sym == :completed
     end
 
-    def editable?
-      super && saved_status !~ /completed|declined/
-    end
-
     def accessible_by? contact
       contact.user_can_act_on_behalf_of_match_contacts? ||
         contact.in?(match.send(contact_actor_type))

app/models/match_decisions/eight/eight_confirm_lease_up_decline.rb

@@ -80,10 +80,6 @@ def canceled
     end
     private_constant :StatusCallbacks
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def step_decline_reasons(_contact)
       [
         'Immigration status',

app/models/match_decisions/eight/eight_confirm_match_success.rb

@@ -44,10 +44,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && status !~ /confirmed|rejected/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'

app/models/match_decisions/eight/eight_confirm_voucher_decline.rb

@@ -42,10 +42,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'

app/models/match_decisions/eight/eight_lease_up.rb

@@ -97,10 +97,6 @@ def started?
       status&.to_sym == :completed
     end
 
-    def editable?
-      super && saved_status !~ /completed|declined/
-    end
-
     def accessible_by? contact
       contact.user_can_act_on_behalf_of_match_contacts? ||
         contact.in?(match.send(contact_actor_type))

app/models/match_decisions/eight/eight_match_recommendation.rb

@@ -49,10 +49,6 @@ def statuses
       }
     end
 
-    def editable?
-      super && saved_status !~ /accepted|declined/
-    end
-
     def permitted_params
       super + [:prevent_matching_until, :shelter_expiration]
     end

app/models/match_decisions/eight/eight_record_voucher_date.rb

@@ -55,10 +55,6 @@ def statuses
       }
     end
 
-    def editable?
-      super && saved_status !~ /accepted|declined/
-    end
-
     def stallable?
       true
     end

app/models/match_decisions/eleven/eleven_confirm_hsa_accepts_client_decline_dnd_staff.rb

@@ -50,10 +50,6 @@ def contact_actor_type
       nil
     end
 
-    def editable?
-      super && saved_status !~ /decline_overridden|decline_overridden_returned|decline_confirmed/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'

app/models/match_decisions/eleven/eleven_hsa_accepts_client.rb

@@ -70,10 +70,6 @@ def expires?
       true
     end
 
-    def editable?
-      super && saved_status !~ /accepted|declined/
-    end
-
     def initialize_decision! send_notifications: true
       super(send_notifications: send_notifications)
       update status: 'pending'