Avoid sending to enrolled people

app/models/mailshot.rb

@@ -69,6 +69,7 @@ def audience_for_bc_viewed(_)
         where('user_data.seniority': %i[absolute_beginner beginner]).
         includes(user: :bootcamp_data),
       lambda do |bootcamp_data|
+        return if bootcamp_data.enrolled? # Totally redundant, but still
         return if bootcamp_data.paid? # Totally redundant, but still
 
         bootcamp_data.user
@@ -92,7 +93,7 @@ def audience_for_bc_beginners(_)
       User::Data.where(seniority: %i[absolute_beginner beginner]).includes(user: :bootcamp_data),
       lambda do |user_data|
         user = user_data.user
-        return if user.bootcamp_data&.paid?
+        return if user.bootcamp_data&.enrolled?
 
         user
       end
@@ -104,7 +105,7 @@ def audience_for_bc_juniors(_)
       User::Data.where(seniority: :junior).includes(user: :bootcamp_data),
       lambda do |user_data|
         user = user_data.user
-        return if user.bootcamp_data&.paid?
+        return if user.bootcamp_data&.enrolled?
 
         user
       end
@@ -116,7 +117,7 @@ def audience_for_bc_mid_seniors(_)
       User::Data.where(seniority: %i[mid senior]).includes(user: :bootcamp_data),
       lambda do |user_data|
         user = user_data.user
-        return if user.bootcamp_data&.paid?
+        return if user.bootcamp_data&.enrolled?
 
         user
       end
@@ -130,7 +131,7 @@ def audience_for_bc_unspecified_recent_90(_)
       lambda do |user_data|
         user = user_data.user
         return if user.seniority.present?
-        return if user.bootcamp_data&.paid?
+        return if user.bootcamp_data&.enrolled?
 
         user
       end
@@ -144,7 +145,7 @@ def audience_for_bc_unspecified(batch)
       User.where(id: (start_id..end_id)).includes(:data, :bootcamp_data),
       lambda do |user|
         return if user.seniority.present?
-        return if user.bootcamp_data&.paid?
+        return if user.bootcamp_data&.enrolled?
 
         user
       end

test/commands/mailshot/send_to_audience_segment_test.rb

@@ -213,8 +213,6 @@ class Mailshot::SendToAudienceSegmentTest < ActiveSupport::TestCase
     User::Mailshot::Send.expects(:call).with(absolute_beginner_viewed, mailshot)
     User::Mailshot::Send.expects(:call).with(beginner, mailshot)
     User::Mailshot::Send.expects(:call).with(beginner_viewed, mailshot)
-    User::Mailshot::Send.expects(:call).with(absolute_beginner_enrolled, mailshot)
-    User::Mailshot::Send.expects(:call).with(beginner_enrolled, mailshot)
 
     Mailshot::SendToAudienceSegment.(mailshot, :bc_beginners, nil, 20, 0)