smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

120 instance dependencies bug fix

Browse Source
This commit is contained in:
msyu
2025-07-02 16:11:07 +03:00
parent 8262ade423
commit a1278b00e7
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/Application.cfc
+1 -1
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={}; //variables.framework.docs={};
variables.framework.docs.APIName="Deck API"; variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.119"; /*$ git config --global --unset user.password*/ variables.framework.docs.APIVersion="0.120"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
v1/resources/instance.cfc
+27 -24
View File
@@ -208,31 +208,34 @@
<cfset var dependencies=[]/> <cfset var dependencies=[]/>
<!--- <cfset var dependencies=#local.qCfsParam#/> ---> <!--- <cfset var dependencies=#local.qCfsParam#/> --->
<cfloop query="local.qCfsParam"> <cfloop query="local.qCfsParam">
<cfset var paramName = this.helper.snake2camel(local.qCfsParam.svc_operation_cfs_param)/> <cftry>
<cfset var instanceData="#deserializeJson(qCurrentState.instance_data)#"/> <cfset var instanceData=deserializeJson(qCurrentState.instance_data)/>
<cfif structKeyExists(instanceData, "params") AND structKeyExists(instanceData.params, paramName)> <cfset var paramName = local.qCfsParam.svc_operation_cfs_param/>
<cfset var refKey = structFind(instanceData.params, paramName)/> <cfif structKeyExists(instanceData, "params") AND structKeyExists(instanceData.params, paramName)>
<cfif isValid("guid",refKey)> <cfset var refKey = structFind(instanceData.params, paramName)/>
<!--- *** нужно укрепить изоляцию и проконтролировать принадлежность инстанса данному тенанту ---> <cfif isValid("guid",refKey)>
<cfquery name="qDependency"> <!--- *** нужно укрепить изоляцию и проконтролировать принадлежность инстанса данному тенанту --->
select e.display_name, e.is_auxiliary <cfquery name="qDependency">
from instance e select e.display_name, e.is_auxiliary
where e.instance_uid = <cfqueryparam cfsqltype="cf_sql_other" value="#refKey#" null=#!isValid('guid',refKey)#/> from instance e
</cfquery> where e.instance_uid = <cfqueryparam cfsqltype="cf_sql_other" value="#refKey#" null=#!isValid('guid',refKey)#/>
<cfset var rec = { </cfquery>
"param":"#svc_operation_cfs_param#", <cfset var rec = {
"descr":"#descr#", "param":"#svc_operation_cfs_param#",
"svcId":#ref_svc_id#, "descr":"#descr#",
"svc":"#ref_svc#", "svcId":#ref_svc_id#,
"code":"#ref_code#", "svc":"#ref_svc#",
"label":"#label#", "code":"#ref_code#",
"uid":"#refKey#", "label":"#label#",
"displayName":"#qDependency.display_name#", "uid":"#refKey#",
"isAuxiliary": #request.castToBool(qDependency.is_auxiliary)# "displayName":"#qDependency.display_name#",
}/> "isAuxiliary": #request.castToBool(qDependency.is_auxiliary)#
<cfset arrayAppend(dependencies, rec)/> }/>
<cfset arrayAppend(dependencies, rec)/>
</cfif>
</cfif> </cfif>
</cfif> <cfcatch type="ANY"><!--- *** ---></cfcatch>
</cftry>
</cfloop> </cfloop>