diff --git a/v1/Application.cfc b/v1/Application.cfc index d32f5bd..ee5fab9 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.161"; /*$ git config --global --unset user.password*/ + variables.framework.docs.APIVersion="0.162"; /*$ git config --global --unset user.password*/ variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/resources/svc_grouped_ls.cfc b/v1/resources/svc_grouped_ls.cfc index d28f0df..e982f67 100644 --- a/v1/resources/svc_grouped_ls.cfc +++ b/v1/resources/svc_grouped_ls.cfc @@ -22,7 +22,8 @@ descr={prefix="s", type="string"}, man={prefix="s", type="string"}, svc_group_id={prefix="sg", type="integer"}, - svc_group={prefix="g", type="string"} + svc_group={prefix="g", type="string"}, + resource_realm_cnt={type="integer"} } /> @@ -74,10 +75,25 @@ sg.svc_group_id g.svc_group (coalesce(s.svc,'') ||' '|| coalesce(s.svc_short,'') ||' '|| coalesce(s.synonyms,'')) as svc_extended_name + (select count(distinct r.resource_realm) + from resource_realm r + join resource_realm_access a on ( + r.resource_realm_id=a.resource_realm_id + AND (a.contract_id IN ( + select contract_id + from contract d + where d.contragent_id=k.contragent_id AND NOT d.is_closed + ) OR a.contract_id=0) /*0 means access to any contract*/ + AND a.is_enabled) + where r.resource_realm_type_id=s.resource_realm_type_id) as resource_realm_cnt + from svc s left outer join svc_group_svc sg on (s.svc_id=sg.svc_id AND sg.is_enabled) left outer join svc_group g on (sg.svc_group_id=g.svc_group_id) + left outer join contragent k on ( + k.external_uid= + ) where 1=1 order by g.sort, g.svc_group_id length limit---> diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc index e7c6644..b4ddc5e 100644 --- a/v1/resources/svc_ls.cfc +++ b/v1/resources/svc_ls.cfc @@ -23,7 +23,8 @@ "code"={type="string"}, "version"={type="string"}, "descr"={type="string"}, - "man"={type="string"} + "man"={type="string"}, + "resource_realm_cnt"={type="integer"} } />