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

097 operationIsInProgress

Browse Source
This commit is contained in:
msyu
2025-04-22 17:03:31 +03:00
parent 9f46c9cd67
commit 3438e8f80e
4 changed files with 10 additions and 7 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.096";
variables.framework.docs.APIVersion="0.097";
variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
v1/resources/bookmark.cfc
+6 -6
View File
@@ -29,22 +29,22 @@
dt_updated=<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#"/>
,updater_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#"/>
<cfif structKeyExists(arguments,"bookmark")>
,bookmark=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.bookmark)#" />
,bookmark=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.bookmark)#"/>
</cfif>
<cfif structKeyExists(arguments,"descr")>
,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.descr)#" />
,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.descr)#"/>
</cfif>
<cfif structKeyExists(arguments,"url")>
,url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.url)#" />
,url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.url)#"/>
</cfif>
<cfif structKeyExists(arguments,"iconUrl")>
,icon_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.iconUrl)#" />
,icon_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#cleanInput(arguments.iconUrl)#"/>
</cfif>
<cfif structKeyExists(arguments,"sort")>
,sort=<cfqueryparam cfsqltype="cf_sql_integer" value="#cleanInput(arguments.sort)#" />
,sort=<cfqueryparam cfsqltype="cf_sql_integer" value="#cleanInput(arguments.sort)#"/>
</cfif>
<cfif structKeyExists(arguments,"isEnabled")>
,is_enabled=<cfqueryparam cfsqltype="cf_sql_bit" value="#cleanInput(arguments.isEnabled)#" />
,is_enabled=<cfqueryparam cfsqltype="cf_sql_bit" value="#arguments.isEnabled#"/>
</cfif>
where
contragent_id=<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.contragentId#"/><!--- isolation --->
v1/resources/instance.cfc
+2
View File
@@ -38,6 +38,7 @@
<m:field>u.login as updater_login</m:field>
<m:field>u.shortname as updater_shortname</m:field>
<m:field>(select cast(st.instance_data->>'params' as json)->>'resourceRealm' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as resourceRealm</m:field>
<m:field formatter=#request.castToBool#>(select (io.dt_start IS NOT NULL AND io.dt_finish IS NULL AND io.submit_result='201') from instance_operation io where io.instance_uid=e.instance_uid order by dt_submit desc limit 1) as operation_is_in_progress</m:field>
<m:field>
(case
when
@@ -115,6 +116,7 @@
<m:field>o.error_log</m:field>
<m:field>u.login as updater_login</m:field>
<m:field>u.shortname as updater_shortname</m:field>
<m:field formatter=#request.castToBool#>(o.dt_start IS NOT NULL AND o.dt_finish IS NULL AND o.submit_result='201') as is_in_progress</m:field>
</m:field_set>
from instance_operation o
left outer join usr u on (o.updater_id=u.usr_id)
v1/resources/instance_operation.cfc
+1
View File
@@ -44,6 +44,7 @@
<m:field>u.shortname as updater_shortname</m:field>
<m:field>v.svc</m:field>
<m:field>so.svc_operation_id</m:field>
<m:field formatter=#request.castToBool#>(o.dt_start IS NOT NULL AND o.dt_finish IS NULL AND o.submit_result='201') as is_in_progress</m:field>
</m:field_set>
from instance_operation o
join instance e on (o.instance_uid=e.instance_uid)