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

run bug fixes

Browse Source
This commit is contained in:
msyu
2024-11-09 18:14:15 +03:00
parent c0ddf96357
commit 89ecbb4083
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance_operation_run.cfc
+13 -10
View File
@@ -30,7 +30,6 @@
<!--- <cfreturn representationOf("Not Implemented yet").withStatus(501)/> --->
<cfreturn noData()
.withHeaders({location: "./#local.instanceUid#"})
@@ -162,14 +161,18 @@
charset="utf-8"
result="job"
>
<cfhttpparam type="HEADER" name="Authorization" value="#ORCHESTRATOR_AUTH#">
<cfhttpparam type="HEADER" name="Authorization" value="#request.ORCHESTRATOR_AUTH#">
<cfhttpparam type="HEADER" name="Accept" value="application/json">
</cfhttp>
</cfhttp>
<cfset var jobData=#deserializeJson(job.filecontent)#/>
<!--- jobData: <cfdump var=#jobData#/> --->
<cfset operation_url=jobData.executable.url />
<cfquery name="qSetStatusUrl" datasource="#request.DS#">
<cfquery name="qSetStatusUrl">
update instance_operation
set status_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#operation_url#wfapi/describe"/>
where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#instance_operation_uid#/>
set status_url=<cfqueryparam cfsqltype="cf_sql_varchar" value="#operation_url#api/json"/><!--- *** костыль --->
where instance_operation_uid=<cfqueryparam cfsqltype="cf_sql_other" value=#arguments.instanceOperationUid#/>
</cfquery>
<cfcatch type="any">
@@ -181,15 +184,15 @@
</cffunction>
<cffunction name="setInstanceOperationRfsParam">
<cfargument name="instance_operation_uid" type="guid">
<cfargument name="instanceOperationUid" type="guid">
<cfargument name="param"><!--- значение не должно содержать лишних пробелов, чувствительность к регистру определяется БД --->
<cfargument name="val">
<cfquery name="qSaveRfsParam">
insert into instance_operation_param (instance_operation_uid,param,param_value)
values (
<cfqueryparam cfsqltype="cf_sql_other" value="#ARGUMENTS.instance_operation_uid#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#ARGUMENTS.param#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#ARGUMENTS.val#"/>
<cfqueryparam cfsqltype="cf_sql_other" value="#arguments.instanceOperationUid#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.param#"/>
,<cfqueryparam cfsqltype="cf_sql_varchar" value="#arguments.val#"/>
)
/*PostgreSQL specific*/
ON CONFLICT (instance_operation_uid,param)