diff --git a/v1/Application.cfc b/v1/Application.cfc index 8dc0356..3d8ba16 100644 --- a/v1/Application.cfc +++ b/v1/Application.cfc @@ -51,7 +51,7 @@ //variables.framework.docs={}; variables.framework.docs.APIName="Deck API"; - variables.framework.docs.APIVersion="0.078"; + variables.framework.docs.APIVersion="0.079"; variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; diff --git a/v1/lib/field_set.cfm b/v1/lib/field_set.cfm index a6e0d33..76ad965 100644 --- a/v1/lib/field_set.cfm +++ b/v1/lib/field_set.cfm @@ -4,6 +4,7 @@ + @@ -11,6 +12,7 @@ + @@ -42,6 +44,15 @@ + + + + + + + + + diff --git a/v1/resources/instance.cfc b/v1/resources/instance.cfc index 7e104f1..c37bc32 100644 --- a/v1/resources/instance.cfc +++ b/v1/resources/instance.cfc @@ -37,6 +37,7 @@ e.updater_id u.login as updater_login u.shortname as updater_shortname + (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 from instance e left outer join specification_item i on (e.specification_item_id=i.specification_item_id) diff --git a/v1/resources/instance_ls.cfc b/v1/resources/instance_ls.cfc index 7db049f..bfc9a95 100644 --- a/v1/resources/instance_ls.cfc +++ b/v1/resources/instance_ls.cfc @@ -31,6 +31,7 @@ "instance_state_uid"={prefix="inr", type="guid"}, "is_deleted"={prefix="inr", type="string"}, "suspended"={prefix="inr", type="string"}, + "resourceRealm"={prefix="inr", type="string"}, "is_test"={prefix="inr", type="boolean"}, "is_auxiliary"={prefix="inr", type="boolean"}, "explained_status"={prefix="inr", type="string"}, @@ -79,7 +80,10 @@ - + + + + select count(*) as cnt from ( @@ -119,6 +123,7 @@ (select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test coalesce((select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1),'false') as is_deleted (select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended + (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 (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 (case @@ -196,6 +201,7 @@ (select st.is_test from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as is_test coalesce((select st.instance_data->>'isDeleted' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1),'false') as is_deleted (select st.instance_data->>'suspended' from instance_state st where st.instance_uid=e.instance_uid order by version desc limit 1) as suspended + (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 (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 (case