It only sends the trial user exceeded email once

Author: re5et

app/models/organization.rb

@@ -284,9 +284,12 @@ def update_subscription
   end
 
   def maybe_notify_trial_users_count_exceeded
-    pp within_trial_period?
-    return unless within_trial_period? && trial_users_exceeded? && in_app_billing
+    return unless !trail_users_count_exceeded_email_sent? &&
+                  within_trial_period? &&
+                  trial_users_exceeded? &&
+                  in_app_billing
 
     TrialUsersCountExceededMailer.notify(self)
+    update_attributes(trail_users_count_exceeded_email_sent: true)
   end
 end

db/migrate/20181023184040_add_trail_users_count_exceeded_email_sent_to_organization.rb

@@ -0,0 +1,5 @@
+class AddTrailUsersCountExceededEmailSentToOrganization < ActiveRecord::Migration[5.1]
+  def change
+    add_column :organizations, :trail_users_count_exceeded_email_sent, :boolean, default: false, null: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20181016214104) do
+ActiveRecord::Schema.define(version: 20181023184040) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -220,6 +220,7 @@
     t.datetime "trial_ends_at"
     t.integer "trial_users_count", default: 0, null: false
     t.boolean "in_app_billing", default: true, null: false
+    t.boolean "trail_users_count_exceeded_email_sent", default: false, null: false
     t.index ["slug"], name: "index_organizations_on_slug", unique: true
   end
 

docker-compose.yml

@@ -0,0 +1,6 @@
+version: '2.3'
+services:
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.4.0
+    ports:
+      - "9200:9200"

spec/models/organization_spec.rb

@@ -195,10 +195,23 @@
         allow(TrialUsersCountExceededMailer).to receive(:notify)
       end
 
+      context 'already sent' do
+        it 'does nothing' do
+          organization = create(:organization,
+                                in_app_billing: true,
+                                trial_users_count: 10,
+                                active_users_count: 10,
+                                trail_users_count_exceeded_email_sent: true)
+          expect(TrialUsersCountExceededMailer).not_to receive(:notify)
+          organization.update_attributes(
+            active_users_count: 11,
+          )
+        end
+      end
+
       context 'not within trial period' do
         it 'does nothing' do
-          organization = create(:organization, in_app_billing: true, trial_users_count: 10, active_users_count: 5, trial_ends_at: 1.day.ago)
-          organization.in_app_billing = true
+          organization = create(:organization, in_app_billing: true, trial_users_count: 10, active_users_count: 10, trial_ends_at: 1.day.ago)
           expect(TrialUsersCountExceededMailer).not_to receive(:notify)
           organization.update_attributes(
             active_users_count: 11,
@@ -229,11 +242,20 @@
 
       context 'active users count greater than trial user count and in app billing enabled' do
         it 'uses the TrialUsersCountExceededMailer' do
-          organization = create(:organization, in_app_billing: true, trial_users_count: 5, active_users_count: 5, trial_ends_at: 1.day.from_now)
-          expect(TrialUsersCountExceededMailer).to receive(:notify)
+          organization = create(:organization,
+                                in_app_billing: true,
+                                trial_users_count: 5,
+                                active_users_count: 5,
+                                trial_ends_at: 1.day.from_now,
+                                trail_users_count_exceeded_email_sent: false)
+          expect(TrialUsersCountExceededMailer).to receive(:notify).once
           organization.update_attributes(
             active_users_count: 6,
           )
+          organization.update_attributes(
+            active_users_count: 7,
+          )
+          expect(organization.trail_users_count_exceeded_email_sent).to be true
         end
       end
     end