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

050 moving fields in instance from root 1/2

Browse Source
This commit is contained in:
msyu
2025-02-06 14:36:32 +03:00
parent 140c582aec
commit 2972ebcf6d
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v1/resources/instance.cfc
+15 -11
View File
@@ -143,6 +143,7 @@
</cfquery>
<cfset var out=structNew("linked")/>
<cfset var local.vaultData=structNew("linked")/>
<cftry><!--- *** надо бы такие вещи делать асинхронно --->
<cfset vaultUrl=""/>
@@ -178,14 +179,14 @@
<!--- *** костыль для перехода от формата v001 к v002 --->
<cfif structKeyExists(instanceData,"vault") AND structKeyExists(instanceData.vault,"fields")>
<cfset local.tempVaultData = #deserializeJson(cred.filecontent).data.data#/>
<cfset "out.vaultData" = #structNew("linked")#/>
<cfset "local.vaultData" = #structNew("linked")#/>
<!--- <cfset "out.vaultData" = #local.tempVaultData#/> --->
<cfloop collection=#instanceData.vault.fields# index="i">
<cfset var fld=instanceData.vault.fields[i]/>
<cfset out.vaultData[fld] = local.tempVaultData[fld]/>
<cfset local.vaultData[fld] = local.tempVaultData[fld]/>
</cfloop>
<cfelse>
<cfset "out.vaultData" = #deserializeJson(cred.filecontent).data.data#/>
<cfset "local.vaultData" = #deserializeJson(cred.filecontent).data.data#/>
</cfif>
<cfcatch type="ANY">
@@ -206,9 +207,9 @@
<cfhttpparam type="HEADER" name="X-Vault-Token" value="#client_token#">
</cfhttp>
<!--- <cfdump var=#deserializeJson(cred.filecontent)#/> --->
<cfset "out.vaultData.subusers[i].userName"=#instanceData.subusers[i].userName#/>
<cfset "out.vaultData.subusers[i].subUserAccess"=#instanceData.subusers[i].subUserAccess#/>
<cfset "out.vaultData.subusers[i].vaultData"=#deserializeJson(cred.filecontent).data.data#/>
<cfset "local.vaultData.subusers[i].userName"=#instanceData.subusers[i].userName#/>
<cfset "local.vaultData.subusers[i].subUserAccess"=#instanceData.subusers[i].subUserAccess#/>
<cfset "local.vaultData.subusers[i].vaultData"=#deserializeJson(cred.filecontent).data.data#/>
<!--- #instanceData.subusers[i].userName# (#instanceData.subusers[i].subUserAccess#)
<cfdump var=#deserializeJson(cred.filecontent).data.data#/> --->
</cfloop>
@@ -223,17 +224,20 @@
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
<!--- deprecated --->
<cfset "out.uptime"=(local.qOperation.is_successful GT 0) ? local.qOperation.seconds_passed : 0/>
<cfset "out.isCreated"=local.isCreated/>
<cfset "out.isDeleted"=qCurrentState.is_deleted GT 0/><!--- он все время пытается привести true к 1
--->
<!--- <cfset var rec={}/>
<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qInstance, this.helper.snake2camel)/>
<cfset "out.instance"=rec/> --->
<cfset "out.isDeleted"=qCurrentState.is_deleted GT 0/>
<cfset "out.vaultData"=local.vaultData/>
<!--- /deprecated --->
<cfset "out.instance" = this.helper.appendRecord(
structNew("linked"), "", local.titleMap, local.qInstance, this.helper.snake2camel
)/>
<cfset "out.instance.uptime"=(local.qOperation.is_successful GT 0) ? local.qOperation.seconds_passed : 0/>
<cfset "out.instance.isCreated"=local.isCreated/>
<cfset "out.instance.isDeleted"=qCurrentState.is_deleted GT 0/>
<cfset "out.instance.vaultData"=local.vaultData/>
<cfset "out.instance.state" = (local.qCurrentState.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.currentStateTitleMap, local.qCurrentState, this.helper.snake2camel) : {}/>
<!--- <cfset "out.instance.operation"=this.helper.appendRecord(structNew("linked"), "", local.operationTitleMap, local.qOperation, this.helper.snake2camel)/> --->