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

dev-fix-fields reformat

Browse Source
This commit is contained in:
msyu
2025-02-05 22:08:29 +03:00
parent 7c6f920852
commit 9c35515c9f
10 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance.cfc
+9 -9
View File
@@ -55,7 +55,7 @@
<m:field title="v.">st.version</m:field>
<m:field title="creator_id">st.creator_id</m:field>
<m:field title="dt_state">to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state</m:field>
<m:field title="is_test">st.is_test</m:field>
<m:field formatter=#request.castToBool#>st.is_test</m:field>
<m:field title="instance_operation_uid">st.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field title="instance_data" formatter=#function(x){return (deserializeJson(x))}#>st.instance_data::text as instance_data</m:field>
<m:field formatter=#function(x){return (x GT 0)}#>(st.instance_data->>'isDeleted')::boolean as is_deleted</m:field>
@@ -80,16 +80,16 @@
<m:field_set titleMapOut="local.operationTitleMap" lengthOut="local.fieldCount">
<m:field>o.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field>status.instance_state_uid::text as instance_state_uid</m:field>
<m:field title="v.">status.version as state_version</m:field>
<m:field title="operation">o.operation</m:field>
<m:field>status.version as state_version</m:field>
<m:field>o.operation</m:field>
<!--- <m:field title="instance_uid">o.instance_uid::text as instance_uid</m:field> --->
<m:field title="Отправка">to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
<m:field title="Рез.">o.submit_result</m:field>
<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>to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit</m:field>
<m:field>o.submit_result</m:field>
<m:field>to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
<m:field>to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
<m:field>extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration</m:field>
<m:field>round(extract('epoch' from CURRENT_TIMESTAMP - coalesce(o.dt_finish,CURRENT_TIMESTAMP)),1) as seconds_passed</m:field>
<m:field title="Успешно">o.is_successful</m:field>
<m:field formatter=#request.castToBool#>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>o.error_log</m:field>
</m:field_set>
v1/resources/instance_ls.cfc
+6 -5
View File
@@ -110,9 +110,9 @@
<!--- *** не то же самое, что в 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>
<m:field>(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</m:field>
<m:field>(select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended</m:field>
<m:field formatter=#request.castToBool#>(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>
<m:field formatter=#request.castToBool#>(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</m:field>
<m:field formatter=#request.castToBool#>(select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended</m:field>
<m:field>(select to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as dt_state</m:field>
<!--- <m:field>(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</m:field> --->
<m:field>
@@ -149,6 +149,7 @@
limit #maxrows#
</cfquery>
<!---<cfdump var=#local.qRead#/><cfabort/> --->
<!--- formatter=#function(x){if (isNull(x)) {return x} else {return (x NEQ 0)}}# --->
<cfquery name="local.qTotal">
select count(*) as cnt
@@ -176,8 +177,8 @@
</cfloop>
<cfset "out.results"=#resultSet#/>
<cfset "out.pageSize"=#arguments.pageSize#/>
<cfset "out.page"=#arguments.page#/>
<cfset "out.pageSize"=#arguments.pageSize*1#/>
<cfset "out.page"=#arguments.page*1#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset "out.size"=#arrayLen(resultSet)#/>
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
v1/resources/instance_operation.cfc
+10 -10
View File
@@ -29,7 +29,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="Успешно">o.is_successful</m:field>
<m:field formatter=#request.castToBool#>o.is_successful</m:field>
<m:field title="Экземпляр">e.display_name</m:field>
<m:field title="service_id">e.service_id</m:field>
<m:field title="specification_item_id">e.specification_item_id</m:field>
@@ -60,7 +60,7 @@
<m:field_set titleMapOut="local.stageMap" lengthOut="local.fieldCount">
<m:field>ios.instance_operation_stage_uid::text as instance_operation_stage_uid</m:field>
<m:field>ios.stage</m:field>
<m:field>ios.is_successful</m:field>
<m:field formatter=#request.castToBool#>ios.is_successful</m:field>
<m:field>to_char(ios.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start</m:field>
<m:field>to_char(ios.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish</m:field>
<m:field>round(extract('epoch' from coalesce(ios.dt_finish,CURRENT_TIMESTAMP)- ios.dt_start),1) as duration</m:field>
@@ -78,7 +78,7 @@
<m:field title="v.">st.version</m:field>
<m:field title="creator_id">st.creator_id</m:field>
<m:field title="dt_state">to_char(st.dt_state, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_state</m:field>
<m:field title="is_test">st.is_test</m:field>
<m:field formatter=#request.castToBool#>st.is_test</m:field>
<m:field title="instance_operation_uid">st.instance_operation_uid::text as instance_operation_uid</m:field>
<m:field title="instance_data" formatter=#function(x){return (deserializeJson(x))}#>st.instance_data::text as instance_data</m:field>
</m:field_set>
@@ -101,7 +101,7 @@
<m:field>sop.data_type</m:field>
<m:field formatter=#function(x){return listToArray(x);}#>sop.value_list</m:field>
<m:field>sop.ref_svc_id</m:field>
<m:field>sop.is_required</m:field>
<m:field formatter=#request.castToBool#>sop.is_required</m:field>
<m:field>sop.default_value</m:field>
<m:field>sop.regex</m:field>
<m:field>sop.unique_scope</m:field>
@@ -123,21 +123,21 @@
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
<cfset "out.instance" = this.helper.appendRecord(
<cfset "out.instanceOperation" = this.helper.appendRecord(
structNew("linked"), "", local.titleMap, local.qInstanceOperation, this.helper.snake2camel
)/>
<cfset "out.instance.cfsParams"=[]/>
<cfset "out.instanceOperation.cfsParams"=[]/>
<cfloop query=#local.qCfsParam#>
<cfset arrayAppend(out.instance.cfsParams, this.helper.appendRecord(structNew("linked"), "", local.cfsParamTitleMap, local.qCfsParam, this.helper.snake2camel))/>
<cfset arrayAppend(out.instanceOperation.cfsParams, this.helper.appendRecord(structNew("linked"), "", local.cfsParamTitleMap, local.qCfsParam, this.helper.snake2camel))/>
</cfloop>
<cfset "out.instance.stages"=[]/>
<cfset "out.instanceOperation.stages"=[]/>
<cfloop query=#local.qStage#>
<cfset arrayAppend(out.instance.stages, this.helper.appendRecord(structNew("linked"), "", local.stageMap, local.qStage, this.helper.snake2camel))/>
<cfset arrayAppend(out.instanceOperation.stages, this.helper.appendRecord(structNew("linked"), "", local.stageMap, local.qStage, this.helper.snake2camel))/>
</cfloop>
<cfset "out.instance.state"=(local.qState.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.stateTitleMap, local.qState, this.helper.snake2camel) : {}/>
<cfset "out.instanceOperation.state"=(local.qState.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.stateTitleMap, local.qState, this.helper.snake2camel) : {}/>
<cfset "out.runDurationMs"=getTickCount() - request.startTickCount/>
<cfreturn representationOf(out) />
v1/resources/instance_operation_cfs_param_ls.cfc
+2 -2
View File
@@ -91,8 +91,8 @@
</cfloop>
<cfset "out.results"=#resultSet#/>
<cfset "out.pageSize"=#arguments.pageSize#/>
<cfset "out.page"=#arguments.page#/>
<cfset "out.pageSize"=#arguments.pageSize*1#/>
<cfset "out.page"=#arguments.page*1#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset "out.size"=#arrayLen(resultSet)#/>
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
v1/resources/notification_ls.cfc
+2 -2
View File
@@ -94,8 +94,8 @@
</cfloop>
<cfset "out.results"=#resultSet#/>
<cfset "out.pageSize"=#arguments.pageSize#/>
<cfset "out.page"=#arguments.page#/>
<cfset "out.pageSize"=#arguments.pageSize*1#/>
<cfset "out.page"=#arguments.page*1#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset "out.size"=#arrayLen(resultSet)#/>
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
v1/resources/svc.cfc
+9 -10
View File
@@ -25,10 +25,10 @@
<m:field>s.svc</m:field>
<m:field>s.svc_short</m:field>
<m:field>s.code</m:field>
<m:field title="URL создания">(select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url</m:field>
<m:field>s.is_production_ready</m:field>
<m:field title="Описание">s.descr</m:field>
<m:field title="Руководство">s.man</m:field>
<m:field>(select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url</m:field>
<m:field formatter=#request.castToBool#>s.is_production_ready</m:field>
<m:field>s.descr</m:field>
<m:field>s.man</m:field>
</m:field_set>
from svc s
where svc_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcId#" null=#!isValid('integer',arguments.svcId)#/>
@@ -37,12 +37,11 @@
<cfquery name="local.qSvcOperation" result="local.result">
select
<m:field_set titleMapOut="local.operationsMap" lengthOut="local.fieldCount">
<m:field title="ID" cfSqlType="CF_SQL_INTEGER">j.svc_operation_id</m:field>
<!--- <m:field title="ID сервиса">j.svc_id</m:field> --->
<m:field title="Операция">j.operation</m:field>
<m:field title="URL">j.url</m:field>
<m:field title="Описание">j.descr</m:field>
<m:field title="Руководство">j.man</m:field>
<m:field>j.svc_operation_id</m:field>
<m:field>j.operation</m:field>
<m:field>j.url</m:field>
<m:field>j.descr</m:field>
<m:field>j.man</m:field>
</m:field_set>
from svc_operation j
where j.svc_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcId#" null=#!isValid('integer',arguments.svcId)#/>
v1/resources/svc_default.cfc
+1 -1
View File
@@ -16,7 +16,7 @@
</cftry>
<cfset var out = {
"svcId":"#arguments.svcId#",
"svcId":"#arguments.svcId*1#",
"displayName":"#generateDefaultName(arguments.svcId,arguments.usrId)#",
"descr":""
}/>
v1/resources/svc_ls.cfc
+1 -1
View File
@@ -99,7 +99,7 @@
<cfset "out.results"=#resultSet#/>
<cfset "out.pageSize"=#arguments.pageSize*1#/>
<cfset "out.page"=#arguments.page#/>
<cfset "out.page"=#arguments.page*1#/>
<cfset "out.orderBy"=#arguments.orderBy#/>
<cfset "out.size"=#arrayLen(resultSet)#/>
<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>
v1/resources/svc_operation.cfc
+4 -4
View File
@@ -37,21 +37,21 @@
<m:field>p.label</m:field>
<m:field>p.data_type</m:field>
<m:field formatter=#function(x){return listToArray(x);}#>p.value_list</m:field>
<m:field cfSqlType="CF_SQL_INTEGER">p.ref_svc_id</m:field>
<m:field cfSqlType="CF_SQL_BIT">p.is_required</m:field>
<m:field>p.ref_svc_id</m:field>
<m:field formatter=#request.castToBool#>p.is_required</m:field>
<m:field>p.default_value</m:field>
<m:field>p.regex</m:field>
<m:field>p.unique_scope</m:field>
<m:field>p.descr</m:field>
<m:field>p.man</m:field>
<m:field>(
<m:field formatter=#request.castToBool#>(
select 1 from svc_operation_cfs_param m
join svc_operation om on m.svc_operation_id=om.svc_operation_id
join svc_operation oc on (om.svc_id=oc.svc_id AND om.operation='modify' AND oc.operation='create')
join svc_operation_cfs_param c on (oc.svc_operation_id=c.svc_operation_id AND m.svc_operation_cfs_param=c.svc_operation_cfs_param)
where c.svc_operation_cfs_param_id=p.svc_operation_cfs_param_id
limit 1
) as modifiable</m:field>
) as isModifiable</m:field>
</m:field_set>
from svc_operation_cfs_param p
where p.svc_operation_id=<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.svcOperationId#" null=#!isValid('integer',arguments.svcOperationId)#/>