From ef197d160c817b87672fc615e956971a9a421208 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Sat, 1 Mar 2025 10:46:25 +0300
Subject: [PATCH] 117 svc_operation_cfs_param.sort

---
 v1/Application.cfc             |  2 +-
 v1/resources/instance_ls.cfc   | 37 ++++++++++++++++++++++++++++++++--
 v1/resources/svc_operation.cfc |  2 ++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 0aa937f..2edd739 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.061";
+		variables.framework.docs.APIVersion="0.062";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc
index dfa9b33..d2e7f4c 100644
--- a/v1/resources/instance_ls.cfc
+++ b/v1/resources/instance_ls.cfc
@@ -184,7 +184,7 @@
 			limit #arguments.pageSize#
 			offset #arguments.pageSize*(arguments.page-1)#
 		</cfquery>
-		<!---<cfdump var=#local.qRead#/><cfabort/> ---> 
+		<!--- <cfdump var=#local.qRead#/><cfabort/> ---> 
 		<!--- formatter=#function(x){if (isNull(x)) {return x} else {return (x NEQ 0)}}# --->
 		
 		<cfquery name="local.qTotal">
@@ -368,4 +368,37 @@
 		<cfreturn "#local.qSvc.svc_short#-#i+1#"/>
 	</cffunction>
 
-</cfcomponent>
\ No newline at end of file
+</cfcomponent>
+
+<!--- select
+*
+from (
+select
+to_char(e.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_created,to_char(e.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as instance_config_dt_updated,e.instance_uid::text as instance_uid,e.display_name,e.service_id,e.specification_item_id,e.is_auxiliary,d.contract_id,i.specification_id,s.specification,i.quantity,i.price,v.svc,v.code,e.updater_id,u.login as updater_login,u.shortname as updater_shortname,(select io.operation from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as last_operation,(select io.instance_operation_uid::text from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as last_operation_uid,(select io.submit_result from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as submit_result,(select to_char(io.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as operation_dt_start,(select to_char(io.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as operation_dt_finish,(select round(extract('epoch' from coalesce(io.dt_finish,CURRENT_TIMESTAMP)- io.dt_start),1) from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as duration,(select case when io.is_successful then extract('epoch' from CURRENT_TIMESTAMP - coalesce(io.dt_finish,CURRENT_TIMESTAMP)) else 0 end from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as uptime,(select to_char(io.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_operation io where io.instance_uid=e.instance_uid AND io.is_successful AND io.operation='create' order by dt_submit desc limit 1) as dt_deploy,(select instance_data::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_data,(select st.instance_state_uid::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_state_uid,(select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test,(select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_deleted,(select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended,(select to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as dt_state,
+(case
+when
+(select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) = 'true' then 'deleted'
+when
+(select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) = 'true' then 'suspended'
+when
+(select COALESCE(st.instance_data->>'isDeleted','false') from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) = 'false' AND (select COALESCE(st.instance_data->>'suspended','false') from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) = 'false' then 'running'
+when
+not exists (select * from instance_operation o where o.instance_uid=e.instance_uid) then 'not configured'
+when
+not exists (select * from instance_state st where st.instance_uid=e.instance_uid) then 'not created'
+else null end
+) as explained_status
+,(select max(version) from instance_state st where st.instance_uid=e.instance_uid) as version
+from instance e
+join specification_item i on (e.specification_item_id=i.specification_item_id)
+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 svc v on (e.service_id=v.svc_id)
+left outer join usr u on (e.updater_id=u.usr_id)
+where s.specification_id=2
+) inr
+where 1=1
+order by 1 desc
+limit 3
+offset 18 --->
\ No newline at end of file
diff --git a/v1/resources/svc_operation.cfc b/v1/resources/svc_operation.cfc
index 1619441..8671153 100644
--- a/v1/resources/svc_operation.cfc
+++ b/v1/resources/svc_operation.cfc
@@ -49,12 +49,14 @@
 				<m:field>p.minvalue</m:field>
 				<m:field>p.descr</m:field>
 				<m:field>p.man</m:field>
+				<m:field>p.sort</m:field>
 				<m:field formatter=#request.castToBool#>(
 				select 1 from svc_operation_cfs_param m 
 				join svc_operation om on m.svc_operation_id=om.svc_operation_id 
 				join svc_operation oc on (om.svc_id=oc.svc_id AND om.operation='modify' AND oc.operation='create')
 				join svc_operation_cfs_param c on (oc.svc_operation_id=c.svc_operation_id AND m.svc_operation_cfs_param=c.svc_operation_cfs_param)
 				where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
+				order by p.sirt, p.svc_operation_cfs_param_id
 				limit 1
 				) as isModifiable</m:field>
 			</m:field_set>