From f1fa1b28ca70521ebc30f8b2ec6e3ba9f2e8af08 Mon Sep 17 00:00:00 2001
From: Jean-Roch Maitre <jr@2600hz.com>
Date: Wed, 20 Jul 2016 09:02:48 -0700
Subject: [PATCH] UI-2302: Cleaned up code in incoming call handling for user
 callflow selection

---
 submodules/strategy/strategy.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index 793a261..b6ed201 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -3129,13 +3129,15 @@ define(function(require){
 							resource: 'callflow.list',
 							data: {
 								accountId: self.accountId,
-								filters: { 'has_key':'owner_id' }
+								filters: { 
+									has_key:'owner_id',
+									filter_type: 'mainUserCallflow',
+									paginate: 'false'
+								}
 							},
 							success: function(data, status) {
-								var userCallflows = _.filter(data.data, function(callflow) { 
-									return (callflow.type === 'mainUserCallflow' || !('type' in callflow)); 
-								});
-								_callback(null, userCallflows);
+								var mapCallflowsByOwnerId = _.indexBy(data.data, 'owner_id');
+								_callback(null, mapCallflowsByOwnerId);
 							}
 						});
 					},
@@ -3230,11 +3232,11 @@ define(function(require){
 					});
 
 					_.each(results.users, function(user) {
-						var userCallflow = _.find(results.userCallflows, function(callflow) { return callflow.owner_id === user.id });
-						if(userCallflow) {
-							user.id = userCallflow.id;
+						if(results.userCallflows.hasOwnProperty(user.id)) {
+							user.id = results.userCallflows[user.id].id;
 							user.module = 'callflow';
-						} else {
+						}
+						else {
 							user.module = 'user';
 						}
 						callEntities.userCallflows.push(user);