diff --git a/e.cfm b/e.cfm
deleted file mode 100644
index 66c284c..0000000
--- a/e.cfm
+++ /dev/null
@@ -1 +0,0 @@
-select *
\ No newline at end of file
diff --git a/health.cfm b/health.cfm
new file mode 100644
index 0000000..e69de29
diff --git a/v1/Application.cfc b/v1/Application.cfc
index 69261af..947145f 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -71,7 +71,7 @@
//variables.framework.docs={};
variables.framework.docs.APIName="Deck API";
- variables.framework.docs.APIVersion="0.010";
+ variables.framework.docs.APIVersion="0.011";
variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
@@ -164,7 +164,8 @@
//}
//if (UCase(arguments.verb) EQ 'OPTIONS') return newRepresentation().noData().withStatus("204","No Data").withHeaders({"Content-Type":"application/json;charset=utf-8"});
- if (UCase(arguments.verb) EQ 'OPTIONS') return true;
+ if (uCase(arguments.verb) EQ 'OPTIONS') return true;
+ if (lCase(arguments.cfc) EQ 'err') return true;
var auth="";
if (structKeyExists(headers,"Authorization")) {
@@ -178,13 +179,18 @@
httpService.addParam(type = "HEADER", name = "Authorization", value = "#auth#"); //passthrough
var resp = httpService.send();
var result = resp.getPrefix().filecontent;
- //writeDump(result); abort;
- var idpUserData=deserializeJson(result);
- arguments.requestArguments.companyUid=idpUserData.companyId;
- arguments.requestArguments.usrUid=idpUserData.contactId;//userId; //GUID!
+ //writeDump(result); abort;
+ try {
+ var idpUserData=deserializeJson(result);
+
+ arguments.requestArguments.companyUid=idpUserData.companyId;
+ arguments.requestArguments.usrUid=idpUserData.contactId;//userId; //GUID!
+ } catch (e) {
+ return representationOf( {"exception"=e, "idpResponse"=result} );
+ }
var usrCustomerInfo=getUsrCustomerInfo(idpUserData.contactId);
- if (structIsEmpty(usrCustomerInfo)) return representationOf("Cannot find default specification for current user #result#").withStatus(422);
+ if (structIsEmpty(usrCustomerInfo)) return representationOf("Cannot find default specification for current user #result#").withStatus(422); //это создает довольно много лишних движений при отладке
arguments.requestArguments.usrId=usrCustomerInfo.usrId; //Integer!
arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //Integer
diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc
index ba03512..99f684f 100644
--- a/v1/resources/notification_ls.cfc
+++ b/v1/resources/notification_ls.cfc
@@ -55,7 +55,7 @@
n.descr
n.contragent_id
k.external_uid
- as arguments_company_uid
+
to_char(n.dt_show_from, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_from
to_char(n.dt_show_to, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_to