From 69bdfc7a6b363183b26bf9cd46d74f809dcd2a95 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 23 Nov 2024 11:02:27 +0300
Subject: [PATCH] 024 bug fix

---
 v1/Application.cfc                            | 8 ++++++--
 v1/resources/instance_operation_cfs_param.cfc | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index c9622c0..6d4aca8 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.023";
+		variables.framework.docs.APIVersion="0.024";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
@@ -183,7 +183,7 @@
 			if (resp.responseheader.status_code NEQ 200) throw("IDP response not OK");
 			
 		} catch (e) { 
-			if (false) { //true for local debug without IDP
+			if (fileExists("#GetDirectoryFromPath(GetCurrentTemplatePath())#/etc/local-debug")) { //true for local debug without IDP, etc/* does not go to repository
 			var result='{"accounts":[{"login":"","type":"telegram"}],"avatar":["d2d2b7ac-50af-432b-b7c4-f7d6561e288a"],"company":"ООО «НУБЕС»","companyId":"8ec70ac0-546d-42a7-8cff-339c8fb51a23","contactId":"983967a3-58c2-4cdd-84a5-8b427ccfac82","email":"smishchuk@nubes.ru","externalUser":false,"fio":{"fullName":"Мищук Сергей ","name":"Сергей","secondName":"","surname":"Мищук"},"groupIds":["94bf5be7-52f4-5c13-87c3-513786934685","ab12b6b8-0265-4683-a5c2-5e1a74a55216","aff008c3-7443-50f6-86e1-ecff3cd3b04d","d6000da0-c9aa-55eb-9882-f118b432730b","d89a33dc-3177-5854-9580-f7f860a5ab7c","ddfe2555-9ef4-42cb-9a2b-7f24e61e7747","df12926f-ecb8-5479-857f-6d291464baad","fda5c295-230a-5025-9797-b8b4e99e08aa","2be9b4b6-94d1-59f9-a649-cab228d82169","64fe6f5c-a91b-5fea-a7ca-d9823701ebd4"],"integration":{"serviceId":""},"login":"smishchuk@nubes.ru","mobilePhone":[],"position":"","userId":"d72530e1-66a4-412f-a046-38153c4e5405"}';}
 		}
 		
@@ -779,5 +779,9 @@
 	</cffunction>
 	
 	
+<!--- 	<cffunction name="checkForLocalDebug">
+		<cfreturn fileExists("#GetDirectoryFromPath(GetCurrentTemplatePath())#/etc/local-debug")>
+	</cffunction> --->
+	
 	
 </cfcomponent>
diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc
index f1df463..6f6b07a 100644
--- a/v1/resources/instance_operation_cfs_param.cfc
+++ b/v1/resources/instance_operation_cfs_param.cfc
@@ -24,7 +24,7 @@
 			select 
 			<m:field_set titleMapOut="local.titleMap" lengthOut="fieldCount">
 				<m:field title="instance_operation_cfs_param_uid">iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid</m:field>
-				<m:field title="instance_operation_uid">instance_operation_uid::text as instance_operation_uid</m:field>
+				<m:field title="instance_operation_uid">iop.instance_operation_uid::text as instance_operation_uid</m:field>
 				<m:field title="svc_operation_cfs_param_id">iop.svc_operation_cfs_param_id</m:field>
 				<m:field title="param_value">iop.param_value</m:field>
 				<m:field title="dt_created">to_char(iop.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
@@ -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)#/>
 			AND si.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
 		</cfquery>	
@@ -119,7 +119,7 @@
 	</cffunction>
 	
 	<cffunction name="checkInstanceParam">
-		<cfargument name="instanceOperationCfsParamUid" type="numeric" required=true/>
+		<cfargument name="instanceOperationCfsParamUid" type="guid" required=true/>
 		<cfargument name="paramValue" required=true/>
 		
 		<cfset var local={}/>
@@ -128,7 +128,7 @@
 			from instance_operation_cfs_param
 			where instance_operation_cfs_param_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationCfsParamUid#" null=#!isValid('guid',arguments.instanceOperationCfsParamUid)#/>
 		</cfquery>
-		<cfif local.qCheck.recordCount GT 0>
+		<cfif local.qCheck.recordCount EQ 0>
 			<cfthrow type="invalidParamValue" message="Cannot find CFS parameter by instanceOperationCfsParamUid=#arguments.instanceOperationCfsParamUid#"/>
 		</cfif>