From d67fca8671d311836d26eff72b212fee7ee3c845 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Thu, 7 Nov 2024 06:19:01 +0300
Subject: [PATCH] debug

---
 v1/resources/notification_ls.cfc | 163 +++++++++++++++----------------
 1 file changed, 80 insertions(+), 83 deletions(-)

diff --git a/v1/resources/notification_ls.cfc b/v1/resources/notification_ls.cfc
index a6b58fd..ba03512 100644
--- a/v1/resources/notification_ls.cfc
+++ b/v1/resources/notification_ls.cfc
@@ -21,94 +21,91 @@
 		<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=""/>
 
-		<cftry>
+		<cftry>	<!--- отладка на время проблемы 404 --->	
+			<cfset local={}/>			
 		
-		<cfset local={}/>
-		
-		<cfreturn representationOf("test 1")/>
-		
-		<!---parse and validate request parameters--->
-		<cftry>
-			<cfset this.helper.validateField(arguments, "pageSize", "integer")/>
-			<cfset this.helper.validateField(arguments, "page", "integer")/>
+			<!---parse and validate request parameters--->
+			<cftry>
+				<cfset this.helper.validateField(arguments, "pageSize", "integer")/>
+				<cfset this.helper.validateField(arguments, "page", "integer")/>
+				
+				<!---мы мирно игнорируем поля, отсутствующие в спецификации, что позволяет не делать исключения для orderBy и т.п.--->
+				<cfset var filter=this.helper.parseFilterParams(this.fieldsSpec)/>
+				<!--- <cfset var order=this.helper.parseOrderBy(this.fieldsSpec, arguments.orderBy)/> --->
+				
+				<cfcatch type="invalidParamValue"><cfreturn representationOf("Проверка связи 3")>
+					<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
+				</cfcatch>
+				<cfcatch type="any">
+					<cfreturn representationOf(cfcatch)/>				
+				</cfcatch>
+			</cftry>				
 			
-			<!---мы мирно игнорируем поля, отсутствующие в спецификации, что позволяет не делать исключения для orderBy и т.п.--->
-			<cfset var filter=this.helper.parseFilterParams(this.fieldsSpec)/>
-			<!--- <cfset var order=this.helper.parseOrderBy(this.fieldsSpec, arguments.orderBy)/> --->
+			<cfset var out={}/>
+			<cfset var maxrows=arguments.pageSize*arguments.page/>
+			<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/>
 			
-			<cfcatch type="invalidParamValue"><cfreturn representationOf("Проверка связи 3")>
-				<cfreturn representationOf(this.helper.formatBadRequestError(cfcatch)).withStatus(400)/>
-			</cfcatch>
+			<cfset request.locateIamService()/> 		
+			
+			<cfquery name="local.qRead" result="local.result">
+				select 
+				<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
+					<m:field>n.notification_uid::text as notification_uid</m:field>
+					<m:field>n.notification</m:field>
+					<m:field>n.descr</m:field>
+					<m:field>n.contragent_id</m:field>
+					<m:field>k.external_uid</m:field>
+					<m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field>
+					<m:field>to_char(n.dt_show_from, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_from</m:field>
+					<m:field>to_char(n.dt_show_to, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_to</m:field>
+	<!--- 				<m:field>to_char(n.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
+					<m:field>to_char(n.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field> --->
+				</m:field_set>	
+				from notification n 
+				left outer join contragent k on (n.contragent_id=k.contragent_id)
+				where 1=1 <m:filter_build filter=#filter#/>
+				AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL)
+				AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL)
+				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#
+			</cfquery>  
+			
+
+			<cfquery name="local.qTotal">
+				select count(*) as cnt
+				from notification n 
+				left outer join contragent k on (n.contragent_id=k.contragent_id)
+				where 1=1
+				AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL)
+				AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL)
+				AND (k.external_uid = <cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> OR n.contragent_id IS NULL)
+			</cfquery> 
+
+			<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
+			<cfset "out.total"=#local.qTotal.cnt#/>
+			
+			<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#/>
+			<cfset "out.page"=#arguments.page#/>
+			<cfset "out.orderBy"=#arguments.orderBy#/>
+			<cfset "out.size"=#arrayLen(resultSet)#/>
+			<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
+			<!---<cfset "out.sql"=#local.result.sql#/>--->	
+			<cfreturn representationOf(out)/>	
+
 			<cfcatch type="any">
-				<cfreturn representationOf(cfcatch)/>				
+				<cfreturn representationOf(cfcatch)/>
 			</cfcatch>
-		</cftry>		
-		
-		
-		<cfset var out={}/>
-		<cfset var maxrows=arguments.pageSize*arguments.page/>
-		<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/>
-		
-		<cfset request.locateIamService()/> 		
-		
- 		<cfquery name="local.qRead" result="local.result">
-			select 
-			<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
-				<m:field>n.notification_uid::text as notification_uid</m:field>
-				<m:field>n.notification</m:field>
-				<m:field>n.descr</m:field>
-				<m:field>n.contragent_id</m:field>
-				<m:field>k.external_uid</m:field>
-				<m:field><cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> as arguments_company_uid</m:field>
-				<m:field>to_char(n.dt_show_from, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_from</m:field>
-				<m:field>to_char(n.dt_show_to, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_show_to</m:field>
-<!--- 				<m:field>to_char(n.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
-				<m:field>to_char(n.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field> --->
-			</m:field_set>	
-			from notification n 
-			left outer join contragent k on (n.contragent_id=k.contragent_id)
-			where 1=1 <m:filter_build filter=#filter#/>
-			AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL)
-			AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL)
-			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#
-		</cfquery>  
-		
-
-		<cfquery name="local.qTotal">
-			select count(*) as cnt
-			from notification n 
-			left outer join contragent k on (n.contragent_id=k.contragent_id)
-			where 1=1
-			AND (n.dt_show_from <= CURRENT_TIMESTAMP OR n.dt_show_from IS NULL)
-			AND (n.dt_show_to >= CURRENT_TIMESTAMP OR n.dt_show_to IS NULL)
-			AND (k.external_uid = <cfqueryparam cfsqltype="cf_sql_other" value=#arguments.companyUid#/> OR n.contragent_id IS NULL)
-		</cfquery> 
-
-		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
-		<cfset "out.total"=#local.qTotal.cnt#/>
-		
-		<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#/>
-		<cfset "out.page"=#arguments.page#/>
-		<cfset "out.orderBy"=#arguments.orderBy#/>
-		<cfset "out.size"=#arrayLen(resultSet)#/>
-		<cfset "out.runDurationMs"=getTickCount()-request.startTickCount/>	
-		<!---<cfset "out.sql"=#local.result.sql#/>--->	
-		<cfreturn representationOf(out)/>	
-
-		<cfcatch type="any">
-			<cfreturn representationOf(cfcatch)/>
-		</cfcatch>
+		</cftry>
 		
 	</cffunction>