debug

v1/Application.cfc

@@ -136,7 +136,7 @@
 
 		//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;
-	return true;
+	
 		var auth="";
 		if (structKeyExists(headers,"Authorization")) {
 			auth=headers.Authorization;

v1/etc/test-header

@@ -0,0 +1,56 @@
+curl --location --request GET 'https://localhost/temp/test.cfm' \
+--header 'Content-Type: application/json' --header 'Origin:nhl.ru' --insecure
+
+curl --location --request GET 'http://localhost/deck/api/v1/index.cfm/instances' \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl GET 'http://localhost/deck/api/v1/index.cfm/instances' \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl GET 'http://localhost/deck/api/v1/index.cfm/instances' \
+--head \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl GET 'https://localhost/deck/api/v1/index.cfm/instances' \
+-v \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl -X GET 'https://lk.test.adl.nubes.ru/deck/api/v1/index.cfm/instances' \
+-v \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl -X GET 'https://localhost/deck-api/v1/index.cfm/instances' \
+-v \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl -X OPTIONS 'https://localhost/deck/api/v1/index.cfm/instances' \
+-v \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'
+
+curl -X OPTIONS 'https://lk.test.adl.nubes.ru/deck/api/v1/index.cfm/instances' \
+-v \
+--insecure \
+--header 'Content-Type: application/json' \
+--header 'Origin:nhl.ru' \
+--header 'authorization: Bearer eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXVCJ9.eyJjb21wYW55IjoiaGVhZCIsInVzZXJJZCI6ImQ3MjUzMGUxLTY2YTQtNDEyZi1hMDQ2LTM4MTUzYzRlNTQwNSIsIm93bmVyIjpmYWxzZSwiaXNQb3J0YWwiOmZhbHNlLCJzZXNzaW9uSWQiOiJhNWVhYTkwNi1hOTJiLTVkYzMtYWJiYS1iYzg0NGQwZjg5MzIiLCJwcml2aWxlZ2VzIjpbInN5c3RlbSIsImFkbWluaXN0cmF0aW9uIl0sIm5lZWRDaGFuZ2VQYXNzd29yZCI6ZmFsc2UsImNyZWF0ZWRBdCI6MTcyOTY4NTEzMSwiaXNzIjoiYXBpIiwiZXhwIjoxNzMyMTA0MzkxLCJpYXQiOjE3Mjk2ODUwNzF9.4f5lW0uH8bxKl4Wjov0yFpE3qN_5d0GPca3FUb-kD8ln2A01ndmjsCJHsyibDImsJq5MVVFc87gHHdaH4sxIC0gWp-Z0pRpC6q1Velbz8qF4kiuAdSieBqzYF2CnAeMBozU4L69bdf_iW35qdvrVXcZusIoI3Oe9NcrPLbmnjfw'

v1/resources/instance_ls.cfc

@@ -82,7 +82,6 @@
 			join usr u on (k.contragent_id=u.contragent_id)			
 			join svc v on (e.service_id=v.svc_id)
 			where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>			
-			--AND exists(select * from usr_role x where u.usr_id=x.usr_id AND x.role_id=2)
 			<m:filter_build filter=#filter#/>
 			order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
 			limit #maxrows#
@@ -91,8 +90,13 @@
 		<cfquery name="local.qTotal">
 			select count(*) as cnt
 			from instance e
-			where 1=1 
+			join specification_item i on (e.specification_item_id=i.specification_item_id)		
-			--AND exists(select * from usr_role x where u.usr_id=x.usr_id AND x.role_id=2) -- 2=Согласование нарядов
+			join specification s on (i.specification_id=s.specification_id)		
+			join contract d on (s.contract_id=d.contract_id)		
+			join contragent k on (d.contragent_id=k.contragent_id)
+			join usr u on (k.contragent_id=u.contragent_id)			
+			join svc v on (e.service_id=v.svc_id)
+			where u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>	
 		</cfquery> 
 		
 		<cfset var out=structNew("linked")/>

v1/resources/instance_operation_cfs_param.cfc

@@ -35,7 +35,7 @@
 			join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id)
 			join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
 			join instance e on (io.instance_uid=e.instance_uid)
-			join specification_item si on (e.specification_item_id=si.specification_item_id)
+			join specification_item si on (e.specification_item_id=si.specification_item_id``)
 			where iop.instance_operation_cfs_param_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationCfsParamUid#" null=#!isValid('guid',arguments.instanceOperationCfsParamUid)#/>
 		</cfquery>