0.058 resultSetSize

v1/Application.cfc

@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.057";
+		variables.framework.docs.APIVersion="0.058";
 		
 		variables.framework.globalHeaders = structNew();
 		variables.framework.globalHeaders["Access-Control-Expose-Headers"] = "Location"; 

v1/resources/instance_ls.cfc

@@ -150,8 +150,8 @@
 			<!--- u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/> --->			
 			<cfif len(arguments.search)>
 				AND (
-				e.display_name like <cfqueryparam cfsqltype="cf_sql_varchar" value='%#arguments.search#%'/>
+				lower(e.display_name) like lower(<cfqueryparam cfsqltype="cf_sql_varchar" value='%#arguments.search#%'/>)
-				OR v.svc like <cfqueryparam cfsqltype="cf_sql_varchar" value='%#arguments.search#%'/>
+				OR lower(v.svc) like lower(<cfqueryparam cfsqltype="cf_sql_varchar" value='%#arguments.search#%'/>)
 				)
 			</cfif>
 			
@@ -159,7 +159,7 @@
 			where 1=1 <m:filter_build filter=#filter#/>
 			<!--- order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/> ---><!--- из-за нефиксированного числа колонок труднее становится использовать цифровую нотацию --->
 			order by <m:order_build sortCollection=#order# fieldCount=0 defaultOrder="1 desc"/><!---no sort length limit--->
-			limit #maxrows#
+			--limit #maxrows#
 		</cfquery>
 		<!---<cfdump var=#local.qRead#/><cfabort/> ---> 
 		<!--- formatter=#function(x){if (isNull(x)) {return x} else {return (x NEQ 0)}}# --->
@@ -173,6 +173,7 @@
 			join contragent k on (d.contragent_id=k.contragent_id)
 			--join usr u on (k.contragent_id=u.contragent_id)			
 			join svc v on (e.service_id=v.svc_id)
+			<!--- specificationId инжектируется в arguments scope в Application.cfc --->
 			where  s.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
 			<!--- u.usr_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.usrId#/>	 --->
 		</cfquery> 
@@ -181,21 +182,20 @@
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
 		<cfset "out.total"=#local.qTotal.cnt#/>
-		
+		<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
-		<cfset var resultSet=[]/>
-		<cfloop query=#local.qRead# startRow=#startrow#>
-			<cfset var rec=structNew("linked")/>				
-			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
-			<cfset arrayAppend(resultSet, rec)/>
-		</cfloop>
-		
-		<cfset "out.size"=#arrayLen(resultSet)#/>
 		<cfset "out.pageSize"=#arguments.pageSize*1#/>
 		<cfset "out.page"=#arguments.page*1#/>
 		<cfset "out.orderBy"=#arguments.orderBy#/>	
 		
+		<cfset var resultCollection=[]/>
+		<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
+			<cfset var rec=structNew("linked")/>				
+			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
+			<cfset arrayAppend(resultCollection, rec)/>
+		</cfloop>
 		
-		<cfset "out.results"=#resultSet#/>		
+		<cfset "out.size"=#arrayLen(resultCollection)#/>		
+		<cfset "out.results"=#resultCollection#/>		
 		<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
 		<!---<cfset "out.sql"=#local.result.sql#/>--->	
 		<cfreturn representationOf(out)/>

v1/resources/instance_operation_cfs_param_ls.cfc

@@ -23,7 +23,7 @@
 	/>
 
 	<cffunction name="get" hint="Список CFS параметров">
-		<cfargument name="pageSize" type="string" hint="type:integer" default="100"/>	
+		<cfargument name="pageSize" type="string" hint="type:integer" default="1000"/>	<!--- *** тут на самом деле есть лимит --->
 		<cfargument name="page" type="string" hint="type:integer" default="1"/>	
 		<cfargument name="orderBy" type="string" hint="type:string, description:comma-separated list of fields to sort by, example:fld1.ASC,fld2.DESC,fld3.ASC" default=""/>
 		
@@ -75,7 +75,7 @@
 			AND si.specification_id=<cfqueryparam cfsqltype="cf_sql_integer" value=#arguments.specificationId#/>
 			<m:filter_build filter=#filter#/>
 			order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
-			limit #maxrows#
+			--limit #maxrows#
 		</cfquery>
 		
 		<cfquery name="local.qTotal">
@@ -86,19 +86,20 @@
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
 		<cfset "out.total"=#local.qTotal.cnt#/>
-		
+		<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
-		<cfset var resultSet=[]/>
-		<cfloop query=#local.qRead# startRow=#startrow#>
-			<cfset var rec={}/>				
-			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
-			<cfset arrayAppend(resultSet, rec)/>
-		</cfloop>
-
-		<cfset "out.results"=#resultSet#/>
 		<cfset "out.pageSize"=#arguments.pageSize*1#/>
 		<cfset "out.page"=#arguments.page*1#/>
 		<cfset "out.orderBy"=#arguments.orderBy#/>
-		<cfset "out.size"=#arrayLen(resultSet)#/>
+		
+		<cfset var resultCollection=[]/>
+		<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
+			<cfset var rec={}/>				
+			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
+			<cfset arrayAppend(resultCollection, rec)/>
+		</cfloop>
+		
+		<cfset "out.size"=#arrayLen(resultCollection)#/>
+		<cfset "out.results"=#resultCollection#/>		
 		<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
 		<!---<cfset "out.sql"=#local.result.sql#/>--->	
 		<cfreturn representationOf(out)/>
@@ -156,11 +157,6 @@
 				<cfreturn representationOf(this.helper.formatMessage("Invalid CFS parameter", "Parameter specified does not belong to this operation")).withStatus(400)/>
 			</cfif>					
 	
-<!--- 			<cfset var msg=checkParam(arguments.svcOperationCfsParamId, arguments.paramValue)/>
-			<cfif len(msg)>
-				<cfreturn representationOf(this.helper.formatMessage("Invalid CFS parameter value", msg)).withStatus(400)/>
-			</cfif> --->
-			
 			<cfquery name="local.qSave">
 				insert into instance_operation_cfs_param (	
 					instance_operation_cfs_param_uid,instance_operation_uid,svc_operation_cfs_param_id,param_value,note,dt_created,creator_id

v1/resources/notification_ls.cfc

@@ -69,7 +69,7 @@
 				AND (k.external_uid = <cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> OR n.contragent_id IS NULL)
 				order by dt_show_from desc
 				<!--- <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/>--->
-				limit #maxrows#
+				--limit #maxrows#
 			</cfquery>  
 			
 
@@ -85,19 +85,20 @@
 
 			<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
 			<cfset "out.total"=#local.qTotal.cnt#/>
-			
+			<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
-			<cfset var resultSet=[]/>
-			<cfloop query=#local.qRead# startRow=#startrow#>
-				<cfset var rec={}/>				
-				<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
-				<cfset arrayAppend(resultSet, rec)/>
-			</cfloop>
-
-			<cfset "out.results"=#resultSet#/>
 			<cfset "out.pageSize"=#arguments.pageSize*1#/>
 			<cfset "out.page"=#arguments.page*1#/>
 			<cfset "out.orderBy"=#arguments.orderBy#/>
-			<cfset "out.size"=#arrayLen(resultSet)#/>
+			
+			<cfset var resultCollection=[]/>
+			<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
+				<cfset var rec={}/>				
+				<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
+				<cfset arrayAppend(resultCollection, rec)/>
+			</cfloop>
+			
+			<cfset "out.size"=#arrayLen(resultCollection)#/>
+			<cfset "out.results"=#resultCollection#/>
 			<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
 			<!---<cfset "out.sql"=#local.result.sql#/>--->	
 			<cfreturn representationOf(out)/>	

v1/resources/resource_realm_ls.cfc

@@ -65,9 +65,10 @@
 			from resource_realm r
 			join resource_realm_type t on (r.resource_realm_type_id=t.resource_realm_type_id)
 			left outer join resource_realm p on (r.parent_id=p.resource_realm_id)
+			--join resource_realm_access a on a.  
 			where 1=1 <m:filter_build filter=#filter#/>
 			order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
-			limit #maxrows#
+			--limit #maxrows#
 		</cfquery>  
 		
 		<cftry>
@@ -85,20 +86,20 @@
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
 		<cfset "out.total"=#local.qTotal.cnt#/>
-		<!--- <cfset "out.test"=true/> --->
+		<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
-		
-		<cfset var resultSet=[]/>
-		<cfloop query=#local.qRead# startRow=#startrow#>
-			<cfset var rec=structNew("linked")/>				
-			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
-			<cfset arrayAppend(resultSet, rec)/>
-		</cfloop>
-
-		<cfset "out.results"=#resultSet#/>
 		<cfset "out.pageSize"=#arguments.pageSize*1#/>
 		<cfset "out.page"=#arguments.page*1#/>
 		<cfset "out.orderBy"=#arguments.orderBy#/>	
-		<cfset "out.size"=#arrayLen(resultSet)#/>
+		
+		<cfset var resultCollection=[]/>
+		<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
+			<cfset var rec=structNew("linked")/>				
+			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
+			<cfset arrayAppend(resultCollection, rec)/>
+		</cfloop>		
+
+		<cfset "out.size"=#arrayLen(resultCollection)#/>		
+		<cfset "out.results"=#resultCollection#/>
 		<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
 		<cfreturn representationOf(out)/>		
 		

v1/resources/svc_ls.cfc

@@ -48,7 +48,7 @@
 		</cftry>		
 		
 		
-		<cfset var out={}/>
+		<cfset var out=structNew("linked")/>
 		<cfset var maxrows=arguments.pageSize*arguments.page/>
 		<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/>
 		
@@ -75,7 +75,7 @@
 			from svc s 
 				where 1=1 			<m:filter_build filter=#filter#/>
 				order by <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort length limit--->
-				limit #maxrows#
+				--limit #maxrows#
 		</cfquery>  
 		
 		<cftry>
@@ -94,28 +94,24 @@
 
 		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
 		<cfset "out.total"=#local.qTotal.cnt#/>
-		<!--- <cfset "out.test"=true/> --->
+		<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
-		
-		<cfset var resultSet=[]/>
-		<cfloop query=#local.qRead# startRow=#startrow#>
-			<cfset var rec={}/>				
-			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
-			<cfset arrayAppend(resultSet, rec)/>
-		</cfloop>
-
-		<cfset "out.results"=#resultSet#/>
 		<cfset "out.pageSize"=#arguments.pageSize*1#/>
 		<cfset "out.page"=#arguments.page*1#/>
 		<cfset "out.orderBy"=#arguments.orderBy#/>
-		<cfset "out.size"=#arrayLen(resultSet)#/>
+		
+		<cfset var resultCollection=[]/>
+		<cfloop query=#local.qRead# startRow=#startrow# endRow=#(startrow+maxrows-1)#>
+			<cfset var rec={}/>				
+			<cfset this.helper.appendRecord(rec, "", local.titleMap, local.qRead, this.helper.snake2camel)/>
+			<cfset arrayAppend(resultCollection, rec)/>
+		</cfloop>		
+
+		<cfset "out.size"=#arrayLen(resultCollection)#/>
+		<cfset "out.results"=#resultCollection#/>
 		<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
 		<!---<cfset "out.sql"=#local.result.sql#/>--->	
 		<cfreturn representationOf(out)/>		
 		
 	</cffunction> 
 
-<!--- 	<cffunction name="get" hint="проверка">
-	<cfreturn representationOf("Проверка связи")/>
-	</cffunction> --->
-
 </cfcomponent>

v1/resources/svc_operation.cfc

@@ -39,7 +39,8 @@
 				<m:field formatter=#function(x){return listToArray(x);}#>p.value_list</m:field>
 				<m:field>p.ref_svc_id</m:field>
 				<m:field formatter=#request.castToBool#>p.is_required</m:field>
-				<m:field>p.default_value</m:field>
+				<m:field>p.default_value</m:field><!--- can be overridden bu default_compute --->
+				<m:field>p.default_compute</m:field>
 				<m:field>p.regex</m:field>
 				<m:field>p.unique_scope</m:field>
 				<m:field>p.maxlength</m:field>
@@ -82,4 +83,19 @@
 		<cfreturn representationOf(out) />
 	</cffunction>	
 	
+	<!--- *** выглядит ужасно, но красивый вариант не придумывается ряд месяцев --->
+	<cffunction name="computeDefault">
+		<cfargument name="defaultCompute"/>
+		<cfargument name="original"/>
+		
+		<cfswitch expression=#arguments.defaultCompute#>
+			<cfcase value="display_name">
+			</cfcase>
+			<cfdefaultcase>
+				<cfreturn #arguments.original#/>
+			</cfdefaultcase>
+		</cfswitch>
+		
+	</cffunction>
+
 </cfcomponent>