From 69e09897df322e7bcabb4c8ed9545910f5f85628 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Tue, 26 Nov 2024 12:53:33 +0300
Subject: [PATCH] 029 uptime added

---
 v1/Application.cfc                  | 2 +-
 v1/resources/instance.cfc           | 8 +++++---
 v1/resources/instance_ls.cfc        | 2 ++
 v1/resources/instance_operation.cfc | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 765b7f7..ba2edc6 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.028";
+		variables.framework.docs.APIVersion="0.029";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 
diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc
index 4656861..703af9c 100644
--- a/v1/resources/instance.cfc
+++ b/v1/resources/instance.cfc
@@ -50,9 +50,9 @@
 			AND s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/><!--- access protection --->
 		</cfquery>	<!--- *** правильнее при попытке доступа к чужому инстансу (НСД) выбрасывать 403, а тут будет 404 --->
 		
-	<!--- 	<cfif local.qInstance.recordCount EQ 0>
-			<cfreturn representationOf(this.helper.formatMessage("Not Found")).withStatus(404)/>
-		</cfif>  --->
+		<cfif local.qInstance.recordCount EQ 0>
+			<cfreturn representationOf("Instance not found or no permission to view").withStatus(404)/>
+		</cfif> 
 		
 		<cfquery name="local.qCurrentState" result="local.result">
 			select 
@@ -94,6 +94,7 @@
 				<m:field title="Начало">to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
 				<m:field title="Завершение">to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
 				<m:field title="Длит. сек">extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>
+				<m:field>extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)) as seconds_passed</m:field>
 				<m:field title="Успешно">o.is_successful</m:field>
 				<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
 			</m:field_set>	
@@ -210,6 +211,7 @@
 		
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
+		<cfset "out.uptime"=(local.qOperation.is_successful GT 0) ? local.qOperation.seconds_passed : 0/>
 		<cfset "out.isCreated"=local.isCreated/>
 		<cfset "out.isDeleted"=qCurrentState.is_deleted GT 0/><!--- он все время пытается привести true к 1
 		 --->
diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc
index 44c9bf1..cb8409d 100644
--- a/v1/resources/instance_ls.cfc
+++ b/v1/resources/instance_ls.cfc
@@ -74,6 +74,8 @@
 				<m:field>(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</m:field>
 				<m:field>(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</m:field>
 				<m:field>(select extract('epoch' from coalesce(io.dt_finish,CURRENT_TIMESTAMP)- io.dt_start) from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as duration</m:field>
+				<m:field>(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</m:field>
+<!--- *** не то же самое, что в DETAIL view! --->
 				<m:field formatter=#function(x){return (deserializeJson(x))}#>(select instance_data::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_data</m:field><!--- *** операция выглядит очень накладно, но можно это поле в дельнейшем не выводить --->
 				<m:field>(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</m:field>
 				<m:field>(select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test</m:field>
diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc
index 03c9c39..dd3cd9a 100644
--- a/v1/resources/instance_operation.cfc
+++ b/v1/resources/instance_operation.cfc
@@ -28,6 +28,7 @@
 				<m:field title="Начало">to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
 				<m:field title="Завершение">to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
 				<m:field title="Длит. сек">extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>
+				<!--- <m:field title="Uptime">extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)) as uptime</m:field> --->
 				<!--- <m:field title="Длит.">(coalesce(dt_finish,CURRENT_TIMESTAMP)- dt_start) as duration_interval</m:field> --->
 				<m:field title="Успешно">o.is_successful</m:field>
 				<!--- <m:field title="stage">stage</m:field> --->