KCRO-32: validation no longer uses crossbar_doc so the context db_doc…

… is not set and billing relies on that (#6625)
2600hz · Aug 28, 2020 · ef352c4 · ef352c4
1 parent 955667d
commit ef352c4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/applications/crossbar/src/modules_v1/cb_users_v1.erl b/applications/crossbar/src/modules_v1/cb_users_v1.erl
@@ -521,8 +521,14 @@ validate_request(UserId, Context) ->
     AccountId = cb_context:account_id(Context),
 
     case kzd_users:validate(AccountId, UserId, ReqJObj) of
+        {'true', UserJObj} when is_binary(UserId) ->
+            lager:debug("successfull validated user object update"),
+            %% NOTE: We need to load the current (unmodified) user document
+            %% into the cb_context KVS db_doc because billing uses that to
+            %% determine what changed and charge accordingly
+            cb_context:update_successfully_validated_request(load_user(UserId, Context), UserJObj);
         {'true', UserJObj} ->
-            lager:debug("successfull validated user object"),
+            lager:debug("successfull validated user object create"),
             cb_context:update_successfully_validated_request(Context, UserJObj);
         {'validation_errors', ValidationErrors} ->
             lager:info("validation errors on user"),

diff --git a/applications/crossbar/src/modules_v2/cb_users_v2.erl b/applications/crossbar/src/modules_v2/cb_users_v2.erl
@@ -478,8 +478,14 @@ validate_request(UserId, Context) ->
     AccountId = cb_context:account_id(Context),
 
     case kzd_users:validate(AccountId, UserId, ReqJObj) of
+        {'true', UserJObj} when is_binary(UserId) ->
+            lager:debug("successfull validated user object update"),
+            %% NOTE: We need to load the current (unmodified) user document
+            %% into the cb_context KVS db_doc because billing uses that to
+            %% determine what changed and charge accordingly
+            cb_context:update_successfully_validated_request(load_user(UserId, Context), UserJObj);
         {'true', UserJObj} ->
-            lager:debug("successfull validated user object"),
+            lager:debug("successfull validated user object create"),
             cb_context:update_successfully_validated_request(Context, UserJObj);
         {'validation_errors', ValidationErrors} ->
             lager:info("validation errors on user"),