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

023 availableResourceRealms bugfix

Browse Source
This commit is contained in:
msyu
2025-04-07 23:14:51 +03:00
parent 2562d353fa
commit da5f32b6a7
4 changed files with 9 additions and 10 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={};
variables.framework.docs.APIName="Deck API"; variables.framework.docs.APIName="Deck API";
variables.framework.docs.APIVersion="0.082"; variables.framework.docs.APIVersion="0.083";
variables.framework.globalHeaders = structNew(); variables.framework.globalHeaders = structNew();
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
v1/resources/instance.cfc
+2 -2
View File
@@ -315,9 +315,9 @@
<cfif structKeyExists(arguments,"displayName")> <cfif structKeyExists(arguments,"displayName")>
,display_name=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#" /> ,display_name=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#" />
</cfif> </cfif>
<cfif structKeyExists(arguments,"displayName")> <!--- <cfif structKeyExists(arguments,"displayName")>
,resource_realm_id=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.resourceRealmId#" /> ,resource_realm_id=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.resourceRealmId#" />
</cfif> </cfif> --->
<cfif structKeyExists(arguments,"descr")> <cfif structKeyExists(arguments,"descr")>
,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" /> ,descr=<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" />
</cfif> </cfif>
v1/resources/instance_ls.cfc
+4 -5
View File
@@ -135,8 +135,8 @@
<m:field>e.instance_uid::text as instance_uid</m:field> <m:field>e.instance_uid::text as instance_uid</m:field>
<m:field>e.display_name</m:field> <m:field>e.display_name</m:field>
<m:field>e.service_id</m:field> <m:field>e.service_id</m:field>
<m:field>e.resource_realm_id</m:field> <!--- <m:field>e.resource_realm_id</m:field> --->
<m:field>r.resource_realm</m:field> <!--- <m:field>r.resource_realm</m:field> --->
<m:field>e.specification_item_id</m:field> <m:field>e.specification_item_id</m:field>
<m:field formatter=#request.castToBool#>e.is_auxiliary</m:field> <m:field formatter=#request.castToBool#>e.is_auxiliary</m:field>
<m:field>d.contract_id</m:field> <m:field>d.contract_id</m:field>
@@ -162,7 +162,7 @@
<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.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#>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</m:field><!--- attention it is not bool in state ---> <m:field formatter=#request.castToBool#>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</m:field><!--- attention it is not bool in state --->
<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 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 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>(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>(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 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> <m:field>
(case (case
@@ -333,14 +333,13 @@
<cfquery name="local.qSave"> <cfquery name="local.qSave">
insert into instance insert into instance
(instance_uid, display_name, service_id, specification_item_id, resource_realm_id, descr, dt_created, creator_id, dt_updated, updater_id) (instance_uid, display_name, service_id, specification_item_id, descr, dt_created, creator_id, dt_updated, updater_id)
values values
( (
<cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceUid#" /> <cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceUid#" />
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#"/> ,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.displayName#"/>
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.serviceId#" /> ,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.serviceId#" />
,<cfqueryparam cfsqltype="cf_sql_integer" value="#local.qSpecItem.specification_item_id#" /> ,<cfqueryparam cfsqltype="cf_sql_integer" value="#local.qSpecItem.specification_item_id#" />
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.resourceRealmId#" />
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" /> ,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.descr#" />
,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" /> ,<cfqueryparam cfsqltype="cf_sql_timestamp" value="#Now()#" />
,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" /> ,<cfqueryparam cfsqltype="cf_sql_integer" value="#arguments.usrId#" />
v1/resources/instance_operation_ls.cfc
+2 -2
View File
@@ -41,8 +41,8 @@
<cftry> <cftry>
<cfquery name="local.qSave"> <cfquery name="local.qSave">
insert into instance_operation insert into instance_operation
(instance_uid, instance_operation_uid, operation, dt_created, creator_id, dt_updated, updater_id,resource_realm_id) (instance_uid, instance_operation_uid, operation, dt_created, creator_id, dt_updated, updater_id, resource_realm_id)
values values
( (
<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceUid#" /> <cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceUid#" />
,<cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceOperationUid#" /> ,<cfqueryparam cfsqltype="cf_sql_other" value="#local.instanceOperationUid#" />