From 424a90cf31cdabb9996f1a2315135ebbde3fabbd Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Wed, 10 Sep 2025 20:19:02 +0300
Subject: [PATCH] 140 dependencies bugfix

---
 v1/Application.cfc                                     |  2 +-
 v1/resources/bk/{test.cfc => test.cfc.bak}             |  0
 v1/resources/bk/{test2.cfc => test2.cfc.bak}           |  0
 v1/resources/{throw.cfc => bk/throw.cfc.bak}           |  0
 v1/resources/{timeseries.cfc => bk/timeseries.cfc.bak} |  0
 v1/resources/err.cfc                                   |  2 +-
 v1/resources/instance.cfc                              | 10 +++++++---
 7 files changed, 9 insertions(+), 5 deletions(-)
 rename v1/resources/bk/{test.cfc => test.cfc.bak} (100%)
 rename v1/resources/bk/{test2.cfc => test2.cfc.bak} (100%)
 rename v1/resources/{throw.cfc => bk/throw.cfc.bak} (100%)
 rename v1/resources/{timeseries.cfc => bk/timeseries.cfc.bak} (100%)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 2e26e3f..673841f 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="svc-api";
-		variables.framework.docs.APIVersion="0.139"; /*dependencies*/ /*$ git config --global --unset user.password*/
+		variables.framework.docs.APIVersion="0.140"; /*dependencies*/ /*$ git config --global --unset user.password*/
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/bk/test.cfc b/v1/resources/bk/test.cfc.bak
similarity index 100%
rename from v1/resources/bk/test.cfc
rename to v1/resources/bk/test.cfc.bak
diff --git a/v1/resources/bk/test2.cfc b/v1/resources/bk/test2.cfc.bak
similarity index 100%
rename from v1/resources/bk/test2.cfc
rename to v1/resources/bk/test2.cfc.bak
diff --git a/v1/resources/throw.cfc b/v1/resources/bk/throw.cfc.bak
similarity index 100%
rename from v1/resources/throw.cfc
rename to v1/resources/bk/throw.cfc.bak
diff --git a/v1/resources/timeseries.cfc b/v1/resources/bk/timeseries.cfc.bak
similarity index 100%
rename from v1/resources/timeseries.cfc
rename to v1/resources/bk/timeseries.cfc.bak
diff --git a/v1/resources/err.cfc b/v1/resources/err.cfc
index 3339c25..de5c20c 100644
--- a/v1/resources/err.cfc
+++ b/v1/resources/err.cfc
@@ -1,6 +1,6 @@
 <cfcomponent extends="taffy.core.resource" taffy:uri="/error">
 
-	 <cffunction name="get" hint="Имитация ошибки HTTP">
+	 <cffunction name="get" hint="Имитация ошибки HTTP для тестирования">
 		<cfargument name="statusCode" type="string" hint="type:integer" default="200"/>	
 		<cfargument name="statusText" type="string" hint="type:string" default=""/>	
 
diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc
index fd39e0d..e3490bc 100644
--- a/v1/resources/instance.cfc
+++ b/v1/resources/instance.cfc
@@ -239,6 +239,7 @@
 			<cfcatch type="ANY"></cfcatch>
 		</cftry> --->
 		
+		<!--- *** здесь уместна параноидальная проверка прав --->
 		<cfquery name="local.qDependency">		
 			select 
 			<m:field_set titleMapOut="local.dependencyTitleMap" lengthOut="local.fieldCount">
@@ -249,8 +250,8 @@
 				<m:field>s.code</m:field>
 				<m:field>sop.label</m:field>
 				<m:field>p.param_value as uid</m:field>
-				<m:field>e.display_name</m:field>
-				<m:field>e.is_auxiliary</m:field>		
+				<m:field>r.display_name</m:field>
+				<m:field>r.is_auxiliary</m:field>		
 				<m:field>c.contract_id</m:field>
 				<m:field>c.contract</m:field>
 				<m:field>to_char(c.dt_contract, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_contract</m:field>
@@ -263,7 +264,9 @@
 			left outer join svc_operation so on (o.operation=so.operation AND e.service_id=so.svc_id)
 			left outer join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id AND p.param=sop.svc_operation_cfs_param)
 			left outer join svc s on (sop.ref_svc_id=s.svc_id)
-			left outer join specification_item si on (e.specification_item_id=si.specification_item_id)
+			
+			join instance r on (p.param_value=r.instance_uid::text)
+			left outer join specification_item si on (r.specification_item_id=si.specification_item_id)
 			left outer join specification sp on (si.specification_id=sp.specification_id)
 			left outer join contract c on (sp.contract_id=c.contract_id)
 			left outer join contragent k on (c.contragent_id=k.contragent_id)
@@ -272,6 +275,7 @@
 			order by sop.sort, p.param
 		</cfquery>
 		
+		<!--- *** здесь уместна параноидальная проверка прав --->
 		<cfquery name="local.qDependentInstance">
 			select 
 			<m:field_set titleMapOut="local.dependentInstanceTitleMap" lengthOut="local.fieldCount">