From e445e8310d6fb9d8dc2ab810fac604a810c5dc29 Mon Sep 17 00:00:00 2001 From: msyu Date: Sun, 10 Nov 2024 09:32:34 +0300 Subject: [PATCH] 016 removed some fields from instance --- v1/Application.cfc | 2 +- v1/resources/instance.cfc | 5 ++--- v1/resources/instance_ls.cfc | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/v1/Application.cfc b/v1/Application.cfc index afe8dd8..d50a1fd 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.015"; + variables.framework.docs.APIVersion="0.016"; 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 bf6db43..16d0dde 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -31,14 +31,13 @@ i.quantity i.price v.svc - (select operation from instance_state st join instance_operation io on (st.instance_operation_uid=io.instance_operation_uid) where st.instance_uid=e.instance_uid order by version desc limit 1) as operation + from instance e left outer join specification_item i on (e.specification_item_id=i.specification_item_id) diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index 4d25093..99501fc 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -71,7 +71,7 @@ (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 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 - (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 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