fix(goal notifications) fix goal notifications

app.json

@@ -5,15 +5,11 @@
     {
       "command": "rake top_up_accounts",
       "schedule": "0 14 * * 5"
-    },
-    {
-      "command": "rake check_objectives",
-      "schedule": "0 9-21/2 * * *"
     }
   ],
   "scripts": {
     "dokku": {
-       "postdeploy": "rake db:migrate"
-     }
+      "postdeploy": "rake db:migrate"
+    }
   }
 }

app/actions/automatic_topup_action.rb

@@ -16,5 +16,6 @@ def perform_implementation
     )
 
     TransactionsMailer.automatic_top_up_done(transaction).deliver_now
+    ObjectiveNotificationService.new(to).perform
   end
 end

app/controllers/topups_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TopupsController < ApplicationController
   def create
     Transaction.create!(
@@ -9,6 +11,7 @@ def create
       access_token: Devise.friendly_token
     )
     SendNotification.call(account)
+    ObjectiveNotificationService.new(account).perform
 
     redirect_to request.referrer
   end

app/models/objective.rb

@@ -9,6 +9,7 @@ class Objective < ApplicationRecord
   scope :not_archived, -> { joins(:account).where(account: { archived_at: nil }) }
   scope :accomplished, -> { where.not(accomplished_at: nil) }
   scope :not_accomplished, -> { where(accomplished_at: nil) }
+  scope :for, ->(account) { where(account: account) }
 
   def weeks_to_achieve
     return -1 if account.balance >= amount

app/services/objective_notification_service.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 class ObjectiveNotificationService
+  def initialize(account)
+    @account = account
+  end
+
   def perform
-    Objective.not_archived.each do |objective|
+    Objective.not_archived.not_accomplished.for(@account).each do |objective|
       send_almost_achieved_notification(objective)
       send_achieved_notification(objective)
     end
@@ -13,19 +17,19 @@ def perform
   def send_almost_achieved_notification(objective)
     return if !goal_almost_achieved?(objective) || objective.goal_almost_achieved_notified_at
 
-    ObjectivesMailer.goal_almost_achieved(objective, recipients(objective)).deliver
+    ObjectivesMailer.goal_almost_achieved(objective, recipients).deliver
     objective.update!(goal_almost_achieved_notified_at: Time.current)
   end
 
   def send_achieved_notification(objective)
     return if !goal_achieved?(objective) || objective.goal_achieved_notified_at
 
-    ObjectivesMailer.goal_achieved(objective, recipients(objective)).deliver
+    ObjectivesMailer.goal_achieved(objective, recipients).deliver
     objective.update!(goal_achieved_notified_at: Time.current)
   end
 
-  def recipients(objective)
-    [*objective.account.account_shares.accepted.pluck(:email), objective.account.parent.user.email]
+  def recipients
+    [*@account.account_shares.accepted.pluck(:email), @account.parent.user.email]
   end
 
   def goal_almost_achieved?(objective)

lib/tasks/scheduler.rake

@@ -2,8 +2,3 @@ desc 'Top up accounts automatically'
 task top_up_accounts: :environment do
   AutomaticTopupsService.new.perform if Date.current.friday?
 end
-
-desc 'Check and send notifications for achieved objectives'
-task check_objectives: :environment do
-  ObjectiveNotificationService.new.perform
-end

spec/services/objective_notification_service_spec.rb

@@ -13,7 +13,7 @@
   let(:params) { { from_account: parent, to_account: account, amount: 10 } }
   let(:amount) { 10 }
 
-  subject(:service) { described_class.new.perform }
+  subject(:service) { described_class.new(account).perform }
 
   describe '#perform' do
     context 'when goal is achieved' do