From ad5e09532b33fab781ba1e51a70c998055ef4db1 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Mon, 31 Mar 2025 14:50:25 +0300
Subject: [PATCH] 074 is_sensitive

---
 v1/Application.cfc                            |  2 +-
 v1/resources/instance_operation.cfc           |  1 +
 v1/resources/instance_operation_cfs_param.cfc |  2 +-
 .../instance_operation_cfs_param_ls.cfc       |  2 +-
 v1/resources/instance_operation_default.cfc   |  3 +-
 v1/resources/instance_operation_run.cfc       | 53 +++++++++----------
 v1/resources/svc_operation.cfc                |  3 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 693090c..d75959f 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.073";
+		variables.framework.docs.APIVersion="0.074";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc
index 00cc54c..1e85bc2 100644
--- a/v1/resources/instance_operation.cfc
+++ b/v1/resources/instance_operation.cfc
@@ -113,6 +113,7 @@
 				<m:field>sop.descr</m:field>
 				<m:field>sop.sort</m:field>
 				<m:field>iop.note</m:field>
+				<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
 			</m:field_set>
 			from svc_operation_cfs_param sop
 			left outer join instance_operation_cfs_param iop 
diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc
index be1f63e..172f3fa 100644
--- a/v1/resources/instance_operation_cfs_param.cfc
+++ b/v1/resources/instance_operation_cfs_param.cfc
@@ -34,7 +34,7 @@
 				<m:field>sop.svc_operation_cfs_param</m:field>
 				<m:field>u.login as creator_login</m:field>
 				<m:field>u.shortname as creator_shortname</m:field>
-				<m:field>sop.is_sensitive</m:field>
+				<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
 			</m:field_set>
 			from instance_operation_cfs_param iop
 			join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id)
diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc
index 3f761e2..8c177ac 100644
--- a/v1/resources/instance_operation_cfs_param_ls.cfc
+++ b/v1/resources/instance_operation_cfs_param_ls.cfc
@@ -65,7 +65,7 @@
 				<m:field>u.shortname as creator_shortname</m:field>
 				<m:field>sop.svc_operation_cfs_param</m:field>
 				<m:field>sop.sort</m:field>
-				<m:field>sop.is_sensitive</m:field>
+				<m:field formatter=#request.castToBool#>sop.is_sensitive</m:field>
 			</m:field_set>
 			from instance_operation_cfs_param iop
 			join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid)
diff --git a/v1/resources/instance_operation_default.cfc b/v1/resources/instance_operation_default.cfc
index 6373380..d675f47 100644
--- a/v1/resources/instance_operation_default.cfc
+++ b/v1/resources/instance_operation_default.cfc
@@ -61,7 +61,8 @@
 					where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
 					order by c.svc_operation_cfs_param_id
 					limit 1
-				) as isModifiable</m:field>
+				) as is_modifiable</m:field>
+				<m:field formatter=#request.castToBool#>p.is_sensitive</m:field>
 			</m:field_set>	
 			from svc_operation_cfs_param p
 			where p.svc_operation_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcOperationId#" null=#!isValid('integer',arguments.svcOperationId)#/>
diff --git a/v1/resources/instance_operation_run.cfc b/v1/resources/instance_operation_run.cfc
index 09c3784..b7d725b 100644
--- a/v1/resources/instance_operation_run.cfc
+++ b/v1/resources/instance_operation_run.cfc
@@ -94,33 +94,13 @@
 		<cfreturn noData().withStatus(201, "Created") />
 	</cffunction>
 	
-	
-	
+		
 	<cffunction name="generateRfsParams">
 		<cfargument name="instanceOperationUid" type="guid"/>
 		<cfargument name="usrId" type="numeric"/>
 		<cfargument name="contragentId" type="numeric"/>
-		<cfargument name="contractId" type="numeric"/>
-		
-<!--- 		
-			-- полезный селект, не выбрасывать
-			<cfquery name="qSvcOperationCfsParam">
-			select sop.svc_operation_cfs_param_id
-			,iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid /*pgjdbc issue fix*/
-			,iop.param_value
-			,sop.svc_operation_cfs_param
-			,sop.data_type			
-			,sop.is_required
-			,sop.maxlength,sop.minlength,sop.regex,sop.unique_scope 		
-			from instance_operation io
-			join instance e on (io.instance_uid=e.instance_uid)
-			join svc_operation so on (e.service_id=so.svc_id AND io.operation=so.operation)
-			join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id)
-			left outer join instance_operation_cfs_param iop 
-				on (sop.svc_operation_cfs_param_id=iop.svc_operation_cfs_param_id AND io.instance_operation_uid=iop.instance_operation_uid)
-			where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid# null=#!isValid("guid",arguments.instanceOperationUid)#/>)
-		</cfquery> 
---->
+		<cfargument name="contractId" type="numeric"/>		
+
 		<cfquery name="qSvcOperation">
 			select so.svc_operation_id, io.instance_uid, so.operation 
 			from instance_operation io
@@ -133,7 +113,7 @@
 		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "operationUid", arguments.instanceOperationUid)/>
 		<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "modifierId", arguments.usrId)/>
 		
-		<cfif qSvcOperation.operation EQ "create"/><!---  несколько костыльно --->
+		<cfif qSvcOperation.operation EQ "create"><!---  несколько костыльно --->
 			<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "billingObject", "underconstruction")/>
 			<cfset setInstanceOperationRfsParam(arguments.instanceOperationUid, "contragentCode", getContragentCode(arguments.contragentId))/>
 		</cfif>
@@ -154,8 +134,6 @@
 		</cfquery>
 		
 		<!--- так яснее, но можно было все в один запрос --->
-
-
 		<cfquery name="qWriteRfsParamsFromDefaults">
 			insert into instance_operation_param (instance_operation_uid,param,param_value)
 			select  
@@ -167,10 +145,29 @@
 			/*PostgreSQL specific*/
 			ON CONFLICT (instance_operation_uid,param) 
 			DO NOTHING;
-		</cfquery>
-	
+		</cfquery>	
 	</cffunction>
 	
+	<!--- 		
+			-- полезный селект, не выбрасывать
+			<cfquery name="qSvcOperationCfsParam">
+			select sop.svc_operation_cfs_param_id
+			,iop.instance_operation_cfs_param_uid::text as instance_operation_cfs_param_uid /*pgjdbc issue fix*/
+			,iop.param_value
+			,sop.svc_operation_cfs_param
+			,sop.data_type			
+			,sop.is_required
+			,sop.maxlength,sop.minlength,sop.regex,sop.unique_scope 		
+			from instance_operation io
+			join instance e on (io.instance_uid=e.instance_uid)
+			join svc_operation so on (e.service_id=so.svc_id AND io.operation=so.operation)
+			join svc_operation_cfs_param sop on (so.svc_operation_id=sop.svc_operation_id)
+			left outer join instance_operation_cfs_param iop 
+				on (sop.svc_operation_cfs_param_id=iop.svc_operation_cfs_param_id AND io.instance_operation_uid=iop.instance_operation_uid)
+			where iop.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid# null=#!isValid("guid",arguments.instanceOperationUid)#/>)
+		</cfquery> 
+--->
+	
 	<cffunction name="submitJob">
 		<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
 		
diff --git a/v1/resources/svc_operation.cfc b/v1/resources/svc_operation.cfc
index 7792563..079a9c7 100644
--- a/v1/resources/svc_operation.cfc
+++ b/v1/resources/svc_operation.cfc
@@ -58,7 +58,8 @@
 					where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
 					order by c.svc_operation_cfs_param_id
 					limit 1
-				) as isModifiable</m:field>
+				) as is_modifiable</m:field>
+				<m:field formatter=#request.castToBool#>p.is_sensitive</m:field>
 			</m:field_set>	
 			from svc_operation_cfs_param p
 			where p.svc_operation_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcOperationId#" null=#!isValid('integer',arguments.svcOperationId)#/>