app/services/change_manager/manager.rb in change_manager-0.3.2 vs app/services/change_manager/manager.rb in change_manager-0.4.0

@@ -1,58 +1,47 @@
 module ChangeManager
 	module Manager
 		def queue_change(owner, change_type, context, target)
 			change_id = Change.new_change(owner, change_type, context, target)
-			Resque.enqueue_in(7.minutes, ChangeManager::BeginChange, change_id)
+			Resque.enqueue_in(15.minutes, ChangeManager::BeginChange, change_id)
 		end
 
 		def process_change(change_id)
-			unless Change.find(change_id).cancelled?
-				change = Change.find change_id
-				verified_changes = process_changes change
-				notify verified_changes unless verified_changes.empty?
+			change = Change.find change_id
+			unless change.cancelled?
+				verified_changes = process_changes_similar_to change
+				notify_target_of verified_changes unless verified_changes.empty?
+				true
 			end
 		end
 
-		def process_changes(change)
-			cancel_all_changes(group_similar_changes(change.owner, change.target))
+		def process_changes_similar_to(change)
+			similar_changes = group_similar_changes(change.owner, change.target)
+			cancel_inverse_changes_in similar_changes if similar_changes.length > 1
+			similar_changes
 		end
 
 		def group_similar_changes(owner, target)
-			similar_changes = Change.where(owner: owner, target: target, cancelled: false)
-			if similar_changes.length > 1
-				cancel_inverse_changes(similar_changes)
-			end
-			return similar_changes
+			similar_changes = Change.where(owner: owner, target: target, cancelled: false, notified: nil)
 		end
 
-		def cancel_inverse_changes(similar_changes)
+		def cancel_inverse_changes_in(similar_changes)
 			similar_changes.each do |change|
 				similar_changes.each do |next_change|
 					if change.inverse_of?(next_change)
 						change.cancel
 						next_change.cancel
-						puts 'cancelled inverse changes ' + change.change_type + ' and ' + next_change.change_type
 						similar_changes.delete_if { |change| change.cancelled? }
 					end
 				end
 			end
-			return similar_changes
+			similar_changes
 		end
 
-		def cancel_all_changes(verified_changes)
-			verified_changes.each do |change|
-				change.cancel
-			end
-			verified_changes
-		end
-
-		def notify(changes)
+		def notify_target_of(changes)
 			mailer = ChangeManager::NotificationMailer
 			if mailer.send_email(mailer.construct_email(changes))
-				changes.each do |change|
-					change.notify
-				end
+				changes.each { |change| change.notify }
 				return true
 			end
 			false
 		end
 	end