smishchuk/svc-api-x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

113 pending

Browse Source
This commit is contained in:
msyu
2025-06-11 12:14:04 +03:00
parent 98aac1ea17
commit d66813302c
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/Application.cfc
+1 -1
View File
@@ -51,7 +51,7 @@
//variables.framework.docs={};
variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.112"; /*$ git config --global --unset user.password*/
variables.framework.docs.APIVersion="0.113"; /*$ git config --global --unset user.password*/
variables.framework.globalHeaders = structNew();
v1/resources/instance.cfc
+3 -1
View File
@@ -34,7 +34,9 @@
<m:field>i.price</m:field><!--- *** не цена, а скидка (Считая ссылку на базовый тариф атрибутом сервиса) --->
<m:field>v.svc</m:field>
<m:field>v.code</m:field>
<m:field>v.man</m:field>
<m:field>v.man
</m:field>
<m:field>e.updater_id</m:field>
<m:field>u.login as updater_login</m:field>
<m:field>u.shortname as updater_shortname</m:field>
v1/resources/instance_ls.cfc
+13 -8
View File
@@ -33,6 +33,7 @@
"instance_state_uid"={prefix="inr", type="guid"},
"is_deleted"={prefix="inr", type="string"},<!--- not bool --->
"is_suspended"={prefix="inr", type="string"},<!--- not bool --->
"job_is_pending"={prefix="inr", type="string"},<!--- not bool --->
"resource_realm"={prefix="inr", type="string"},
"operation_is_in_progress"={prefix="inr", type="boolean"},
"operation_is_pending"={prefix="inr", type="boolean"},
@@ -174,15 +175,16 @@
<m:field formatter=#request.castToBool#>st.is_test as is_test</m:field>
<m:field formatter=#request.castToBool#>coalesce(st.instance_data->>'isDeleted','false') as is_deleted</m:field><!--- attention it is not bool in state --->
<m:field formatter=#request.castToBool#>st.instance_data->>'isSuspended' as is_suspended</m:field>
<m:field>cast(st.instance_data->>'params' as json)->>'resourceRealm' as resource_realm</m:field>
<m:field formatter=#request.castToBool#>st.instance_data->'job'->>'pending' as job_is_pending</m:field>
<m:field>st.instance_data->'params'->>'resourceRealm' as resource_realm</m:field>
<m:field>to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state</m:field>
<!--- <m:field>io.instance_uid::text as io_instance_uid</m:field>
<m:field>st.instance_uid::text as st_instance_uid</m:field> --->
<m:field>(case
when st.instance_uid IS NULL then 'not created'
when job_is_pending = 'true' then 'pending'
when st.is_deleted = 'true' then 'deleted'
when st.is_suspended = 'true' then 'suspended'
/*when coalesce(st.is_deleted,'false') = 'false' AND coalesce(st.is_suspended, 'false') = 'false' then 'running'*/
when coalesce(st.is_deleted,'false') = 'false' AND coalesce(st.is_suspended, 'false') = 'false' then 'running'
when io.instance_uid IS NULL then 'not configured'
else null end
@@ -212,14 +214,16 @@
left outer join (select ist.instance_state_uid, ist.instance_uid, ist.version, ist.dt_state, ist.is_test
,(ist.instance_data->>'isSuspended') as is_suspended
,(ist.instance_data->>'isDeleted') as is_deleted
,(ist.instance_data->'job'->>'pending') as job_is_pending
,ist.instance_data
from instance_state ist join (select instance_uid, max(version) as version from instance_state group by 1) lastv
on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version) ) st
on (e.instance_uid=st.instance_uid)
from instance_state ist
join (select instance_uid, max(version) as version from instance_state group by 1) lastv
on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version)
) st on (e.instance_uid=st.instance_uid)
left outer join (select o.instance_operation_uid, o.instance_uid, o.operation, o.dt_submit, o.submit_result, o.dt_start, o.dt_finish, o.is_successful
from instance_operation o join (select instance_uid, max(dt_submit) as dt_submit from instance_operation group by 1) lastv
on (o.instance_uid=lastv.instance_uid AND o.dt_submit=lastv.dt_submit) ) io
on (e.instance_uid=io.instance_uid)
from instance_operation o join (select instance_uid, max(dt_submit) as dt_submit from instance_operation group by 1
) lastv on (o.instance_uid=lastv.instance_uid AND o.dt_submit=lastv.dt_submit)
) io on (e.instance_uid=io.instance_uid)
where s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
<cfif len(arguments.search)>
AND (
@@ -248,6 +252,7 @@
left outer join (select ist.instance_state_uid, ist.instance_uid, ist.version, ist.dt_state, ist.is_test
,(ist.instance_data->>'isSuspended') as is_suspended
,(ist.instance_data->>'isDeleted') as is_deleted
,(ist.instance_data->'job'->>'pending') as job_is_pending
,ist.instance_data
from instance_state ist join (select instance_uid, max(version) as version from instance_state group by 1) lastv
on (ist.instance_uid=lastv.instance_uid AND ist.version=lastv.version) ) st