json type, user.cfc
This commit is contained in:
msyu
+6
-1
@@ -51,7 +51,7 @@
|
||||
|
||||
//variables.framework.docs={};
|
||||
variables.framework.docs.APIName="Deck API";
|
||||
variables.framework.docs.APIVersion="0.058";
|
||||
variables.framework.docs.APIVersion="0.059";
|
||||
|
||||
variables.framework.globalHeaders = structNew();
|
||||
variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location";
|
||||
@@ -207,6 +207,11 @@
|
||||
}
|
||||
|
||||
var usrCustomerInfo=getUsrCustomerInfo(idpUserData.contactId);
|
||||
|
||||
if (lCase(arguments.cfc) EQ 'user') {
|
||||
if (structIsEmpty(usrCustomerInfo)) return representationOf("User information not found").withStatus(404);
|
||||
}
|
||||
|
||||
if (structIsEmpty(usrCustomerInfo)) return representationOf("Cannot find default specification for current user #result#").withStatus(422); //это создает довольно много лишних движений при отладке
|
||||
arguments.requestArguments.usrId=usrCustomerInfo.usrId; //Integer!
|
||||
arguments.requestArguments.specificationId=usrCustomerInfo.specificationId; //Integer
|
||||
|
||||
@@ -97,8 +97,11 @@
|
||||
<m:field formatter=#request.castToBool#>o.is_successful</m:field>
|
||||
<m:field title="dt_created">to_char(o.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
|
||||
<m:field>o.error_log</m:field>
|
||||
<m:field>u.login as updater_login</m:field>
|
||||
<m:field>u.shortname as updater_shortname</m:field>
|
||||
</m:field_set>
|
||||
from instance_operation o
|
||||
left outer join usr u on (o.updater_id=u.usr_id)
|
||||
left outer join (select instance_operation_uid, max(version) as version from instance_state
|
||||
group by instance_operation_uid) sts on (o.instance_operation_uid=sts.instance_operation_uid)
|
||||
left outer join instance_state status on (sts.instance_operation_uid=status.instance_operation_uid AND sts.version=status.version)
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<cfcomponent extends="taffy.core.resource" taffy:uri="/instances/default/{svcId}" hint="template for default instance">
|
||||
|
||||
<cfsilent>
|
||||
<cfimport prefix="m" taglib="../lib"/>
|
||||
<cfset this.helper=CreateObject("component","lib.rest_api_helper")/>
|
||||
</cfsilent>
|
||||
|
||||
<cffunction name="get" hint="Шаблон экземпляра"><!--- *** TODO проверка принадлежности тенанту --->
|
||||
<cfargument name="svcId" type="string" required=true hint="type:integer"/>
|
||||
<cfargument name="usrId" type="string" required=true hint="type:integer"/><!--- arguments.usrId неявно вбрасывается из Application.cfm --->
|
||||
|
||||
<cftry>
|
||||
<cfset this.helper.validateField(arguments, "svcId", "integer")/>
|
||||
<cfcatch type="invalidParamValue">
|
||||
<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
|
||||
</cfcatch>
|
||||
</cftry>
|
||||
|
||||
<cfset var instance = {
|
||||
"svcId":"#arguments.svcId*1#",
|
||||
"displayName":"#generateDefaultName(arguments.svcId,arguments.usrId)#",
|
||||
"descr":""
|
||||
}/>
|
||||
|
||||
<cfset var out = structNew("linked")/>
|
||||
|
||||
<!--- <cfset var out = structCopy(svc)/> ---><!--- *** иначе, видимо, циклическая ссылка, если мы еще скопируем это внутрь структуры --->
|
||||
|
||||
<cfset "out.instance" = instance/>
|
||||
|
||||
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
|
||||
<cfset "out.runDurationMs"=getTickCount() - request.startTickCount/>
|
||||
<cfreturn representationOf(out) />
|
||||
</cffunction>
|
||||
|
||||
<!--- хотя такая зависимость очень не нравится своим направлением, как бы задом наперед--->
|
||||
<cffunction name="generateDefaultName">
|
||||
<cfargument name="service_id" type="numeric"/>
|
||||
<cfargument name="usr_id" type="numeric"/>
|
||||
|
||||
<cfreturn CreateObject("component", "instance_ls").generateDefaultName(arguments.service_id,arguments.usr_id)/>
|
||||
</cffunction>
|
||||
|
||||
</cfcomponent>
|
||||
+14
-13
@@ -5,7 +5,7 @@
|
||||
<cfset this.helper=CreateObject("component","lib.rest_api_helper")/><!---*** странно, почему мы его видим?---><!---вынести в апп?--->
|
||||
</cfsilent>
|
||||
|
||||
|
||||
<!--- *** Внимание! Особая обработка в Application.cfc по имени user.cfc --->
|
||||
|
||||
|
||||
<cffunction name="get" hint="Контрольная информация по текущему пользователю для проверки контекста. Предполагается использовать только для интеграционной отладки. Исключения перехватываются, всегда возвращается код 200, структура ответа при этом не предназначена для разбора">
|
||||
@@ -15,27 +15,27 @@
|
||||
<cfset var out=structNew("linked")/>
|
||||
|
||||
<cfset "out.usrId"=#ARGUMENTS.usrId#/>
|
||||
<cfset "out.iamServiceUrl"=request.locateIamService()/>
|
||||
<!--- <cfset "out.iamServiceUrl"=request.locateIamService()/> --->
|
||||
|
||||
<cfset "out.serviceLocationDurationMs"=getTickCount() - request.startTickCount/>
|
||||
|
||||
<cftry>
|
||||
<!--- <cftry>
|
||||
<cfset var sAuth=listGetAt(request.ORCHESTRATOR_AUTH,2," ")/>
|
||||
<cfset "out.svcAccount"=listGetAt(toString(ToBinary(sAuth)),1,":")/>
|
||||
<cfcatch type="any"></cfcatch>
|
||||
</cftry>
|
||||
|
||||
<cfset "out.environmentVariables"=structKeyArray(createObject("java", "java.lang.System").getEnv()).sort("textnocase")/>
|
||||
<cfset "out.environmentVariables"=structKeyArray(createObject("java", "java.lang.System").getEnv()).sort("textnocase")/> --->
|
||||
|
||||
<cfquery name=local.qSpec>
|
||||
select
|
||||
<m:field_set titleMapOut="local.specTitleMap" lengthOut="local.fieldCount">
|
||||
<m:field cfSqlType="CF_SQL_INTEGER">s.specification_id</m:field>
|
||||
<m:field>s.specification</m:field>
|
||||
<m:field>(select count(*) from specification_item i where i.specification_id=s.specification_id) as specification_item_count</m:field>
|
||||
<!--- <m:field>s.specification</m:field>
|
||||
<m:field>(select count(*) from specification_item i where i.specification_id=s.specification_id) as specification_item_count</m:field> --->
|
||||
<m:field>c.contract_id</m:field>
|
||||
<m:field>c.contract</m:field>
|
||||
<m:field>to_char(c.dt_contract, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_contract</m:field>
|
||||
<!--- <m:field>c.contract</m:field>
|
||||
<m:field>to_char(c.dt_contract, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_contract</m:field> --->
|
||||
</m:field_set>
|
||||
from specification s
|
||||
join contract c on (s.contract_id=c.contract_id)
|
||||
@@ -44,15 +44,16 @@
|
||||
order by specification_id desc limit 1;
|
||||
</cfquery>
|
||||
|
||||
|
||||
<cfquery name="local.qRead" result="local.result">
|
||||
select
|
||||
<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
|
||||
<m:field cfSqlType="CF_SQL_INTEGER">u.usr_id</m:field>
|
||||
<m:field>u.login</m:field>
|
||||
<!--- <m:field>u.login</m:field> --->
|
||||
<m:field>k.contragent_id</m:field>
|
||||
<m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field>
|
||||
<m:field>k.external_uid::text as external_uid</m:field>
|
||||
<m:field>k.contragent</m:field>
|
||||
<!--- <m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field> --->
|
||||
<!--- <m:field>k.external_uid::text as external_uid</m:field> --->
|
||||
<!--- <m:field>k.contragent</m:field> --->
|
||||
</m:field_set>
|
||||
from usr u
|
||||
left outer join contragent k on u.contragent_id=k.contragent_id
|
||||
@@ -62,7 +63,7 @@
|
||||
|
||||
<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount- out.serviceLocationDurationMs/>
|
||||
|
||||
<cfset var resultSet=[]/>
|
||||
<cfset var resultCollection=[]/>
|
||||
<cfset "out.usr" = (local.qRead.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.titleMap, local.qRead, this.helper.snake2camel) : {}/>
|
||||
<cfset "out.defaultSpecification" = (local.qSpec.recordCount GT 0) ? this.helper.appendRecord(structNew("linked"), "", local.specTitleMap, local.qSpec, this.helper.snake2camel) : {}/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user