Merge branch 'release-62' into ea/ce-decline-cancel-tagging

app/models/concerns/client_opportunity_matches/has_decisions.rb

@@ -36,6 +36,17 @@ module HasDecisions
                inverse_of: :match,
                dependent: :destroy
 
+      has_one :initial_decision, -> do
+        initial_decisions = one_for_column(
+          order_clause: MatchDecisions::Base.arel_table[:id].asc,
+          source_arel_table: MatchDecisions::Base.arel_table,
+          group_on: :match_id,
+          scope: MatchDecisions::Base.initialized_decisions,
+        )
+        where(id: initial_decisions)
+      end, class_name: 'MatchDecisions::Base',
+           foreign_key: 'match_id'
+
       # macro to set up a decision within a match
       def self.has_decision(decision_type, decision_class_name: nil, notification_class_name: nil) # rubocop:disable Naming/PredicateName
         decision_class_name ||= "MatchDecisions::#{decision_type.to_s.camelize}"

app/models/match_decisions/base.rb

@@ -42,6 +42,9 @@ class Base < ApplicationRecord
     attr_accessor :shelter_expiration
 
     scope :pending, -> { where(status: [:pending, :other_clients_canceled]) }
+    scope :initialized_decisions, -> do
+      where.not(status: nil)
+    end
     scope :awaiting_action, -> do
       where(status: [:pending, :other_clients_canceled, :acknowledged])
     end

app/models/opportunity.rb

@@ -52,10 +52,11 @@ class Opportunity < ApplicationRecord
   end
 
   scope :available_for_poaching, -> do
-    available_candidate_ids = Opportunity.available_candidate.pluck(:id)
-    unstarted_ids = Opportunity.joins(active_matches: :match_recommendation_dnd_staff_decision).
+    available_candidate_ids = current_scope.available_candidate.pluck(:id)
+    # Join any unstarted matches
+    unstarted_ids = current_scope.joins(active_matches: :initial_decision).
       merge(MatchDecisions::Base.pending).pluck(:id)
-    Opportunity.where(id: available_candidate_ids + unstarted_ids)
+    where(id: available_candidate_ids + unstarted_ids)
   end
   # after_save :run_match_engine_if_newly_available