diff --git a/v1/Application.cfc b/v1/Application.cfc index cf37ee7..b4440f4 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.006"; + variables.framework.docs.APIVersion="0.008"; 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 ae316a4..ee6e2d8 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -50,7 +50,8 @@ left outer join contragent k on (d.contragent_id=k.contragent_id) left outer join svc v on (e.service_id=v.svc_id) where e.instance_uid= - + AND s.specification_id= + @@ -98,6 +99,7 @@ where o.instance_uid= order by status.version + diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index d4c849f..5a8c7b5 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -62,16 +62,35 @@ 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 - (select instance_operation_uid::text from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as instance_operation_uid + + (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 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 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 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 st.instance_data->>'grafanaUrl' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as grafana_url + ( + 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 st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) = 'false' AND (select st.instance_data->>'suspended' 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 @@ -80,9 +99,9 @@ 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 usr u on (k.contragent_id=u.contragent_id) join svc v on (e.service_id=v.svc_id) - where u.usr_id= + where s.specification_id= + order by limit #maxrows# @@ -95,9 +114,10 @@ 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 usr u on (k.contragent_id=u.contragent_id) + --join usr u on (k.contragent_id=u.contragent_id) join svc v on (e.service_id=v.svc_id) - where u.usr_id= + where s.specification_id= + diff --git a/v1/resources/instance_operation.cfc b/v1/resources/instance_operation.cfc index 2fd7ba8..a372a08 100644 --- a/v1/resources/instance_operation.cfc +++ b/v1/resources/instance_operation.cfc @@ -47,10 +47,11 @@ 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 usr u on (k.contragent_id=u.contragent_id) + join svc v on (e.service_id=v.svc_id) where u.usr_id= AND o.instance_operation_uid= + AND s.specification_id= diff --git a/v1/resources/instance_operation_cfs_param.cfc b/v1/resources/instance_operation_cfs_param.cfc index 86c06f7..3a2492b 100644 --- a/v1/resources/instance_operation_cfs_param.cfc +++ b/v1/resources/instance_operation_cfs_param.cfc @@ -37,6 +37,7 @@ join instance e on (io.instance_uid=e.instance_uid) join specification_item si on (e.specification_item_id=si.specification_item_id``) where iop.instance_operation_cfs_param_uid= + AND si.specification_id= diff --git a/v1/resources/instance_operation_cfs_param_ls.cfc b/v1/resources/instance_operation_cfs_param_ls.cfc index 9780894..316442b 100644 --- a/v1/resources/instance_operation_cfs_param_ls.cfc +++ b/v1/resources/instance_operation_cfs_param_ls.cfc @@ -58,8 +58,12 @@ sop.svc_operation_cfs_param from instance_operation_cfs_param iop + join instance_operation io on (iop.instance_operation_uid=io.instance_operation_uid) + join instance e on (io.instance_uid=e.instance_uid) + join specification_item si on (e.specification_item_id=si.specification_item_id) join svc_operation_cfs_param sop on (iop.svc_operation_cfs_param_id=sop.svc_operation_cfs_param_id) where iop.instance_operation_uid= + AND si.specification_id= order by limit #maxrows# diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc new file mode 100644 index 0000000..1955f47 --- /dev/null +++ b/v1/resources/notification_ls.cfc @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + n.notification_uid + n.notification + n.descr + n.descr + to_char(s.dt_show_from, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_from + to_char(s.dt_show_to, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_to + to_char(s.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + to_char(s.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated + + from notification n + where 1=1 + AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL) + AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL) + AND (n.companyId = OR n.companyId IS NULL) + order by dt_show_from desc + + limit #maxrows# + + + + + select count(*) as cnt + from notification n + where 1=1 + AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL) + AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL) + AND (n.companyId = OR n.companyId IS NULL) + order by dt_show_from desc + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file