From f0d0bda87cf5be3f5902e3b8e483e7a9b02e6265 Mon Sep 17 00:00:00 2001
From: msyu <msyu@mail.ru>
Date: Wed, 9 Jul 2025 16:03:47 +0300
Subject: [PATCH] 122 services_grouped_ls for catalog

---
 v1/Application.cfc              |   2 +-
 v1/resources/svc_grouped_ls.cfc | 124 ++++++++++++++++++++++++++++++++
 v1/resources/svc_ls.cfc         |   2 +
 3 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 v1/resources/svc_grouped_ls.cfc

diff --git a/v1/Application.cfc b/v1/Application.cfc
index 495128b..ce54dfe 100644
--- a/v1/Application.cfc
+++ b/v1/Application.cfc
@@ -51,7 +51,7 @@
 		
 		//variables.framework.docs={};
 		variables.framework.docs.APIName="Deck API";
-		variables.framework.docs.APIVersion="0.121"; /*$ git config --global --unset user.password*/
+		variables.framework.docs.APIVersion="0.122"; /*$ git config --global --unset user.password*/
 
 		
 		variables.framework.globalHeaders = structNew();
diff --git a/v1/resources/svc_grouped_ls.cfc b/v1/resources/svc_grouped_ls.cfc
new file mode 100644
index 0000000..5f37009
--- /dev/null
+++ b/v1/resources/svc_grouped_ls.cfc
@@ -0,0 +1,124 @@
+<cfcomponent extends="taffy.core.resource" taffy:uri="/servicesGrouped">
+
+	<cfsilent>
+		<cfimport prefix="m" taglib="../lib"/>
+		<cfset this.helper=CreateObject("component","lib.rest_api_helper")/><!---*** странно, почему мы его видим?---><!---вынести в апп?--->
+	</cfsilent>
+
+	<!---спецификация полей, пригодных для фильтрации (?и сортировки)--->
+	<cfset this.fieldsSpec={
+		dt_created={prefix="s", type="date"},
+		dt_updated={prefix="s", type="date"},
+		svc_id={prefix="s", type="integer"},		
+		resource_realm_type_id={prefix="s", type="integer"},
+		sort={prefix="s", type="integer"},
+		is_production_ready={prefix="s", type="boolean"},
+		svc={prefix="s", type="string"},
+		svc_short={prefix="s", type="string"},
+		orchestrator_name={prefix="s", type="string"},
+		code={prefix="s", type="string"},
+		version={prefix="s", type="string"},
+		descr={prefix="s", type="string"},
+		man={prefix="s", type="string"},
+		svc_group_id={prefix="sg", type="integer"},
+		svc_group={prefix="g", type="string"}
+	}
+	/>
+
+	 <cffunction name="get" hint="Список сервисов с группами для каталога. Без управления страницами и сортировкой (сортировка по порядку группы, сервисы вне групп в конце списка). Если сервис входит в несколько групп, он будет повторяться">
+<!--- 		<cfargument name="pageSize" type="string" hint="type:integer" default=500/>	
+		<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=""/> --->
+
+		<cfset local={}/>
+		
+		
+		<!---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>		
+		
+		
+		<cfset var out=structNew("linked")/>
+	<!--- 	<cfset var maxrows=arguments.pageSize*arguments.page/>
+		<cfset var startrow=arguments.pageSize*(arguments.page-1)+1/> --->
+
+		
+ 		<cfquery name="local.qRead" result="local.result">
+			select 
+			<m:field_set titleMapOut="local.titleMap" lengthOut="local.fieldCount">
+				<m:field title="ID" cfSqlType="CF_SQL_INTEGER">s.svc_id</m:field>
+				<m:field title="Сервис">s.svc</m:field>
+				<m:field title="Сокращение">s.svc_short</m:field>
+				<m:field>s.orchestrator_name</m:field>
+				<m:field title="Код">s.code</m:field>
+				<m:field title="URL создания">(select url from svc_operation so where so.operation='create' AND so.svc_id=s.svc_id limit 1) as create_url</m:field>
+				<m:field formatter=#function(x){return x NEQ 0}#>s.is_production_ready</m:field>
+				<m:field>s.resource_realm_type_id</m:field>
+				<m:field>s.sort</m:field>
+				<m:field>s.version</m:field>
+				<m:field>s.descr</m:field>
+				<m:field>s.man</m:field>
+				<m:field>to_char(s.dt_created, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_created</m:field>
+				<m:field>to_char(s.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field>
+				<m:field>sg.svc_group_id</m:field>
+				<m:field>g.svc_group</m:field>
+			</m:field_set>	
+			from svc s 
+			left outer join svc_group_svc sg on (s.svc_id=sg.svc_id AND sg.is_enabled)
+			left outer join svc_group g on (sg.svc_group_id=g.svc_group_id)
+			where 1=1 			<m:filter_build filter=#filter#/>
+			order by g.sort, g.svc_group_id
+			<!--- <m:order_build sortCollection=#this.helper.parseNumericOrder(local.titleMap, arguments.orderBy)# fieldCount=0/><!---no sort  --->length limit--->
+			<!--- limit #maxrows# --->
+		</cfquery>  
+		
+		<cftry>
+			<cfquery name="local.qTotal">
+				select count(*) as cnt
+				from svc 
+				where 1=1 
+			</cfquery> 
+			<cfcatch type="any">
+<!--- 				<cfreturn representationOf(createObject("java", "java.lang.System").getEnv())/>	 --->			
+				<cfreturn representationOf(cfcatch)/>				
+			</cfcatch>
+		</cftry>
+		
+<!--- 		<cfreturn representationOf("Проверка связи 7")/> --->
+
+		<cfset "out.queryDurationMs"=getTickCount() - request.startTickCount/>
+		<cfset "out.total"=#local.qTotal.cnt#/>
+		<cfset "out.resultSetSize"=#local.qRead.recordCount#/>
+<!--- 		<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={}/>				
+			<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> 
+
+</cfcomponent>
\ No newline at end of file
diff --git a/v1/resources/svc_ls.cfc b/v1/resources/svc_ls.cfc
index edab695..091b897 100644
--- a/v1/resources/svc_ls.cfc
+++ b/v1/resources/svc_ls.cfc
@@ -10,6 +10,7 @@
 		dt_created={prefix="s", type="date"},
 		dt_updated={prefix="s", type="date"},
 		svc_id={prefix="s", type="integer"},
+		svc_group_id={prefix="s", type="integer"},
 		resource_realm_type_id={prefix="s", type="integer"},
 		sort={prefix="s", type="integer"},
 		is_production_ready={prefix="s", type="boolean"},
@@ -75,6 +76,7 @@
 				<m:field>to_char(s.dt_updated, 'YYYY-MM-DD"T"HH24:MI:SS.FF3TZHTZM') as dt_updated</m:field>
 			</m:field_set>	
 			from svc s 
+			--left outer join svc_group on ()
 				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#