KAZOO-2387: Fix activate feature/phone number using right bookkeeper

core/whistle_number_manager-1.0.0/include/wh_number_manager.hrl

@@ -15,6 +15,8 @@
                  ,module_name :: atom()
                  ,module_data = wh_json:new() :: wh_json:object()
                  ,features = sets:new() :: set()
+                 ,feature_activation_charges = 0 :: number()
+                 ,phone_number_activation_charges = 0 :: number()
                  ,current_features = sets:new() :: set()
                  ,number_doc = wh_json:new() :: wh_json:object()
                  ,current_number_doc = wh_json:new() :: wh_json:object()

core/whistle_number_manager-1.0.0/src/wnm_number.erl

@@ -1160,21 +1160,22 @@ activate_feature(Feature, #number{services=Services}=N) ->
 activate_feature(Feature, 0, #number{features=Features}=N) ->
     lager:debug("no activation charge for ~s", [Feature]),
     N#number{features=sets:add_element(Feature, Features)};
-activate_feature(Feature, Units, #number{current_balance='undefined'
-                                         ,billing_id=Account
-                                        }=N) ->
-    activate_feature(Feature, Units, N#number{current_balance=wht_util:current_balance(Account)});
-activate_feature(Feature, Units, #number{current_balance=Balance}=N) when Balance - Units < 0 ->
-    Reason = io_lib:format("not enough credit to activate feature '~s' for $~p", [Feature, wht_util:units_to_dollars(Units)]),
-    lager:debug("failed to activate: ~s", [Reason]),
-    error_service_restriction(Reason, N);
-activate_feature(Feature, Units, #number{current_balance=Balance
+activate_feature(Feature, Units, #number{feature_activation_charges=Charges
+                                         ,billing_id=BillingId
                                          ,features=Features
                                         }=N) ->
-    N#number{activations=append_feature_debit(Feature, Units, N)
-             ,features=sets:add_element(Feature, Features)
-             ,current_balance=Balance - Units
-            }.
+    Charge = Charges + Units,
+    case wh_services:check_bookkeeper(BillingId, Charge) of
+        'false' ->
+            Reason = io_lib:format("not enough credit to activate feature '~s' for $~p", [Feature, wht_util:units_to_dollars(Units)]),
+            lager:debug("failed to activate: ~s", [Reason]),
+            error_service_restriction(Reason, N);
+        'true' ->
+            N#number{activations=append_feature_debit(Feature, Units, N)
+                     ,features=sets:add_element(Feature, Features)
+                     ,feature_activation_charges=Charge
+                    }
+    end.
 
 %%--------------------------------------------------------------------
 %% @private
@@ -1195,16 +1196,19 @@ activate_phone_number(#number{services=Services, number=Number}=N) ->
 activate_phone_number(0, #number{number=Number}=N) ->
     lager:debug("no activation charge for ~s", [Number]),
     N;
-activate_phone_number(Units, #number{current_balance='undefined', billing_id=Account}=N) ->
-    activate_phone_number(Units, N#number{current_balance=wht_util:current_balance(Account)});
-activate_phone_number(Units, #number{current_balance=Balance}=N) when Balance - Units < 0 ->
-    Reason = io_lib:format("not enough credit to activate number for $~p", [wht_util:units_to_dollars(Units)]),
-    lager:debug("~s", [Reason]),
-    error_service_restriction(Reason, N);
-activate_phone_number(Units, #number{current_balance=Balance}=N) ->
-    N#number{activations=append_phone_number_debit(Units, N)
-             ,current_balance=Balance - Units
-            }.
+activate_phone_number(Units, #number{phone_number_activation_charges=Charges
+                                     ,billing_id=BillingId}=N) ->
+    Charge = Charges + Units,
+    case wh_services:check_bookkeeper(BillingId, Charge) of
+        'false' ->
+            Reason = io_lib:format("not enough credit to activate number for $~p", [wht_util:units_to_dollars(Units)]),
+            lager:debug("~s", [Reason]),
+            error_service_restriction(Reason, N);
+        'true' ->
+            N#number{activations=append_phone_number_debit(Units, N)
+                     ,phone_number_activation_charges=Charge
+            }
+    end.
 
 %%--------------------------------------------------------------------
 %% @private

core/whistle_services-1.0.0/src/wh_services.erl

@@ -24,6 +24,7 @@
 -export([activation_charges/3]).
 -export([commit_transactions/2]).
 -export([select_bookkeeper/1]).
+-export([check_bookkeeper/2]).
 -export([set_billing_id/2]).
 -export([get_billing_id/1]).
 -export([find_reseller_id/1]).
@@ -358,6 +359,22 @@ select_bookkeeper(BillingId) ->
             whapps_config:get_atom(?WHS_CONFIG_CAT, <<"master_account_bookkeeper">>, 'wh_bookkeeper_local')
     end.
 
+%%--------------------------------------------------------------------
+%% @public
+%% @doc
+%%
+%% @end
+%%--------------------------------------------------------------------
+-spec check_bookkeeper(ne_binary(), integer()) -> boolean().
+check_bookkeeper(BillingId, Amount) ->
+    Bookkeeper = select_bookkeeper(BillingId),
+    case Bookkeeper of
+        'wh_bookkeeper_braintree' -> 'true';
+        'wh_bookkeeper_local' ->
+            Balance = wht_util:current_balance(BillingId),
+            Balance - Amount =< 0
+    end.
+
 %%--------------------------------------------------------------------
 %% @public
 %% @doc