From 428bb4b8e979bced29e8e501bd1e2dc1475ce1a2 Mon Sep 17 00:00:00 2001 From: skorobkov Date: Fri, 16 Dec 2016 20:55:30 +0200 Subject: [PATCH] Fix kz_att_http:fetch_attachment/1 (#3010) Fix default_format/0 in kz_att_http & kz_att_ftp Fix parsing field_list from storage_plan in kz_att_http & kz_att_ftp --- core/kazoo_attachments/src/kz_att_ftp.erl | 6 +++++- core/kazoo_attachments/src/kz_att_http.erl | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/core/kazoo_attachments/src/kz_att_ftp.erl b/core/kazoo_attachments/src/kz_att_ftp.erl index 900902b8346..8bc5c787a75 100644 --- a/core/kazoo_attachments/src/kz_att_ftp.erl +++ b/core/kazoo_attachments/src/kz_att_ftp.erl @@ -145,11 +145,15 @@ format_url(Fields, JObj, Args, Separator) -> format_url_field(JObj, Args, Fields, Acc) when is_list(Fields) -> [format_url(Fields, JObj, Args, <<>>) | Acc]; +format_url_field(JObj, Args, #{<<"arg">> := Arg}, Fields) -> + format_url_field(JObj, Args, {arg, Arg}, Fields); format_url_field(_JObj, Args, {arg, Arg}, Fields) -> case props:get_value(Arg, Args) of 'undefined' -> Fields; V -> [kz_util:uri_encode(V) | Fields] end; +format_url_field(JObj, Args, #{<<"field">> := Field}, Fields) -> + format_url_field(JObj, Args, {field, Field}, Fields); format_url_field(JObj, _Args, {field, Field}, Fields) -> case kz_json:get_value(Field, JObj) of 'undefined' -> Fields; @@ -161,6 +165,6 @@ format_url_field(_JObj, _Args, Field, Fields) -> default_format() -> [{field, <<"pvt_account_id">>} ,{field, <<"owner_id">>} - ,{args, <<"id">>} + ,{arg, <<"id">>} ,{arg, <<"attachment">>} ]. diff --git a/core/kazoo_attachments/src/kz_att_http.erl b/core/kazoo_attachments/src/kz_att_http.erl index 711192b92f2..e1b27c1555f 100644 --- a/core/kazoo_attachments/src/kz_att_http.erl +++ b/core/kazoo_attachments/src/kz_att_http.erl @@ -104,7 +104,7 @@ fetch_attachment(HandlerProps, _DbName, _DocId, _AName) -> fetch_attachment(URL) -> case fetch_attachment(URL, 0, kz_json:new()) of - {'ok', _Url, Body, _Debug} -> {'ok', Body}; + {'ok', Body} -> {'ok', Body}; {'error', _} = Error -> Error end. @@ -139,11 +139,15 @@ format_url(Fields, JObj, Args, Separator) -> format_url_field(JObj, Args, Fields, Acc) when is_list(Fields) -> [format_url(Fields, JObj, Args, <<>>) | Acc]; +format_url_field(JObj, Args, #{<<"arg">> := Arg}, Fields) -> + format_url_field(JObj, Args, {arg, Arg}, Fields); format_url_field(_JObj, Args, {arg, Arg}, Fields) -> case props:get_value(Arg, Args) of 'undefined' -> Fields; V -> [kz_util:uri_encode(V) | Fields] end; +format_url_field(JObj, Args, #{<<"field">> := Field}, Fields) -> + format_url_field(JObj, Args, {field, Field}, Fields); format_url_field(JObj, _Args, {field, Field}, Fields) -> case kz_json:get_value(Field, JObj) of 'undefined' -> Fields; @@ -155,6 +159,6 @@ format_url_field(_JObj, _Args, Field, Fields) -> default_format() -> [{field, <<"pvt_account_id">>} ,{field, <<"owner_id">>} - ,{args, <<"id">>} + ,{arg, <<"id">>} ,{arg, <<"attachment">>} ].