Bugs/aperta 12001 cancel passive events on rr submit

app/controllers/scheduled_events_controller.rb

@@ -2,7 +2,7 @@ class ScheduledEventsController < ApplicationController
   before_action :authenticate_user!
   respond_to :json
 
-  def update_state
+  def update
     scheduled_event = ScheduledEvent.find(params[:id])
     scheduled_event.switch_on! if params[:state] == 'active'
     scheduled_event.switch_off! if params[:state] == 'passive'

app/models/reviewer_report.rb

@@ -170,6 +170,6 @@ def thank_reviewer
   end
 
   def cancel_reminders
-    scheduled_events.active.map(&:cancel!)
+    scheduled_events.cancelable.each(&:cancel!)
   end
 end

app/models/scheduled_event.rb

@@ -14,6 +14,7 @@ class ScheduledEvent < ActiveRecord::Base
   scope :passive, -> { where(state: 'passive') }
   scope :due_to_trigger, -> { active.where('dispatch_at < ?', DateTime.now.in_time_zone) }
   scope :serviceable, -> { where(state: ['passive', 'active', 'completed', 'inactive']) }
+  scope :cancelable, -> { where(state: ['passive', 'active']) }
 
   before_save :deactivate, if: :should_deactivate?
   before_save :reactivate, if: :should_reactivate?
@@ -68,7 +69,7 @@ def finished?
     end
 
     event(:cancel) do
-      transitions from: :active, to: :canceled
+      transitions from: [:active, :passive], to: :canceled
     end
   end
 

client/app/models/scheduled-event.js

@@ -12,15 +12,5 @@ export default DS.Model.extend({
   errored: Ember.computed.equal('state', 'errored'),
   inactive: Ember.computed.equal('state', 'inactive'),
   active: Ember.computed.equal('state', 'active'),
-  canceled: Ember.computed.equal('state', 'canceled'),
-
-  restless: Ember.inject.service(),
-
-  updateState: function(newState) {
-    const url = `/api/scheduled_events/${this.get('id')}/update_state`;
-    return this.get('restless').put(url, {state: newState}).then(() => {
-      this.set('state', newState);
-    });
-  }
-
+  canceled: Ember.computed.equal('state', 'canceled')
 });

client/app/pods/components/scheduled-event-status/component.js

@@ -8,7 +8,8 @@ export default Ember.Component.extend({
   actions: {
     changeEventState(newVal) {
       const state = newVal ? 'active' : 'passive';
-      this.get('event').updateState(state);
+      this.set('event.state', state);
+      this.get('event').save();
     }
   }
 });

config/routes.rb

@@ -259,8 +259,7 @@
 
     resources :feature_flags, only: [:index, :update]
 
-    put 'scheduled_events/:id/update_state',
-      to: 'scheduled_events#update_state'
+    resources :scheduled_events, only: [:update]
   end
 
   get '/invitations/:token/accept',

spec/controllers/scheduled_events_controller_spec.rb

@@ -3,9 +3,9 @@
 describe ScheduledEventsController do
   let(:user) { FactoryGirl.create(:user) }
 
-  describe "PUT /update_state (passive)" do
+  describe "PUT /update (passive)" do
     let(:scheduled_event_active) { FactoryGirl.create(:scheduled_event, dispatch_at: DateTime.now.utc + 2.days) }
-    subject(:do_request) { put :update_state, id: scheduled_event_active.id, state: 'passive', format: :json }
+    subject(:do_request) { put :update, id: scheduled_event_active.id, state: 'passive', format: :json }
 
     it_behaves_like 'an unauthenticated json request'
 
@@ -21,9 +21,9 @@
     end
   end
 
-  describe "PUT /update_state (active)" do
+  describe "PUT /update (active)" do
     let(:scheduled_event_passive) { FactoryGirl.create(:scheduled_event, :passive, dispatch_at: DateTime.now.utc + 2.days) }
-    subject(:do_request) { get :update_state, id: scheduled_event_passive.id, state: 'active', format: :json }
+    subject(:do_request) { get :update, id: scheduled_event_passive.id, state: 'active', format: :json }
 
     it_behaves_like 'an unauthenticated json request'
 

spec/models/reviewer_report_spec.rb

@@ -161,4 +161,25 @@ def add_invitation(state)
       expect { subject.set_due_datetime }.to change { subject.scheduled_events.count }.by(3)
     end
   end
+
+  describe '#cancel_reminders' do
+    before do
+      FactoryGirl.create(:feature_flag, name: 'REVIEW_DUE_AT')
+      FactoryGirl.create(:feature_flag, name: 'REVIEW_DUE_DATE')
+      FactoryGirl.create :review_duration_period_setting_template
+    end
+
+    it 'cancels all events with passive or active state' do
+      subject.set_due_datetime # makes 3 scheduled events with active state
+      subject.scheduled_events.first.switch_off! # passive state
+      subject.scheduled_events.last.cancel! # cancel state
+      cancelable = subject.scheduled_events.select(&:may_cancel?) # omg it compares object ids and not row id.
+      allow(subject.scheduled_events).to receive(:cancelable).and_return(cancelable)
+      subject.scheduled_events.each do |event|
+        count = event.canceled? ? 0 : 1
+        expect(event).to receive(:cancel!).exactly(count).times
+      end
+      subject.send(:cancel_reminders)
+    end
+  end
 end