check presence_id (2600hz#6510)

abdallahmaali · May 1, 2020 · 6117aad · 6117aad
1 parent 8599434
commit 6117aad
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/applications/ecallmgr/src/event_publish/ecallmgr_presence_event_publisher.erl b/applications/ecallmgr/src/event_publish/ecallmgr_presence_event_publisher.erl
@@ -33,6 +33,7 @@ publish_presence(#{call_id := UUID, payload := _JObj} = Ctx) ->
     kz_log:put_callid(UUID),
     Routines = [fun check_proto/1
                ,fun check_node/1
+               ,fun check_presence_id/1
                ],
     case lists:all(fun(F) -> F(Ctx) end, Routines) of
         'true' -> build_presence_event(UUID, Ctx);
@@ -60,9 +61,15 @@ check_node(#{payload := JObj}) ->
         'false' -> 'true';
         'undefined' -> 'true';
         Node -> 'true';
-        _Other -> 'false'
+        _Other ->
+            lager:debug("check node failed ~p ", [_Other]),
+            'false'
     end.
 
+-spec check_presence_id(map()) -> boolean().
+check_presence_id(#{payload := JObj}) ->
+    kz_call_event:custom_channel_var(JObj, <<"Presence-ID">>) =/= 'undefined'.
+
 -spec realm(kz_json:object()) -> kz_term:ne_binary().
 realm(JObj) ->
     kz_json:get_first_defined([?GET_CCV(<<"Realm">>)
@@ -83,7 +90,8 @@ get_user_realm(JObj) ->
 
 -spec from(kz_json:object()) -> kz_term:ne_binary().
 from(JObj) ->
-    kz_json:get_first_defined([<<"from">>
+    kz_json:get_first_defined([?GET_CCV(<<"Presence-ID">>)
+                              ,<<"from">>
                               ,<<"variable_presence_id">>
                               ,<<"Channel-Presence-ID">>
                               ]