diff --git a/v1/Application.cfc b/v1/Application.cfc index ee5fab9..f7e7b8d 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -51,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="svc-api"; - variables.framework.docs.APIVersion="0.162"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.163"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/resources/instance_operation_ls.cfc b/v1/resources/instance_operation_ls.cfc index ebae8f4..6b9ca70 100644 --- a/v1/resources/instance_operation_ls.cfc +++ b/v1/resources/instance_operation_ls.cfc @@ -4,10 +4,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + + o.operation + o.instance_operation_uid::text as instance_operation_uid + o.instance_uid::text as instance_uid + to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created + to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated + to_char(o.dt_submit, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_submit + o.submit_result + to_char(o.dt_start, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_start + to_char(o.dt_finish, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_finish + extract('epoch' from coalesce(o.dt_finish,CURRENT_TIMESTAMP)- o.dt_start) as duration + o.is_successful + e.display_name + e.service_id + v.svc + i.specification_item_id + s.specification_id + d.contract_id + o.creator_id + o.updater_id + c.login as creator_login + c.email as creator_email + u.login as updater_login + u.email as updater_email + + from instance_operation o + join instance e on (o.instance_uid=e.instance_uid) + left outer join specification_item i on (e.specification_item_id=i.specification_item_id) + left outer join specification s on (i.specification_id=s.specification_id) + left outer join contract d on (s.contract_id=d.contract_id) + left outer join svc v on (e.service_id=v.svc_id) + left outer join usr c on (e.creator_id=c.usr_id) + left outer join usr u on (u.updater_id=u.usr_id) + where + s.specification_id= + + order by + limit #maxrows# + + + + + + select count(*) as cnt + from instance_operation o + join instance e on (o.instance_uid=e.instance_uid) + left outer join specification_item i on (e.specification_item_id=i.specification_item_id) + left outer join specification s on (i.specification_id=s.specification_id) + where + s.specification_id= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/v1/resources/svc_grouped_ls.cfc b/v1/resources/svc_grouped_ls.cfc index e982f67..6f62d36 100644 --- a/v1/resources/svc_grouped_ls.cfc +++ b/v1/resources/svc_grouped_ls.cfc @@ -1,5 +1,7 @@ + + diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc index b4ddc5e..08249ae 100644 --- a/v1/resources/svc_ls.cfc +++ b/v1/resources/svc_ls.cfc @@ -8,26 +8,27 @@ - "resource_realm_type_id"={type="integer"}, - "sort"={type="integer"}, - "is_production_ready"={type="boolean"}, - "svc"={type="string"}, - "svc_short"={type="string"}, - "svc_extended_name"={type="string"}, - "orchestrator_name"={type="string"}, - "synonyms"={type="string"}, - "code"={type="string"}, - "version"={type="string"}, - "descr"={type="string"}, - "man"={type="string"}, - "resource_realm_cnt"={type="integer"} + "resource_realm_type_id"={prefix="sv", type="integer"}, + "sort"={prefix="sv", type="integer"}, + "is_production_ready"={prefix="sv", type="boolean"}, + "svc"={prefix="sv", type="string"}, + "svc_short"={prefix="sv", type="string"}, + "svc_extended_name"={prefix="sv", type="string"}, + "orchestrator_name"={prefix="sv", type="string"}, + "synonyms"={prefix="sv", type="string"}, + "code"={prefix="sv", type="string"}, + "version"={prefix="sv", type="string"}, + "descr"={prefix="sv", type="string"}, + "man"={prefix="sv", type="string"}, + "resource_realm_cnt"={prefix="sv", type="integer"} } /> + @@ -152,36 +153,16 @@ (coalesce(s.svc,'') ||' '|| coalesce(s.svc_short,'') ||' '|| coalesce(s.synonyms,'')) as svc_extended_name - - - - - - + + - select #local.fieldsToOutput#* from + select #local.definedRecordFields#* from ( select @@ -201,7 +182,7 @@ ) sv where 1=1 - order by + order by