From ffdb01d9e486490f290e23e18d89a691dd9007c1 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Wed, 18 Jun 2025 20:31:00 +0300
Subject: [PATCH] 115 job url split version from state

---
 v1/Application.cfc                      |  2 +-
 v1/resources/instance_operation_run.cfc | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 2b3fbfd..d8f67c6 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.114"; /*$ git config --global --unset user.password*/
+		variables.framework.docs.APIVersion="0.115"; /*$ git config --global --unset user.password*/
 
 		
 		variables.framework.globalHeaders = structNew();
diff --git a/v1/resources/instance_operation_run.cfc b/v1/resources/instance_operation_run.cfc
index 4152b97..a13c33b 100644
--- a/v1/resources/instance_operation_run.cfc
+++ b/v1/resources/instance_operation_run.cfc
@@ -188,12 +188,22 @@
 		<cfargument name="instanceOperationUid" type="string" required=true hint="type:guid"/>
 		
 		<cfquery name="qInstanceOperation">
-			select select so.url_prefix, so.url_suffix, o.operation, svc.version
+			select so.url_prefix, so.url_suffix, o.operation, svc.version
 			from instance_operation o 
 			join instance i on (o.instance_uid=i.instance_uid)
+			join svc on (i.service_id=svc.svc_id)
 			left outer join svc_operation so on (i.service_id=so.svc_id AND o.operation=so.operation)
 			where o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
 		</cfquery>
+		
+		<cfquery name="qState">
+			select s.instance_data->'job'->>'jobAppVersion' as jobAppVersion
+			from instance_operation o 
+			join instance_state s on (o.instance_uid=s.instance_uid)
+			where o.instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
+			order by s.version desc
+			limit 1
+		</cfquery>
 
 		<cfquery name="qInstanceOperationParam">
 			select iop.param, iop.param_value
@@ -202,8 +212,14 @@
 			AND length(iop.param)>0
 		</cfquery>
 		
+		
+		<cfif len(qState.jobAppVersion)>
+			<cfset var submit_url="#qInstanceOperation.url_prefix##qState.jobAppVersion##qInstanceOperation.url_suffix#"/>
+		<cfelse>
+			<cfset var submit_url="#qInstanceOperation.url_prefix##qInstanceOperation.version##qInstanceOperation.url_suffix#"/>
+		</cfif>
+		
 		<!--- *** тут нужно бы указать, кто запустил операцию --->
-		<cfset submit_url="#qInstanceOperation.url_prefix##qInstanceOperation.version##qInstanceOperation.url_suffix#"/>
 		<cfquery name="qMarkOperationStart">
 			update instance_operation 
 			set dt_submit=<cfqueryparam cfsqltype="cf_sql_timestamp" value=#now()#/>