20 prices from contract

1.cfm

@@ -0,0 +1,11 @@
+<hr/>
+test
+<hr/>
+<cfflush/>
+<!--- <cftry>
+	<cfdump var=#session#/>
+	<cfcatch type="any"><cfdump var=#cfcatch#/></cfcatch>
+</cftry> --->
+
+<cfmodule template="mod/crm_contract.cfm" wz="WZ01348"/>
+<cfdump var=#qComponent#/>

Application.cfc

@@ -15,28 +15,29 @@
 	<cfset this.mappings = structNew() />
 	<cfset this.mappings["/mod"] = getDirectoryFromPath(getCurrentTemplatePath()) & "mod/" />
   	<cfset this.customTagPaths = expandPath(getDirectoryFromPath(getCurrentTemplatePath()) & "mod")/>
+<!---   	<cfset this.nullSupport = true/> --->
 	
 	<!--- SSO --->
   	<cfset this.client_id = "payg-report.deck.nubes.ru"/>
   	<cfset this.auth_endpoint         = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/auth" />	
+  	<cfset this.logout_endpoint         = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/logout" />	
   	<cfset this.access_token_endpoint = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/token" />	
   	<cfset this.idpCertUrl            = "https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs" />	
 	<cfset this.client_secret = createObject("java", "java.lang.System").getEnv("IDP_CLIENT_SECRET")/>
+	<cfset this.iam_url = "https://auth-api.ngcloud.ru/api/v1/auth/user"/>	
+	<cfset this.redirect_uri  = "https://#CGI.SERVER_NAME##CGI.SCRIPT_NAME#"/><!--- куда возвращаться от IDP --->
 
-  	<cfset this.datasource = "rpt"/>
+  	<cfset this.datasource = "rpt"/><!--- к буферной базе --->
 	<cfset this.defaultdatasource = this.datasource/>
-	<cfset request.DS = "#this.datasource#">
+<!--- 	request scope is available in pseudoconstructor 
-	<cfset request.language="">
+	see also https://www.bennadel.com/blog/1437-coldfusion-scope-existence-during-various-request-types-and-events.htm --->
+	<cfset request.DS = "#this.datasource#"/> 	
+	<cfset request.language=""/>
 	<cfset getDS(this.datasource)/>
 	<!--- кажется, нужно инициализировать датасорцы в псевдоконструкторе - onRequest не получается --->
 	<!--- *** проверить, что есть - если есть, не создавать --->
 
 
-<!--- 	это работает с административно заданным датасорцем, хотя, казалось бы, не должно 
-	(без окружения функция вернет пустую структуру). Видимо, административный датасорц обнаруживается раньше.
-	Проверять на пустоту не хочется, чтобы не плодить в псевдоконструкторе переменные --->
-	<!--- <cfdump var=#variables#/> --->
-
 
     <cffunction
         name="OnApplicationStart"
@@ -48,7 +49,6 @@
 		<!--- *** мы не проверяем срок жизни сертификата и его отзыв--->
 		<!--- Obtain idp certificate OnApplicationStart --->
 		<cfset application.idpCertificate = getIdpCertificate(this.idpCertUrl)/>
-
         <cfreturn true />
     </cffunction>
 
@@ -77,7 +77,8 @@
 
 		<!--- global settings --->				
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.010"/>
+		<cfset request.APP_VERSION="0.00.020"/>
+		<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
 		<cfset request.STAND=getStand()/>	
 		
 		<!--- application constants --->
@@ -141,6 +142,7 @@
 			<cfset request.APP_NAME=this.Name/>
 			<cfset idpCertificateExists = structKeyExists(application,"idpCertificate")/>
 		</cflock>
+		
 		<cfif NOT idpCertificateExists>
 			<!--- Obtain IDP Certificate (onRequest) --->
 			<cfset var idpCertificate = getIdpCertificate(this.idpCertUrl) />
@@ -151,42 +153,121 @@
 		<!--- <cfoutput>onRequest:check for cert  finished #(getTickCount()-request.startTickCount)#</cfoutput> --->
 
 
-		<cfset this.redirect_uri  = "https://#CGI.SERVER_NAME##CGI.SCRIPT_NAME#" />
 		
-		<cfinclude template="inc/functions.cfm"/>
+		
+		<cfif structKeyExists(url,"logout")>
+			<cflock scope="session" type="exclusive" timeout="3">
+				<cfset structDelete(session, "auth")/>
+			</cflock>
+		</cfif>		
 
 		<cfcookie name="CFID" value="#session.CFID#"/>
 		<cfcookie name="CFTOKEN" value="#session.CFTOKEN#"/>
 		
-		<!--- SSO --->
+		<cfinclude template="inc/functions.cfm"/>
-		<cflock scope="session" type="exclusive" timeout="3">
-			<!---  
-			<cfdump var=#session#/>
-			<cfoutput>#(getTickCount()-request.startTickCount)#</cfoutput>--->
-			<!--- 
-			Это первая проба, с сессией
-			Когда протухнет сессия, мы можем пойти к IDP и повторно аутентифицироваться. Поскольку у нас сохраняются куки IDP, его сессия, возможно, будет жива. Если мы обновляли сессию IDP в другом приложении SSO, по всей видимости, она будет продолжаться. Если мы видим, что сессия IDP состарилась и хочет протухнуть, мы можем ее освежить и получить новый access token (который мы пока не используем - мы пользуемся ответом IDP) Наверное, правильно обходиться для этих целей вообще без сессии *** --->
-			<!--- 
-			проверить sso
-			? сделать рефреш
-			? сделать логаут
-			? сделать отображение ошибки IDP
-			+ сделать получение сертификата
 
-			--->
+		<!--- SSO --->
-			<cfif structKeyExists(session, "auth")>
+		<!--- Если без сессии. Проверяем наличие токена в заголовке (и в куках?)
-				<cfset request.auth = structCopy(session.auth)/>
+		Если его нет, идем к IDP за токеном. Получив токен, складываем его в куки
-				<!--- <cfset request.auth.wz = "WZ01553"/>  --->
+		Если токен есть, распаковываем его. Проверяем протухание. Если прошла установленная часть времени жизни, идем за рефрешем (внимание: это сработает только в браузере,
-				<!--- тут нужно сделать проверку и рефреш токена --->
+		если клиент не умеет редиректы - то токен должен быть достаточно свежий)
-				<!--- сессия есть --->
+		(для начала делаем без рефреша, только проверяем протухание)
-			<cfelse>
+		А рефреш можно сделать на серверной стороне?
-				<!--- сессии нет --->
+		Кладем данные из токена в реквест и наслаждаемся --->
-				<cfset session.auth_state=createGUID().toString()/>
+		<!--- Вариант: если есть Authorization:bearer, идем с ним к IAM --->
 		
  		<cfscript> 
-					jwt = new lib.jwt(this.client_secret);
-					idp = new lib.oauth2(this.client_id, this.client_secret, this.auth_endpoint, this.access_token_endpoint, this.redirect_uri);
 			
+			var requestData = GetHttpRequestData();
+			var headers = requestData.headers;
+
+			if (structKeyExists(headers,"authorization")) { // аутентификация для клиента ЛК
+				var authorizationHeader = headers.authorization;
+				if (authorizationHeader.startsWith("Bearer ")) {
+					var bearerToken = Mid(authorizationHeader, 8); 
+					writeDump(bearerToken);
+					//var token=toString(binaryDecode(bearerToken, "base64"));
+					//writeDump(token);
+					//jwt = new lib.jwt(this.client_secret);
+					//lock scope="application" type="readonly" timeout="1" {
+					//	var token_data = (jwt.decode(token, application.idpCertificate,"RS256"));
+					//}
+					var result="";
+					//try {
+						var iamService = new http(method = "GET", charset = "utf-8", url = #this.iam_url#, timeout="5");
+						iamService.addParam(type = "HEADER", name = "Accept",  value = "application/json");
+						iamService.addParam(type = "HEADER", name = "Authorization",  value = "#authorizationHeader#"); //passthrough	
+						//writedump(this.iamServiceUrl);abort;
+						var resp = iamService.send();	
+						//if (resp.status_code NEQ 200) throw("IDP response not OK");			
+						//writedump(resp);abort;
+						var prefix = resp.getPrefix();
+						if (prefix.status_code NEQ 200) {
+							//writedump(this.iamServiceUrl);
+							//writedump(resp);
+							var iamStatusCode = (isValid("integer", prefix.status_code)) ? val(prefix.status_code) : 500;
+							throw(message="IAM error", detail="URL: #this.iam_url# Status Code: #prefix.status_code#");
+							//abort;				
+							//throw("IDP response not OK");
+						}
+						result = prefix.filecontent;
+						var idpUserData=deserializeJson(result);	
+						//request.auth.wz=idpUserData.userInfo.ClientId;//GUID!
+						
+						
+						request.auth.login = idpUserData.userInfo.login;
+						//request.usrUid=idpUserData.userInfo.contactId;//userId;	//GUID!
+					//writedump(idpUserData);abort;
+					//} catch (e) { 
+						/*if (fileExists("#GetDirectoryFromPath(GetCurrentTemplatePath())#/etc/local-debug")) { //true for local debug without IDP, etc/* does not go to repository
+						var result='{"accounts":[{"login":"","type":"telegram"}],"avatar":["d2d2b7ac-50af-432b-b7c4-f7d6561e288a"],"company":"ООО «НУБЕС»","companyId":"8ec70ac0-546d-42a7-8cff-339c8fb51a23","contactId":"983967a3-58c2-4cdd-84a5-8b427ccfac82","email":"smishchuk@nubes.ru","externalUser":false,"fio":{"fullName":"Мищук Сергей ","name":"Сергей","secondName":"","surname":"Мищук"},"groupIds":["94bf5be7-52f4-5c13-87c3-513786934685","ab12b6b8-0265-4683-a5c2-5e1a74a55216","aff008c3-7443-50f6-86e1-ecff3cd3b04d","d6000da0-c9aa-55eb-9882-f118b432730b","d89a33dc-3177-5854-9580-f7f860a5ab7c","ddfe2555-9ef4-42cb-9a2b-7f24e61e7747","df12926f-ecb8-5479-857f-6d291464baad","fda5c295-230a-5025-9797-b8b4e99e08aa","2be9b4b6-94d1-59f9-a649-cab228d82169","64fe6f5c-a91b-5fea-a7ca-d9823701ebd4"],"integration":{"serviceId":""},"login":"smishchuk@nubes.ru","mobilePhone":[],"position":"","userId":"d72530e1-66a4-412f-a046-38153c4e5405"}';}
+						*/
+						//writedump(resp);
+						//return representationOf( {"exception"=e} );
+						//rethrow(e);
+					//}
+				}
+			} else {
+			//точно мы так не словим дедлок ВПР
+				lock scope="session" type="readonly" timeout="3" {
+					if (structKeyExists(session, "auth")) {
+						request.auth = structCopy(session.auth); 
+					}
+				}
+				if (structKeyExists(request, "auth") AND Now() < request.auth.exp) {
+					
+					if (dateDiff("s", request.auth.iat, Now()) > request.auth.refresh_expires_in/1.5 AND CGI.REQUEST_METHOD EQ "GET") { 
+						// доля времени, после которой происходит рефреш, прибита гвоздями 
+						// По всей видимости, рефреш будет ломать обращения POSТ 
+						// В связи с чем предлагается дождаться GET 
+						// Приклеивать query_string как-то не пришлось, браузер сам справляется
+						
+						// refresh
+						var idp = new lib.oauth2(this.client_id, this.client_secret, this.auth_endpoint, this.access_token_endpoint, this.redirect_uri);
+						var resp = idp.refreshAccessTokenRequest(request.auth.refresh_token);
+						
+						lock scope="application" type="readonly" timeout="1" {
+							idpCertificate = application.idpCertificate;
+						}
+							
+						var auth = parseIdpresponse(resp, idpCertificate, this.client_secret); //все эти сложности из-за опасений насчет многопоточности и блокировок
+						
+						lock scope="session" type="exclusive" timeout="1" {
+							session.auth = auth;
+						}
+						request.auth = auth;	
+						writeDump(auth);
+					}
+				} else {
+					// сессии SSO нет
+					// или токен протух
+					request.auth_state = createGUID().toString();
+					lock scope="session" type="exclusive" timeout="1" {
+						structDelete(session, "auth"); // зачистили сессию от данных SSO
+						session.auth_state = request.auth_state;
+					}
+						
+					var idp = new lib.oauth2(this.client_id, this.client_secret, this.auth_endpoint, this.access_token_endpoint, this.redirect_uri);						
 					/*
 					часто появляется ошибка: после неудачного запроса к IDP 
 					в адресной строке браузера остается все, с чем его редиректил IDP, 
@@ -195,67 +276,45 @@
 					Не очень понятно, как предотвратить повторный запрос (можно, конечно, использовать сессию, но странно)
 					*/
 					//writeOutput(getTickCount()-request.startTickCount);
-					if(structKeyExists(url, "code")) { //обрабатываем редирект от IDP *** наличие поля code в URL введет нас в заблуждение, но эvar = data, label =то только без валидной сессии
+					if(structKeyExists(url, "code")) { //обрабатываем редирект от IDP *** наличие поля code в URL введет нас в заблуждение, 
-						//dump(var = url.code, label = "URL.code"); 
+
-						// Request access token from idp with the
-						// authorization code that we got via the URL
-						//aFormFields = [];
-						//data = idp.makeAccessTokenRequest((url.code).content, aFormFields);
 						try {
-							writeOutput("idp.makeAccessTokenRequest");
+							//writeOutput("idp.makeAccessTokenRequest");
-							writeOutput(getTickCount()-request.startTickCount);
+							//writeOutput(getTickCount()-request.startTickCount);
-							resp = idp.makeAccessTokenRequest(url.code/*, aFormFields*/);
+							var resp = idp.makeAccessTokenRequest(url.code);
-							writeOutput("idp.makeAccessTokenRequest Done");
-							writeOutput(getTickCount()-request.startTickCount);
-							//dump(resp);
-							data = deserializeJson(resp.content);
-							//writedump(data); 
-							// Print full response from idp
-							//dump(var = data, label = "makeAccessTokenRequest - Response from idp");					
 							
-							//echo('<a href="./index.cfm?refresh=#data.refresh_token#">Refresh token #data.refresh_token#</a>');
-							
-							session.auth.expires_in = data.expires_in; 
-							session.auth.refresh_expires_in = data.refresh_expires_in;
-							session.auth.access_token = data.access_token; 
-							session.auth.refresh_token = data.refresh_token; 
-							session.auth.id_token = data.id_token; 
-							session.auth.token_type = data.token_type; 	
-							session.idp_response_content = structCopy(data);
-							
-							//flush()
 							lock scope="application" type="readonly" timeout="1" {
-								token_data = (jwt.decode(data.access_token, application.idpCertificate,"RS256"));
+								idpCertificate = application.idpCertificate;
 							}
-							writeOutput("jwt.decode Done");
-							writeOutput(getTickCount()-request.startTickCount);
-							writedump(token_data);
-							session.auth.login = token_data.preferred_username; 
-							session.auth.wz = token_data.ClientID; 							
-							session.auth.fullname = token_data.name; 
-							session.auth.groups = token_data.groups; 
-							session.auth.session_state = token_data.session_state; 
-							session.auth.sid = token_data.sid; 
-							session.auth.auth_time = token_data.auth_time; 
-							session.auth.exp = token_data.exp; 
-							session.auth.iat = token_data.iat; 
-							//session.sid = token_data.sid;							
-							session.token_data = structCopy(token_data);	
 							
-							location(this.redirect_uri,false);
+							var auth = parseIdpresponse(resp, idpCertificate, this.client_secret); //все эти сложности из-за опасений насчет многопоточности и блокировок
-						} catch (e) {echo('<br>****************** #e.message# : #e.detail# **********');}
 							
-					} else { 
+							lock scope="session" type="exclusive" timeout="1" {
-						strURL = idp.buildRedirectToAuthURL({"scope":'openid profile email',"state":session.auth_state,"allow_signup":false}); 
+								session.auth = auth;
+							}
+							//request.auth = auth;		
+							location(this.redirect_uri, false);
+						} catch (e) {echo('<br>****************** #e.message# : #e.detail# **************');}
+						
+					} else { //отправляем браузер к IDP
+						var strURL =idp.buildRedirectToAuthURL({"scope":'openid profile email',"state":request.auth_state,"allow_signup":false}); 
 						echo('<a href="#strURL#">self-made Auth link (idp) #strURL#</a> <br> <br>');
 						location(strUrl,false);
 					}
+
+				}					
+
+			}
+			
+			//request.logout_url = "";
+			if (structKeyExists(request, "auth") AND structKeyExists(request.auth, "id_token")) {
+				request.logout_url = "#this.logout_endpoint#?id_token_hint=#request.auth.id_token#&post_logout_redirect_uri=#this.redirect_uri#?logout";
+				// внимание, здесь подразумевается, что redirect_uri не содержит query_string
+				// после возвращения от IDP нам нужно будет зачистить сессию SSO, сделаем это по слову logout
+			}
+			
+			request.auth.wz='WZ01348'; //*******************
 		</cfscript> 
-			</cfif>
-			
-		</cflock><!--- session exclusive ---> 
-		
-
 
 		
 		<cfif structKeyExists(request, "auth")> 
@@ -334,7 +393,7 @@
     </cffunction>
 	
 		
-<cffunction
+	<cffunction
         name="getDS"
         access="private"
         returntype="void"
@@ -384,16 +443,16 @@
         <cfreturn/>		
     </cffunction>
 
-<cfscript>
+	<cfscript>
-//https://keycloak.nubes.ru/admin
+	//https://keycloak.nubes.ru/admin
-//https://keycloak.nubes.ru/realms/SSH_CA/account //smishchuk@mgmt.nubes.ru
+	//https://keycloak.nubes.ru/realms/SSH_CA/account //smishchuk@mgmt.nubes.ru
-//https://stackoverflow.com/questions/28658735/what-are-keycloaks-oauth2-openid-connect-endpoints
+	//https://stackoverflow.com/questions/28658735/what-are-keycloaks-oauth2-openid-connect-endpoints
-//http://https://keycloak.nubes.ru/realms/SSH_CA/.well-known/openid-configuration
+	//http://https://keycloak.nubes.ru/realms/SSH_CA/.well-known/openid-configuration
 
-//https://keycloak.nubes.ru/realms/cloud/.well-known/openid-configuration тут ссылка
+	//https://keycloak.nubes.ru/realms/cloud/.well-known/openid-configuration тут ссылка
-//https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs тут серт
+	//https://keycloak.nubes.ru/realms/cloud/protocol/openid-connect/certs тут серт
-//только надо его обрамить -----BEGIN CERTIFICATE-----
+	//только надо его обрамить -----BEGIN CERTIFICATE-----
-function getIdpCertificate(certUrl) {
+	private function getIdpCertificate(certUrl) {
 		
 		var httpService = new http();
 		httpService.setMethod( "get" ); 
@@ -416,7 +475,48 @@ function getIdpCertificate(certUrl) {
 		} else {
 			throw (message="Cannot obtain IDP certificate, request failed", detail="Status_Code #status_code#");
 		}
-}
+	}	
 	
-</cfscript>
+	private struct function parseIdpResponse(struct resp, string certificate, string jwt_secret) {
+		
+		var auth = structNew("linked");
+		var data = deserializeJson(arguments.resp.content);
+		var jwt = new lib.jwt(arguments.jwt_secret);
+		
+		auth.expires_in = data.expires_in; 
+		auth.refresh_expires_in = data.refresh_expires_in;
+		auth.access_token = data.access_token; 
+		auth.refresh_token = data.refresh_token; 
+		auth.id_token = data.id_token; 
+		auth.token_type = data.token_type; 	
+		
+		//idp_response_content = structCopy(data); //for debug		
+		var token_data = (jwt.decode(data.access_token, arguments.certificate,"RS256"));
+		
+		auth.session_state = token_data.session_state; 
+		auth.sid = token_data.sid; 
+		auth.auth_time = token_data.auth_time; 
+		auth.exp = token_data.exp; 
+		auth.iat = token_data.iat; 	
+
+		auth.login = token_data.preferred_username; 
+		auth.wz = token_data.ClientID; 							
+		auth.fullname = token_data.name; 
+		auth.groups = token_data.groups; 			
+		//auth.token_data = structCopy(token_data); //for debug
+		
+		return (auth);
+	}
+
+	</cfscript>
+
+	<cffunction name="rethrow" returntype="void">
+		<!--- https://www.raymondcamden.com/2004/03/09/3089633C-9FA0-606B-3F540AE9642A795F --->
+		<cftry>
+			<cfcatch>
+				<cfrethrow/>
+			</cfcatch>
+		</cftry>
+		<cfthrow type="Context validation error" message="RETHROW() called outside TRY-CATCH"/>
+	</cffunction>
 </cfcomponent>

etc/2do.txt

@@ -0,0 +1,6 @@
+корректный период
+другие WZ
+? full join
+детализация - для S3 это бакеты
+
+

etc/db/billing_schema.sql

@@ -0,0 +1,595 @@
+база rpt сделана из базы billing (название изменено, чтобы избежать путаницы)
+-- удалены последовательности, переназначены владельцы и права
+-- удалены внешние ключи
+
+-- создать роль dbo (владелец), без connect
+-- создать пользователя nifi, с правом логина 
+-- создать пользователя appserver, с правом логина 
+-- дать права пользователю nifi на схемы и таблицы
+-- дать права пользователю appserver на схемы и таблицы на чтение
+
+SET ROLE postgres;
+
+CREATE SCHEMA IF NOT EXISTS s3billing;
+CREATE SCHEMA IF NOT EXISTS ngcloud_ru;
+
+ALTER SCHEMA s3billing OWNER TO dbo;
+ALTER SCHEMA ngcloud_ru OWNER TO dbo;
+ALTER DATABASE rpt SET search_path TO s3billing, ngcloud_ru; 
+
+ALTER DEFAULT PRIVILEGES FOR ROLE dbo, postgres GRANT ALL ON TABLES TO nifi;
+ALTER DEFAULT PRIVILEGES FOR ROLE dbo, postgres GRANT SELECT ON TABLES TO appserver;
+
+SET ROLE dbo;
+
+GRANT USAGE ON SCHEMA s3billing TO appserver,nifi;
+GRANT USAGE ON SCHEMA ngcloud_ru TO appserver,nifi;
+
+GRANT ALL ON ALL TABLES IN SCHEMA s3billing TO nifi;
+GRANT SELECT ON ALL TABLES IN SCHEMA s3billing TO appserver;
+
+GRANT ALL ON ALL TABLES IN SCHEMA ngcloud_ru TO nifi;
+GRANT SELECT ON ALL TABLES IN SCHEMA ngcloud_ru TO appserver;
+
+--GRANT ALL ON ALL SEQUENCES IN SCHEMA s3billing TO appserver,nifi;
+--GRANT ALL ON ALL SEQUENCES IN SCHEMA ngcloud_ru TO appserver,nifi;
+
+
+--ALTER DEFAULT PRIVILEGES FOR ROLE dbo GRANT ALL ON SEQUENCES TO appserver,nifi;
+
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 16.0
+-- Dumped by pg_dump version 16.4
+
+-- Started on 2025-09-15 09:50:58
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- TOC entry 230 (class 1259 OID 2160668)
+-- Name: bucket_info; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+DROP TABLE IF EXISTS s3billing.bucket_info;
+CREATE TABLE s3billing.bucket_info (
+    id integer NOT NULL,
+    bucket_id character varying(255) NOT NULL,
+    name character varying(255) NOT NULL,
+    marker character varying(255) NOT NULL,
+    placement_id bigint DEFAULT 0 NOT NULL
+);
+
+
+
+
+--
+-- TOC entry 226 (class 1259 OID 2160642)
+-- Name: bucket_stat; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.bucket_stat;
+CREATE TABLE s3billing.bucket_stat (
+    bucket_id bigint,
+    num_shards bigint NOT NULL,
+    tenant character varying(255) DEFAULT NULL::character varying,
+    zone_group bigint NOT NULL,
+    placement_id bigint NOT NULL,
+    explicit_placement_data_pool character varying(255) DEFAULT NULL::character varying,
+    explicit_placement_data_extra_pool character varying(255) DEFAULT NULL::character varying,
+    explicit_placement_index_pool character varying(255) DEFAULT NULL::character varying,
+    index_type_id bigint NOT NULL,
+    versioned boolean DEFAULT false,
+    versioning_enabled boolean DEFAULT false,
+    object_lock_enabled boolean DEFAULT false,
+    mfa_enabled boolean DEFAULT false,
+    owner character varying(255) NOT NULL,
+    bucket_quota_enabled boolean DEFAULT false,
+    bucket_quota_check_on_raw boolean DEFAULT false,
+    bucket_quota_max_size bigint NOT NULL,
+    bucket_quota_max_size_kb bigint NOT NULL,
+    bucket_quota_max_objects bigint NOT NULL,
+    usage_rgw_main_size bigint NOT NULL,
+    usage_rgw_main_size_actual bigint NOT NULL,
+    usage_rgw_main_size_utilized bigint NOT NULL,
+    usage_rgw_main_size_kb bigint NOT NULL,
+    usage_rgw_main_size_kb_actual bigint NOT NULL,
+    usage_rgw_main_size_kb_utilized bigint NOT NULL,
+    usage_rgw_main_num_objects bigint NOT NULL,
+    usage_rgw_multimeta_size bigint,
+    usage_rgw_multimeta_size_actual bigint,
+    usage_rgw_multimeta_size_utilized bigint,
+    usage_rgw_multimeta_size_kb bigint,
+    usage_rgw_multimeta_size_kb_actual bigint,
+    usage_rgw_multimeta_size_kb_utilized bigint,
+    usage_rgw_multimeta_num_objects bigint,
+    creation_time timestamp without time zone NOT NULL,
+    mtime timestamp without time zone NOT NULL,
+    timestamp_addition timestamp without time zone DEFAULT date_trunc('hour'::text, CURRENT_TIMESTAMP)
+);
+
+--
+-- TOC entry 245 (class 1259 OID 2160763)
+-- Name: category; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.category;
+CREATE TABLE s3billing.category (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+--
+-- TOC entry 225 (class 1259 OID 2160635)
+-- Name: goose_db_version; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.goose_db_version;
+CREATE TABLE s3billing.goose_db_version (
+    id integer NOT NULL,
+    version_id bigint NOT NULL,
+    is_applied boolean NOT NULL,
+    tstamp timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+--
+-- TOC entry 234 (class 1259 OID 2160684)
+-- Name: index_type; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS index_type;
+CREATE TABLE s3billing.index_type (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+--
+-- TOC entry 232 (class 1259 OID 2160677)
+-- Name: placement; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.placement;
+CREATE TABLE s3billing.placement (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+
+--
+-- TOC entry 239 (class 1259 OID 2160705)
+-- Name: usage_bucket_by_user; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.usage_bucket_by_user;
+CREATE TABLE s3billing.usage_bucket_by_user (
+    bucketid bigint,
+    "time" timestamp without time zone NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL,
+    user_id bigint NOT NULL,
+    category_id bigint NOT NULL
+);
+
+
+--
+-- TOC entry 238 (class 1259 OID 2160698)
+-- Name: usage_stat_summary; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.usage_stat_summary;
+CREATE TABLE s3billing.usage_stat_summary (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    category character varying(255) NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL
+);
+
+
+--
+-- TOC entry 236 (class 1259 OID 2160691)
+-- Name: usage_stat_total; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.usage_stat_total;
+CREATE TABLE s3billing.usage_stat_total (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL
+);
+
+--
+-- TOC entry 243 (class 1259 OID 2160751)
+-- Name: user_info; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.user_info;
+CREATE TABLE s3billing.user_info (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL,
+    owner character varying(255) NOT NULL
+);
+
+
+--
+-- TOC entry 241 (class 1259 OID 2160712)
+-- Name: user_quota_bucket; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.user_quota_bucket;
+CREATE TABLE s3billing.user_quota_bucket (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    enabled boolean DEFAULT false,
+    check_on_raw boolean DEFAULT false,
+    max_size bigint NOT NULL,
+    max_size_kb bigint NOT NULL,
+    max_objects bigint NOT NULL
+);
+
+
+--
+-- TOC entry 228 (class 1259 OID 2160661)
+-- Name: zone_group; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+DROP TABLE IF EXISTS s3billing.zone_group;
+CREATE TABLE s3billing.zone_group (
+    id integer NOT NULL,
+    name uuid NOT NULL
+);
+
+--
+-- TOC entry 3278 (class 2606 OID 2160675)
+-- Name: bucket_info bucket_info_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.bucket_info
+    ADD CONSTRAINT bucket_info_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3273 (class 2606 OID 2476484)
+-- Name: bucket_stat bucket_stat_unique; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+--ALTER TABLE ONLY s3billing.bucket_stat
+--    ADD CONSTRAINT bucket_stat_unique UNIQUE (bucket_id, placement_id, timestamp_addition);
+	
+ALTER TABLE ONLY s3billing.bucket_stat
+    ADD CONSTRAINT bucket_stat_pkey PRIMARY KEY (bucket_id, placement_id, timestamp_addition);
+
+
+--
+-- TOC entry 3298 (class 2606 OID 2160768)
+-- Name: category category_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.category
+    ADD CONSTRAINT category_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3270 (class 2606 OID 2160640)
+-- Name: goose_db_version goose_db_version_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.goose_db_version
+    ADD CONSTRAINT goose_db_version_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3284 (class 2606 OID 2160689)
+-- Name: index_type index_type_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.index_type
+    ADD CONSTRAINT index_type_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3282 (class 2606 OID 2160682)
+-- Name: placement placement_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.placement
+    ADD CONSTRAINT placement_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3290 (class 2606 OID 2476705)
+-- Name: usage_bucket_by_user usage_bucket_by_user_unique; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+--ALTER TABLE ONLY s3billing.usage_bucket_by_user
+--    ADD CONSTRAINT usage_bucket_by_user_unique UNIQUE (bucketid, date_start, date_end, user_id, category_id);
+ALTER TABLE ONLY s3billing.usage_bucket_by_user
+    ADD CONSTRAINT usage_bucket_by_user_pkey PRIMARY KEY (bucketid, date_start, date_end, user_id, category_id);
+
+
+--
+-- TOC entry 3288 (class 2606 OID 2160703)
+-- Name: usage_stat_summary usage_stat_summary_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_summary
+    ADD CONSTRAINT usage_stat_summary_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3286 (class 2606 OID 2160696)
+-- Name: usage_stat_total usage_stat_total_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_total
+    ADD CONSTRAINT usage_stat_total_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3295 (class 2606 OID 2160758)
+-- Name: user_info user_info_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_info
+    ADD CONSTRAINT user_info_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3292 (class 2606 OID 2160719)
+-- Name: user_quota_bucket user_quota_bucket_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_quota_bucket
+    ADD CONSTRAINT user_quota_bucket_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3275 (class 2606 OID 2160666)
+-- Name: zone_group zone_group_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.zone_group
+    ADD CONSTRAINT zone_group_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3276 (class 1259 OID 2474077)
+-- Name: bucket_info_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_info_name_idx ON s3billing.bucket_info USING btree (name);
+
+
+--
+-- TOC entry 3279 (class 1259 OID 2474078)
+-- Name: bucket_info_placement_id_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_info_placement_id_idx ON s3billing.bucket_info USING btree (placement_id);
+
+
+--
+-- TOC entry 3271 (class 1259 OID 2474094)
+-- Name: bucket_stat_owner_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_stat_owner_idx ON s3billing.bucket_stat USING btree (owner);
+
+
+--
+-- TOC entry 3296 (class 1259 OID 2474445)
+-- Name: category_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE UNIQUE INDEX category_name_idx ON s3billing.category USING btree (name);
+
+
+--
+-- TOC entry 3280 (class 1259 OID 2474468)
+-- Name: placement_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE UNIQUE INDEX placement_name_idx ON s3billing.placement USING btree (name);
+
+
+--
+-- TOC entry 3293 (class 1259 OID 2474438)
+-- Name: user_info_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX user_info_name_idx ON s3billing.user_info USING btree (name);
+
+
+
+-- Completed on 2025-09-15 09:50:59
+
+--
+-- PostgreSQL database dump complete
+--
+
+-------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------
+
+DROP TABLE IF EXISTS ngcloud_ru.capacity_resource;
+CREATE TABLE ngcloud_ru.capacity_resource (
+    vdc_id uuid NOT NULL,
+    "timestamp" timestamp with time zone NOT NULL,
+    cpu_allocated integer NOT NULL,
+    cpu_limit integer NOT NULL,
+    cpu_reserved integer NOT NULL,
+    cpu_used integer NOT NULL,
+    cpu_speed integer NOT NULL,
+    mem_allocated integer NOT NULL,
+    mem_limit integer NOT NULL,
+    mem_reserved integer NOT NULL,
+    mem_used integer NOT NULL
+);
+
+--
+-- TOC entry 223 (class 1259 OID 1893993)
+-- Name: capacity_storage; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+DROP TABLE IF EXISTS ngcloud_ru.capacity_storage;
+CREATE TABLE ngcloud_ru.capacity_storage (
+    vdc_id uuid NOT NULL,
+    storage_profile_types_id integer NOT NULL,
+    "timestamp" timestamp with time zone NOT NULL,
+    id uuid NOT NULL,
+    "limit" integer NOT NULL,
+    used integer NOT NULL
+);
+
+--
+-- TOC entry 220 (class 1259 OID 1893965)
+-- Name: storage_profile_types; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+DROP TABLE IF EXISTS ngcloud_ru.storage_profile_types;
+CREATE TABLE ngcloud_ru.storage_profile_types (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+--
+-- TOC entry 218 (class 1259 OID 1893959)
+-- Name: tenant; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+DROP TABLE IF EXISTS ngcloud_ru.tenant;
+CREATE TABLE ngcloud_ru.tenant (
+    id uuid NOT NULL,
+    name character varying(255) NOT NULL,
+    wzcode bigint
+);
+
+
+--
+-- TOC entry 221 (class 1259 OID 1893973)
+-- Name: vdc; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+DROP TABLE IF EXISTS ngcloud_ru.vdc;
+CREATE TABLE ngcloud_ru.vdc (
+    id uuid NOT NULL,
+    tenant_id uuid NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+
+
+
+--
+-- TOC entry 3255 (class 2606 OID 1893987)
+-- Name: capacity_resource capacity_resource_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_resource
+    ADD CONSTRAINT capacity_resource_pkey PRIMARY KEY (vdc_id, "timestamp");
+
+
+--
+-- TOC entry 3257 (class 2606 OID 1893997)
+-- Name: capacity_storage capacity_storage_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_storage
+    ADD CONSTRAINT capacity_storage_pkey PRIMARY KEY (vdc_id, id, "timestamp");
+
+
+--
+-- TOC entry 3249 (class 2606 OID 1893972)
+-- Name: storage_profile_types storage_profile_types_name_key; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.storage_profile_types
+    ADD CONSTRAINT storage_profile_types_name_key UNIQUE (name);
+
+
+--
+-- TOC entry 3251 (class 2606 OID 1893970)
+-- Name: storage_profile_types storage_profile_types_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.storage_profile_types
+    ADD CONSTRAINT storage_profile_types_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3247 (class 2606 OID 1893963)
+-- Name: tenant tenant_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.tenant
+    ADD CONSTRAINT tenant_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3253 (class 2606 OID 1893977)
+-- Name: vdc vdc_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.vdc
+    ADD CONSTRAINT vdc_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3259 (class 2606 OID 1893988)
+-- Name: capacity_resource capacity_resource_vdc_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+--ALTER TABLE ONLY ngcloud_ru.capacity_resource
+--    ADD CONSTRAINT capacity_resource_vdc_id_fkey FOREIGN KEY (vdc_id) REFERENCES ngcloud_ru.vdc(id) ON DELETE CASCADE;
+
+
+--
+-- TOC entry 3260 (class 2606 OID 1894003)
+-- Name: capacity_storage capacity_storage_storage_profile_types_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+--ALTER TABLE ONLY ngcloud_ru.capacity_storage
+--   ADD CONSTRAINT capacity_storage_storage_profile_types_id_fkey FOREIGN KEY (storage_profile_types_id) REFERENCES ngcloud_ru.storage_profile_types(id);
+
+
+--
+-- TOC entry 3261 (class 2606 OID 1893998)
+-- Name: capacity_storage capacity_storage_vdc_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+--ALTER TABLE ONLY ngcloud_ru.capacity_storage
+--    ADD CONSTRAINT capacity_storage_vdc_id_fkey FOREIGN KEY (vdc_id) REFERENCES ngcloud_ru.vdc(id) ON DELETE CASCADE;
+
+
+--
+-- TOC entry 3258 (class 2606 OID 1893978)
+-- Name: vdc vdc_tenant_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+--ALTER TABLE ONLY ngcloud_ru.vdc
+--    ADD CONSTRAINT vdc_tenant_id_fkey FOREIGN KEY (tenant_id) REFERENCES ngcloud_ru.tenant(id);
+
+
+-- Completed on 2025-09-15 09:53:18
+
+--
+-- PostgreSQL database dump complete
+--
+

etc/db/billing_schema_dev.sql

@@ -0,0 +1,72 @@
+set role postgres;
+--
+CREATE SCHEMA IF NOT EXISTS gpu;
+--ALTER SCHEMA gpu OWNER TO dbo;
+GRANT USAGE ON SCHEMA gpu TO nifi;
+
+GRANT ALL ON ALL TABLES IN SCHEMA gpu TO nifi;
+GRANT ALL ON ALL SEQUENCES IN SCHEMA gpu TO nifi;
+
+--ALTER DEFAULT PRIVILEGES IN SCHEMA gpu GRANT ALL ON TABLES TO nifi;
+--ALTER DEFAULT PRIVILEGES IN SCHEMA gpu GRANT ALL ON SEQUENCES TO nifi;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE dbo, postgres IN SCHEMA gpu GRANT ALL ON TABLES TO nifi;
+ALTER DEFAULT PRIVILEGES FOR ROLE dbo, postgres IN SCHEMA gpu GRANT ALL ON SEQUENCES TO nifi;
+
+--SET ROLE dbo;
+
+DROP TABLE IF EXISTS gpu.vm;
+CREATE TABLE gpu.vm ( 
+	 objUUID uuid NOT NULL PRIMARY KEY 
+	,groupUUID uuid NULL 
+	,objId varchar(255) NULL
+	,ClientID varchar(255) NULL	-- WZ	
+	,VCD varchar(255) NULL		
+	,Org varchar(255) NULL		
+	,OrgVDC varchar(255) NULL		
+	,vCenter varchar(255) NULL		
+	,GPU varchar(255) NULL	
+	,dt_load timestamptz NOT NULL 	
+);
+ALTER TABLE gpu.vm OWNER TO dbo;
+/*
+{
+"type": "record",
+"name": "gpu.vm",
+"namespace": "org.apache.nifi",
+"fields": [ 
+	{"name":"objUUID", "type":{"type": "string", "logicalType": "uuid"}},	
+	{"name":"groupUUID", "type":[{"type": "string", "logicalType": "uuid"} ,"null"]},
+	{"name":"objId", "type":["string" ,"null"]},
+	{"name":"ClientID", "type":["int" ,"null"]},
+	{"name":"VCD", "type":["string" ,"null"]},
+	{"name":"Org", "type":["string" ,"null"]},
+	{"name":"OrgVDC", "type":["string" ,"null"]},
+	{"name":"vCenter", "type":["string" ,"null"]},
+	{"name":"GPU", "type":["string" ,"null"]},
+	{"name":"VCD", "type":["string" ,"null"]},
+	{"name":"dt_load","type":{"type": "long", "logicalType": "local-timestamp-millis"}}
+]
+}
+*/
+
+DROP TABLE IF EXISTS gpu.vm_power_state;
+CREATE TABLE gpu.vm_power_state (
+	 objId varchar(255) NULL
+	,ts timestamptz NOT NULL -- без таймштампа загрузки	
+	,value int NULL		
+	,CONSTRAINT PK_vm_power_state PRIMARY KEY(objId, ts)
+);
+ALTER TABLE gpu.vm_power_state OWNER TO dbo;
+/*
+{
+"type": "record",
+"name": "gpu.vm_power_state,
+"namespace": "org.apache.nifi",
+"fields": [ 
+	{"name":"objId", "type":["string" ,"null"]},
+	{"name":"ts","type":{"type": "long", "logicalType": "local-timestamp-millis"}},
+	{"name":"value", "type":["int" ,"null"]}
+]
+}
+*/

etc/db/billing_schema_s3.sql

@@ -0,0 +1,828 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 16.0
+-- Dumped by pg_dump version 16.4
+
+-- Started on 2025-09-15 09:50:58
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- TOC entry 230 (class 1259 OID 2160668)
+-- Name: bucket_info; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.bucket_info (
+    id integer NOT NULL,
+    bucket_id character varying(255) NOT NULL,
+    name character varying(255) NOT NULL,
+    marker character varying(255) NOT NULL,
+    placement_id bigint DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE s3billing.bucket_info OWNER TO s3billing;
+
+--
+-- TOC entry 229 (class 1259 OID 2160667)
+-- Name: bucket_info_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.bucket_info_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.bucket_info_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3448 (class 0 OID 0)
+-- Dependencies: 229
+-- Name: bucket_info_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.bucket_info_id_seq OWNED BY s3billing.bucket_info.id;
+
+
+--
+-- TOC entry 226 (class 1259 OID 2160642)
+-- Name: bucket_stat; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.bucket_stat (
+    bucket_id bigint,
+    num_shards bigint NOT NULL,
+    tenant character varying(255) DEFAULT NULL::character varying,
+    zone_group bigint NOT NULL,
+    placement_id bigint NOT NULL,
+    explicit_placement_data_pool character varying(255) DEFAULT NULL::character varying,
+    explicit_placement_data_extra_pool character varying(255) DEFAULT NULL::character varying,
+    explicit_placement_index_pool character varying(255) DEFAULT NULL::character varying,
+    index_type_id bigint NOT NULL,
+    versioned boolean DEFAULT false,
+    versioning_enabled boolean DEFAULT false,
+    object_lock_enabled boolean DEFAULT false,
+    mfa_enabled boolean DEFAULT false,
+    owner character varying(255) NOT NULL,
+    bucket_quota_enabled boolean DEFAULT false,
+    bucket_quota_check_on_raw boolean DEFAULT false,
+    bucket_quota_max_size bigint NOT NULL,
+    bucket_quota_max_size_kb bigint NOT NULL,
+    bucket_quota_max_objects bigint NOT NULL,
+    usage_rgw_main_size bigint NOT NULL,
+    usage_rgw_main_size_actual bigint NOT NULL,
+    usage_rgw_main_size_utilized bigint NOT NULL,
+    usage_rgw_main_size_kb bigint NOT NULL,
+    usage_rgw_main_size_kb_actual bigint NOT NULL,
+    usage_rgw_main_size_kb_utilized bigint NOT NULL,
+    usage_rgw_main_num_objects bigint NOT NULL,
+    usage_rgw_multimeta_size bigint,
+    usage_rgw_multimeta_size_actual bigint,
+    usage_rgw_multimeta_size_utilized bigint,
+    usage_rgw_multimeta_size_kb bigint,
+    usage_rgw_multimeta_size_kb_actual bigint,
+    usage_rgw_multimeta_size_kb_utilized bigint,
+    usage_rgw_multimeta_num_objects bigint,
+    creation_time timestamp without time zone NOT NULL,
+    mtime timestamp without time zone NOT NULL,
+    timestamp_addition timestamp without time zone DEFAULT date_trunc('hour'::text, CURRENT_TIMESTAMP)
+);
+
+
+ALTER TABLE s3billing.bucket_stat OWNER TO s3billing;
+
+--
+-- TOC entry 245 (class 1259 OID 2160763)
+-- Name: category; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.category (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE s3billing.category OWNER TO s3billing;
+
+--
+-- TOC entry 244 (class 1259 OID 2160762)
+-- Name: category_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.category_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.category_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3451 (class 0 OID 0)
+-- Dependencies: 244
+-- Name: category_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.category_id_seq OWNED BY s3billing.category.id;
+
+
+--
+-- TOC entry 225 (class 1259 OID 2160635)
+-- Name: goose_db_version; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.goose_db_version (
+    id integer NOT NULL,
+    version_id bigint NOT NULL,
+    is_applied boolean NOT NULL,
+    tstamp timestamp without time zone DEFAULT now() NOT NULL
+);
+
+
+ALTER TABLE s3billing.goose_db_version OWNER TO s3billing;
+
+--
+-- TOC entry 224 (class 1259 OID 2160634)
+-- Name: goose_db_version_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE s3billing.goose_db_version ALTER COLUMN id ADD GENERATED BY DEFAULT AS IDENTITY (
+    SEQUENCE NAME s3billing.goose_db_version_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1
+);
+
+
+--
+-- TOC entry 234 (class 1259 OID 2160684)
+-- Name: index_type; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.index_type (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE s3billing.index_type OWNER TO s3billing;
+
+--
+-- TOC entry 233 (class 1259 OID 2160683)
+-- Name: index_type_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.index_type_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.index_type_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3454 (class 0 OID 0)
+-- Dependencies: 233
+-- Name: index_type_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.index_type_id_seq OWNED BY s3billing.index_type.id;
+
+
+--
+-- TOC entry 232 (class 1259 OID 2160677)
+-- Name: placement; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.placement (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE s3billing.placement OWNER TO s3billing;
+
+--
+-- TOC entry 231 (class 1259 OID 2160676)
+-- Name: placement_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.placement_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.placement_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3456 (class 0 OID 0)
+-- Dependencies: 231
+-- Name: placement_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.placement_id_seq OWNED BY s3billing.placement.id;
+
+
+--
+-- TOC entry 239 (class 1259 OID 2160705)
+-- Name: usage_bucket_by_user; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.usage_bucket_by_user (
+    bucketid bigint,
+    "time" timestamp without time zone NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL,
+    user_id bigint NOT NULL,
+    category_id bigint NOT NULL
+);
+
+
+ALTER TABLE s3billing.usage_bucket_by_user OWNER TO s3billing;
+
+--
+-- TOC entry 238 (class 1259 OID 2160698)
+-- Name: usage_stat_summary; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.usage_stat_summary (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    category character varying(255) NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL
+);
+
+
+ALTER TABLE s3billing.usage_stat_summary OWNER TO s3billing;
+
+--
+-- TOC entry 237 (class 1259 OID 2160697)
+-- Name: usage_stat_summary_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.usage_stat_summary_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.usage_stat_summary_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3459 (class 0 OID 0)
+-- Dependencies: 237
+-- Name: usage_stat_summary_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.usage_stat_summary_id_seq OWNED BY s3billing.usage_stat_summary.id;
+
+
+--
+-- TOC entry 236 (class 1259 OID 2160691)
+-- Name: usage_stat_total; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.usage_stat_total (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    bytes_sent bigint NOT NULL,
+    bytes_received bigint NOT NULL,
+    ops bigint NOT NULL,
+    successful_ops bigint NOT NULL,
+    date_start timestamp without time zone NOT NULL,
+    date_end timestamp without time zone NOT NULL
+);
+
+
+ALTER TABLE s3billing.usage_stat_total OWNER TO s3billing;
+
+--
+-- TOC entry 235 (class 1259 OID 2160690)
+-- Name: usage_stat_total_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.usage_stat_total_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.usage_stat_total_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3461 (class 0 OID 0)
+-- Dependencies: 235
+-- Name: usage_stat_total_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.usage_stat_total_id_seq OWNED BY s3billing.usage_stat_total.id;
+
+
+--
+-- TOC entry 243 (class 1259 OID 2160751)
+-- Name: user_info; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.user_info (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL,
+    owner character varying(255) NOT NULL
+);
+
+
+ALTER TABLE s3billing.user_info OWNER TO s3billing;
+
+--
+-- TOC entry 242 (class 1259 OID 2160750)
+-- Name: user_info_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.user_info_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.user_info_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3463 (class 0 OID 0)
+-- Dependencies: 242
+-- Name: user_info_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.user_info_id_seq OWNED BY s3billing.user_info.id;
+
+
+--
+-- TOC entry 241 (class 1259 OID 2160712)
+-- Name: user_quota_bucket; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.user_quota_bucket (
+    id integer NOT NULL,
+    userid character varying(255) NOT NULL,
+    enabled boolean DEFAULT false,
+    check_on_raw boolean DEFAULT false,
+    max_size bigint NOT NULL,
+    max_size_kb bigint NOT NULL,
+    max_objects bigint NOT NULL
+);
+
+
+ALTER TABLE s3billing.user_quota_bucket OWNER TO s3billing;
+
+--
+-- TOC entry 240 (class 1259 OID 2160711)
+-- Name: user_quota_bucket_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.user_quota_bucket_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.user_quota_bucket_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3465 (class 0 OID 0)
+-- Dependencies: 240
+-- Name: user_quota_bucket_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.user_quota_bucket_id_seq OWNED BY s3billing.user_quota_bucket.id;
+
+
+--
+-- TOC entry 228 (class 1259 OID 2160661)
+-- Name: zone_group; Type: TABLE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE TABLE s3billing.zone_group (
+    id integer NOT NULL,
+    name uuid NOT NULL
+);
+
+
+ALTER TABLE s3billing.zone_group OWNER TO s3billing;
+
+--
+-- TOC entry 227 (class 1259 OID 2160660)
+-- Name: zone_group_id_seq; Type: SEQUENCE; Schema: s3billing; Owner: s3billing
+--
+
+CREATE SEQUENCE s3billing.zone_group_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE s3billing.zone_group_id_seq OWNER TO s3billing;
+
+--
+-- TOC entry 3467 (class 0 OID 0)
+-- Dependencies: 227
+-- Name: zone_group_id_seq; Type: SEQUENCE OWNED BY; Schema: s3billing; Owner: s3billing
+--
+
+ALTER SEQUENCE s3billing.zone_group_id_seq OWNED BY s3billing.zone_group.id;
+
+
+--
+-- TOC entry 3258 (class 2604 OID 2160671)
+-- Name: bucket_info id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.bucket_info ALTER COLUMN id SET DEFAULT nextval('s3billing.bucket_info_id_seq'::regclass);
+
+
+--
+-- TOC entry 3268 (class 2604 OID 2160766)
+-- Name: category id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.category ALTER COLUMN id SET DEFAULT nextval('s3billing.category_id_seq'::regclass);
+
+
+--
+-- TOC entry 3261 (class 2604 OID 2160687)
+-- Name: index_type id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.index_type ALTER COLUMN id SET DEFAULT nextval('s3billing.index_type_id_seq'::regclass);
+
+
+--
+-- TOC entry 3260 (class 2604 OID 2160680)
+-- Name: placement id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.placement ALTER COLUMN id SET DEFAULT nextval('s3billing.placement_id_seq'::regclass);
+
+
+--
+-- TOC entry 3263 (class 2604 OID 2160701)
+-- Name: usage_stat_summary id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_summary ALTER COLUMN id SET DEFAULT nextval('s3billing.usage_stat_summary_id_seq'::regclass);
+
+
+--
+-- TOC entry 3262 (class 2604 OID 2160694)
+-- Name: usage_stat_total id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_total ALTER COLUMN id SET DEFAULT nextval('s3billing.usage_stat_total_id_seq'::regclass);
+
+
+--
+-- TOC entry 3267 (class 2604 OID 2160754)
+-- Name: user_info id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_info ALTER COLUMN id SET DEFAULT nextval('s3billing.user_info_id_seq'::regclass);
+
+
+--
+-- TOC entry 3264 (class 2604 OID 2160715)
+-- Name: user_quota_bucket id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_quota_bucket ALTER COLUMN id SET DEFAULT nextval('s3billing.user_quota_bucket_id_seq'::regclass);
+
+
+--
+-- TOC entry 3257 (class 2604 OID 2160664)
+-- Name: zone_group id; Type: DEFAULT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.zone_group ALTER COLUMN id SET DEFAULT nextval('s3billing.zone_group_id_seq'::regclass);
+
+
+--
+-- TOC entry 3278 (class 2606 OID 2160675)
+-- Name: bucket_info bucket_info_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.bucket_info
+    ADD CONSTRAINT bucket_info_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3273 (class 2606 OID 2476484)
+-- Name: bucket_stat bucket_stat_unique; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.bucket_stat
+    ADD CONSTRAINT bucket_stat_unique UNIQUE (bucket_id, placement_id, timestamp_addition);
+
+
+--
+-- TOC entry 3298 (class 2606 OID 2160768)
+-- Name: category category_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.category
+    ADD CONSTRAINT category_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3270 (class 2606 OID 2160640)
+-- Name: goose_db_version goose_db_version_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.goose_db_version
+    ADD CONSTRAINT goose_db_version_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3284 (class 2606 OID 2160689)
+-- Name: index_type index_type_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.index_type
+    ADD CONSTRAINT index_type_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3282 (class 2606 OID 2160682)
+-- Name: placement placement_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.placement
+    ADD CONSTRAINT placement_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3290 (class 2606 OID 2476705)
+-- Name: usage_bucket_by_user usage_bucket_by_user_unique; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_bucket_by_user
+    ADD CONSTRAINT usage_bucket_by_user_unique UNIQUE (bucketid, date_start, date_end, user_id, category_id);
+
+
+--
+-- TOC entry 3288 (class 2606 OID 2160703)
+-- Name: usage_stat_summary usage_stat_summary_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_summary
+    ADD CONSTRAINT usage_stat_summary_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3286 (class 2606 OID 2160696)
+-- Name: usage_stat_total usage_stat_total_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.usage_stat_total
+    ADD CONSTRAINT usage_stat_total_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3295 (class 2606 OID 2160758)
+-- Name: user_info user_info_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_info
+    ADD CONSTRAINT user_info_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3292 (class 2606 OID 2160719)
+-- Name: user_quota_bucket user_quota_bucket_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.user_quota_bucket
+    ADD CONSTRAINT user_quota_bucket_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3275 (class 2606 OID 2160666)
+-- Name: zone_group zone_group_pkey; Type: CONSTRAINT; Schema: s3billing; Owner: s3billing
+--
+
+ALTER TABLE ONLY s3billing.zone_group
+    ADD CONSTRAINT zone_group_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3276 (class 1259 OID 2474077)
+-- Name: bucket_info_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_info_name_idx ON s3billing.bucket_info USING btree (name);
+
+
+--
+-- TOC entry 3279 (class 1259 OID 2474078)
+-- Name: bucket_info_placement_id_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_info_placement_id_idx ON s3billing.bucket_info USING btree (placement_id);
+
+
+--
+-- TOC entry 3271 (class 1259 OID 2474094)
+-- Name: bucket_stat_owner_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX bucket_stat_owner_idx ON s3billing.bucket_stat USING btree (owner);
+
+
+--
+-- TOC entry 3296 (class 1259 OID 2474445)
+-- Name: category_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE UNIQUE INDEX category_name_idx ON s3billing.category USING btree (name);
+
+
+--
+-- TOC entry 3280 (class 1259 OID 2474468)
+-- Name: placement_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE UNIQUE INDEX placement_name_idx ON s3billing.placement USING btree (name);
+
+
+--
+-- TOC entry 3293 (class 1259 OID 2474438)
+-- Name: user_info_name_idx; Type: INDEX; Schema: s3billing; Owner: s3billing
+--
+
+CREATE INDEX user_info_name_idx ON s3billing.user_info USING btree (name);
+
+
+--
+-- TOC entry 3447 (class 0 OID 0)
+-- Dependencies: 230
+-- Name: TABLE bucket_info; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.bucket_info TO grafanabilling;
+
+
+--
+-- TOC entry 3449 (class 0 OID 0)
+-- Dependencies: 226
+-- Name: TABLE bucket_stat; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.bucket_stat TO grafanabilling;
+
+
+--
+-- TOC entry 3450 (class 0 OID 0)
+-- Dependencies: 245
+-- Name: TABLE category; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.category TO grafanabilling;
+
+
+--
+-- TOC entry 3452 (class 0 OID 0)
+-- Dependencies: 225
+-- Name: TABLE goose_db_version; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.goose_db_version TO grafanabilling;
+
+
+--
+-- TOC entry 3453 (class 0 OID 0)
+-- Dependencies: 234
+-- Name: TABLE index_type; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.index_type TO grafanabilling;
+
+
+--
+-- TOC entry 3455 (class 0 OID 0)
+-- Dependencies: 232
+-- Name: TABLE placement; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.placement TO grafanabilling;
+
+
+--
+-- TOC entry 3457 (class 0 OID 0)
+-- Dependencies: 239
+-- Name: TABLE usage_bucket_by_user; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.usage_bucket_by_user TO grafanabilling;
+
+
+--
+-- TOC entry 3458 (class 0 OID 0)
+-- Dependencies: 238
+-- Name: TABLE usage_stat_summary; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.usage_stat_summary TO grafanabilling;
+
+
+--
+-- TOC entry 3460 (class 0 OID 0)
+-- Dependencies: 236
+-- Name: TABLE usage_stat_total; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.usage_stat_total TO grafanabilling;
+
+
+--
+-- TOC entry 3462 (class 0 OID 0)
+-- Dependencies: 243
+-- Name: TABLE user_info; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.user_info TO grafanabilling;
+
+
+--
+-- TOC entry 3464 (class 0 OID 0)
+-- Dependencies: 241
+-- Name: TABLE user_quota_bucket; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.user_quota_bucket TO grafanabilling;
+
+
+--
+-- TOC entry 3466 (class 0 OID 0)
+-- Dependencies: 228
+-- Name: TABLE zone_group; Type: ACL; Schema: s3billing; Owner: s3billing
+--
+
+GRANT SELECT ON TABLE s3billing.zone_group TO grafanabilling;
+
+
+-- Completed on 2025-09-15 09:50:59
+
+--
+-- PostgreSQL database dump complete
+--
+

etc/db/billing_schema_vc.sql

@@ -0,0 +1,278 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 16.0
+-- Dumped by pg_dump version 16.4
+
+-- Started on 2025-09-15 09:53:16
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- TOC entry 222 (class 1259 OID 1893983)
+-- Name: capacity_resource; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE TABLE ngcloud_ru.capacity_resource (
+    vdc_id uuid NOT NULL,
+    "timestamp" timestamp with time zone NOT NULL,
+    cpu_allocated integer NOT NULL,
+    cpu_limit integer NOT NULL,
+    cpu_reserved integer NOT NULL,
+    cpu_used integer NOT NULL,
+    cpu_speed integer NOT NULL,
+    mem_allocated integer NOT NULL,
+    mem_limit integer NOT NULL,
+    mem_reserved integer NOT NULL,
+    mem_used integer NOT NULL
+);
+
+
+ALTER TABLE ngcloud_ru.capacity_resource OWNER TO vc_billing;
+
+--
+-- TOC entry 223 (class 1259 OID 1893993)
+-- Name: capacity_storage; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE TABLE ngcloud_ru.capacity_storage (
+    vdc_id uuid NOT NULL,
+    storage_profile_types_id integer NOT NULL,
+    "timestamp" timestamp with time zone NOT NULL,
+    id uuid NOT NULL,
+    "limit" integer NOT NULL,
+    used integer NOT NULL
+);
+
+
+ALTER TABLE ngcloud_ru.capacity_storage OWNER TO vc_billing;
+
+--
+-- TOC entry 220 (class 1259 OID 1893965)
+-- Name: storage_profile_types; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE TABLE ngcloud_ru.storage_profile_types (
+    id integer NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE ngcloud_ru.storage_profile_types OWNER TO vc_billing;
+
+--
+-- TOC entry 219 (class 1259 OID 1893964)
+-- Name: storage_profile_types_id_seq; Type: SEQUENCE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE SEQUENCE ngcloud_ru.storage_profile_types_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+ALTER SEQUENCE ngcloud_ru.storage_profile_types_id_seq OWNER TO vc_billing;
+
+--
+-- TOC entry 3413 (class 0 OID 0)
+-- Dependencies: 219
+-- Name: storage_profile_types_id_seq; Type: SEQUENCE OWNED BY; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER SEQUENCE ngcloud_ru.storage_profile_types_id_seq OWNED BY ngcloud_ru.storage_profile_types.id;
+
+
+--
+-- TOC entry 218 (class 1259 OID 1893959)
+-- Name: tenant; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE TABLE ngcloud_ru.tenant (
+    id uuid NOT NULL,
+    name character varying(255) NOT NULL,
+    wzcode bigint
+);
+
+
+ALTER TABLE ngcloud_ru.tenant OWNER TO vc_billing;
+
+--
+-- TOC entry 221 (class 1259 OID 1893973)
+-- Name: vdc; Type: TABLE; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+CREATE TABLE ngcloud_ru.vdc (
+    id uuid NOT NULL,
+    tenant_id uuid NOT NULL,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE ngcloud_ru.vdc OWNER TO vc_billing;
+
+--
+-- TOC entry 3245 (class 2604 OID 1893968)
+-- Name: storage_profile_types id; Type: DEFAULT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.storage_profile_types ALTER COLUMN id SET DEFAULT nextval('ngcloud_ru.storage_profile_types_id_seq'::regclass);
+
+
+--
+-- TOC entry 3255 (class 2606 OID 1893987)
+-- Name: capacity_resource capacity_resource_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_resource
+    ADD CONSTRAINT capacity_resource_pkey PRIMARY KEY (vdc_id, "timestamp");
+
+
+--
+-- TOC entry 3257 (class 2606 OID 1893997)
+-- Name: capacity_storage capacity_storage_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_storage
+    ADD CONSTRAINT capacity_storage_pkey PRIMARY KEY (vdc_id, id, "timestamp");
+
+
+--
+-- TOC entry 3249 (class 2606 OID 1893972)
+-- Name: storage_profile_types storage_profile_types_name_key; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.storage_profile_types
+    ADD CONSTRAINT storage_profile_types_name_key UNIQUE (name);
+
+
+--
+-- TOC entry 3251 (class 2606 OID 1893970)
+-- Name: storage_profile_types storage_profile_types_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.storage_profile_types
+    ADD CONSTRAINT storage_profile_types_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3247 (class 2606 OID 1893963)
+-- Name: tenant tenant_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.tenant
+    ADD CONSTRAINT tenant_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3253 (class 2606 OID 1893977)
+-- Name: vdc vdc_pkey; Type: CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.vdc
+    ADD CONSTRAINT vdc_pkey PRIMARY KEY (id);
+
+
+--
+-- TOC entry 3259 (class 2606 OID 1893988)
+-- Name: capacity_resource capacity_resource_vdc_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_resource
+    ADD CONSTRAINT capacity_resource_vdc_id_fkey FOREIGN KEY (vdc_id) REFERENCES ngcloud_ru.vdc(id) ON DELETE CASCADE;
+
+
+--
+-- TOC entry 3260 (class 2606 OID 1894003)
+-- Name: capacity_storage capacity_storage_storage_profile_types_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_storage
+    ADD CONSTRAINT capacity_storage_storage_profile_types_id_fkey FOREIGN KEY (storage_profile_types_id) REFERENCES ngcloud_ru.storage_profile_types(id);
+
+
+--
+-- TOC entry 3261 (class 2606 OID 1893998)
+-- Name: capacity_storage capacity_storage_vdc_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.capacity_storage
+    ADD CONSTRAINT capacity_storage_vdc_id_fkey FOREIGN KEY (vdc_id) REFERENCES ngcloud_ru.vdc(id) ON DELETE CASCADE;
+
+
+--
+-- TOC entry 3258 (class 2606 OID 1893978)
+-- Name: vdc vdc_tenant_id_fkey; Type: FK CONSTRAINT; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+ALTER TABLE ONLY ngcloud_ru.vdc
+    ADD CONSTRAINT vdc_tenant_id_fkey FOREIGN KEY (tenant_id) REFERENCES ngcloud_ru.tenant(id);
+
+
+--
+-- TOC entry 3410 (class 0 OID 0)
+-- Dependencies: 222
+-- Name: TABLE capacity_resource; Type: ACL; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+GRANT SELECT ON TABLE ngcloud_ru.capacity_resource TO grafanabilling;
+
+
+--
+-- TOC entry 3411 (class 0 OID 0)
+-- Dependencies: 223
+-- Name: TABLE capacity_storage; Type: ACL; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+GRANT SELECT ON TABLE ngcloud_ru.capacity_storage TO grafanabilling;
+
+
+--
+-- TOC entry 3412 (class 0 OID 0)
+-- Dependencies: 220
+-- Name: TABLE storage_profile_types; Type: ACL; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+GRANT SELECT ON TABLE ngcloud_ru.storage_profile_types TO grafanabilling;
+
+
+--
+-- TOC entry 3414 (class 0 OID 0)
+-- Dependencies: 218
+-- Name: TABLE tenant; Type: ACL; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+GRANT SELECT ON TABLE ngcloud_ru.tenant TO grafanabilling;
+
+
+--
+-- TOC entry 3415 (class 0 OID 0)
+-- Dependencies: 221
+-- Name: TABLE vdc; Type: ACL; Schema: ngcloud_ru; Owner: vc_billing
+--
+
+GRANT SELECT ON TABLE ngcloud_ru.vdc TO grafanabilling;
+
+
+-- Completed on 2025-09-15 09:53:18
+
+--
+-- PostgreSQL database dump complete
+--
+

etc/db/indexes.sql

@@ -0,0 +1,9 @@
+CREATE INDEX ON ngcloud_ru.capacity_resource (timestamp);
+CREATE INDEX ON ngcloud_ru.capacity_storage (timestamp);
+
+CREATE INDEX ON s3billing.bucket_stat (timestamp_addition);
+CREATE INDEX ON s3billing.usage_bucket_by_user (time);
+
+CREATE INDEX ON gpu.vm (dt_load);
+CREATE INDEX ON gpu.vm_power_state (ts);
+

etc/env.json.bak

@@ -1,8 +0,0 @@
-{
-	"ds_rpt_class": "org.postgresql.Driver",
-	"ds_rpt_connectionString": "jdbc:postgresql://db-services.adl.nubes.ru:5432/dwh",
-	"ds_rpt_username": "smishchuk",
-	"ds_rpt_password": "encrypted:46692f9b4e3bda4931a9b83685a04a15187cb725295dc68627d7eb0b760362bc8a9de8d28395fca70b30fa4595cf3ed4a83772ee73eaf13a",
-	"ds_rpt_connectionLimit": "5",
-	"IDP_CLIENT_SECRET": "mXuJehst7ZZSBIFpjpLZFicYRhpLmxVs",
-}

etc/set_env - Copy.cmd

@@ -1,10 +0,0 @@
-REM set Windows env 
-setx rpt_class org.postgresql.Driver /M
-setx rpt_connectionString jdbc:postgresql://write.09d78921-77a7-401a-b2cb-5ca11be850a0.services.ngcloud.ru:5432/rpt /M
-setx rpt_username appserver /M
-setx rpt_password encrypted:8b11c6e220c6456af3e08294e86cf91283d4119b58e25891e24719b0d27cbd4991d023c88da45113555c98d2cb5e4e969a4f585a94051527 /M
-setx rpt_connectionLimit 5 /M
-
-setx IDP_CLIENT_SECRET mXuJehst7ZZSBIFpjpLZFicYRhpLmxVs /M
-
-pause

etc/set_env - Copy.cmd.bak

@@ -1,10 +0,0 @@
-REM set Windows env 
-setx rpt_class org.postgresql.Driver /M
-setx rpt_connectionString jdbc:postgresql://write.09d78921-77a7-401a-b2cb-5ca11be850a0.services.ngcloud.ru:5432/rpt /M
-setx rpt_username smishchuk /M
-setx rpt_password encrypted:8b11c6e220c6456af3e08294e86cf91283d4119b58e25891e24719b0d27cbd4991d023c88da45113555c98d2cb5e4e969a4f585a94051527 /M
-setx rpt_connectionLimit 5 /M
-
-setx IDP_CLIENT_SECRET mXuJehst7ZZSBIFpjpLZFicYRhpLmxVs /M
-
-pause

etc/set_env.cmd.bak

@@ -1,10 +0,0 @@
-REM set Windows env 
-setx rpt_class org.postgresql.Driver /M
-setx rpt_connectionString jdbc:postgresql://write.09d78921-77a7-401a-b2cb-5ca11be850a0.services.ngcloud.ru:5432/rpt /M
-setx rpt_username smishchuk /M
-setx rpt_password encrypted:******** /M
-setx rpt_connectionLimit 5 /M
-
-setx IDP_CLIENT_SECRET ******** /M
-
-pause

etc/trash/payg2.cfm.bak

@@ -0,0 +1,159 @@
+<cfsilent>
+<cfimport prefix="m" taglib="lib"/>
+<cfimport prefix="c" taglib="lib/controls"/>
+<cfimport prefix="d" taglib="lib/data"/>
+<cfimport prefix="layout" taglib="layout"/>
+</cfsilent>
+
+<m:prepare_ls entity="payg" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
+
+<cfparam name="dt_finish" type="date" default=#createDateTime(year(Now()),month(Now()),1,0,0,0)#/>
+<cfparam name="dt_start" type="date" default=#dateAdd('m',-1,dt_finish)#/>
+<cfset hours=dateDiff('h',dt_start,dt_finish)/>
+<cfset tenant_wz_index=val(mid(request.auth.wz,3,5))/><!--- cut off WZ --->
+<cfset tenant_wz_index="00169"/><!--- cut off WZ --->
+
+
+<cfif isDefined("output_xls")><cfmodule template="mod/payg.cfm"
+		dt_finish=#dt_finish#
+		dt_start=#dt_start#
+		tenant_wz_index=#tenant_wz_index#
+		output="report"
+		debug=#isDefined("DEBUG")#
+	/><layout:xml qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.xml"/>
+	<cfabort/>
+	</cfif><cfif isDefined("output_json")><cfmodule template="mod/payg.cfm"
+		dt_finish=#dt_finish#
+		dt_start=#dt_start#
+		tenant_wz_index=#tenant_wz_index#
+		output="report"
+		debug=#isDefined("DEBUG")#
+	/><!--- <cfdump var=#report#/><cfabort/> ---><layout:json qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.json"/>
+	<cfabort/>
+	</cfif><!--- 
+---><layout:page section="header" pageInfo=#pageInfo#>	
+	
+	<layout:attribute name="title">
+		<cfoutput><b>Отчет по PAYG</b> #request.auth.wz#</cfoutput>
+	</layout:attribute>	
+	<layout:attribute name="controls">
+		<!---skip filter link, filter is not implemented--->
+		<!---<layout:language_switch/>--->
+	</layout:attribute>
+</layout:page>
+
+<!--- Внимание! округление вверх при расчете метрик get, put S3. Расчетные суммы могут содержать погрешности округления, поэтому окончательный расчет стоимости (количество * цену) должен выполняться в бухгалтерской программе.
+<b>Если у клиента больше 1 действующего допника с услугами PAYG, то данные в отчете могут быть замножены, в этом случае считать вручную</b> --->
+
+<cfoutput>
+<form method="post" action="">
+Период с <input type="text" name="dt_start" value="#dateFormat(dt_start,'YYYY-MM-DD')#"/>
+по <input type="text" name="dt_finish" value="#dateFormat(dt_finish,'YYYY-MM-DD')#"/>
+<input type="submit" style="cursor:pointer;"/>
+<!--- <input type="submit" name="DEBUG" value="DEBUG" style="cursor:pointer;"/> --->
+</form>
+
+
+
+<cfflush/>
+
+<cfmodule template="mod/payg.cfm"
+	dt_finish=#dt_finish#
+	dt_start=#dt_start#
+	tenant_wz_index=#tenant_wz_index#
+	output="report"
+	debug=#isDefined("DEBUG")#
+/>
+
+Часов в периоде: <b>#hours#</b> Строк в отчете: <b>#report.qCharge.recordCount#</b><br/>
+Актуальность данных: 
+VCD Computing: <b>#dateFormat(report.qComputingAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qComputingAge.dt_load,'HH:MM:SS')#</b>
+VCD Storage: <b>#dateFormat(report.qStorageAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qStorageAge.dt_load,'HH:MM:SS')#</b>
+S3 хранение: <b>#dateFormat(report.qS3VolAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3VolAge.dt_load,'HH:MM:SS')#</b>
+S3 операции и трафик: <b>#dateFormat(report.qS3OpsTrfAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3OpsTrfAge.dt_load,'HH:MM:SS')#</b>
+
+<br/>
+<a href="#request.thisPage#?output_xls" title="экспорт в Excel" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/xls.gif" style="vertical-align:text-bottom;"/></a>
+
+<a href="#request.thisPage#?output_json" title="экспорт в json" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/json.svg" style="vertical-align:text-bottom;" width="13" height="13"/></a>
+</cfoutput>
+<table class="worktable">	
+	<thead>
+		<td width="1%"></td>
+		<!--- <th width="3%">WZ</th> --->
+		<th width="7%">Артикул</th>		
+		<th width="7%">Кол-во (метрика)</th>
+		<th width="3%">Ед.изм.</th>
+		<th width="3%">Цена &#8381; со скид., с НДС</th>
+		<th width="3%">Стоимость &#8381; с НДС</th>
+		
+		<td width="3%">&nbsp;&nbsp;&nbsp;</td>	
+		
+		<td width="10%">Услуга</td>
+		<td width="10%">Компонент</td>
+<!--- 		<td width="10%">Клиентс. назв.</td> --->
+		
+		<td width="3%">GPL с НДС</td>
+		<td width="3%">Скидка%</td>
+		
+<!--- 		<td width="6%">Дата НОУ</td>
+		<td width="6%">Дата оконч.</td>	
+		
+		<td width="3%">Ключ строки</td> --->
+<!--- 		<td width="3%">Сырая метрика</td> --->
+		<td width="3%">Оплачиваемый объем</td>
+		
+<!--- 		<td width="5%">Договор</td>
+		<td width="10%">Допник</td>
+		<td width="10%">Сделка</td> --->
+	
+	</thead>
+		
+	<cfoutput query="report.qCharge" group="svc">
+		<cfset var acc=0/>			
+		<tr>
+			<td bgcolor="##ccc"></td>
+			<td bgcolor="##ccc" colspan="5" class="b"> #svc#</td>
+			<td></td>
+			<td bgcolor="##ccc" colspan="99"></td>
+		</tr>
+		<cfoutput>	
+		<cfset acc=acc+charge/>
+		<tr>
+			<td>#currentRow#</a></td>
+			
+			<td>#code#</td>	
+			<td class="r" style="font-size:120%; padding:0 1em;">#chargeable_metric#</td>
+			<td class="c" style="font-size:90%;">#unit#</td>
+			<td class="r">#discounted_price#</td>
+			<td class="r">#charge#</td>
+			
+			<td></td>	
+			
+			<td>#svc#</td>
+			<td>#component#</td>
+<!--- 			<td>#user_description#</td>	 --->
+						
+			<td class="r">#price#</td>
+			<td class="r">#discount#</td>
+			
+			<td class="r">#metric#</td>						
+	
+		</tr>
+		</cfoutput>
+		<tr>
+			<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
+			<td bgcolor="##eee" colspan="4" class="r" style="border-bottom:2px solid gray;"><b>Итого</b> #svc#:</td>
+			<td bgcolor="##eee" colspan="1" class="r b" style="border-bottom:2px solid gray;">#NumFmt(acc,2)#</td>
+			<td colspan="14" style="border-bottom:2px solid gray;"></td>
+		</tr >
+	</cfoutput>
+
+</table>
+<!--- <cfdump var=#qCharge#/> --->
+
+
+<layout:page section="footer"/>
+
+<!--- select * from s3billing.billing_per_user_fix_pl('2025-05-01 00:00:00','2025-06-01 00:00:00','1395'); --->
+

index.cfm

@@ -4,30 +4,8 @@
 <cfimport prefix="d" taglib="lib/data"/>
 <cfimport prefix="layout" taglib="layout"/>
 </cfsilent>
-
 <m:prepare_ls entity="payg" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
-
+<!--- 
-<cfparam name="dt_finish" type="date" default=#createDateTime(year(Now()),month(Now()),1,0,0,0)#/>
-<cfparam name="dt_start" type="date" default=#dateAdd('m',-1,dt_finish)#/>
-<cfset hours=dateDiff('h',dt_start,dt_finish)/>
-<cfset tenant_wz_index=val(mid(request.auth.wz,3,5))/><!--- cut off WZ --->
-
-
-<cfif isDefined("output_xls")><cfmodule template="mod/payg.cfm"
-		dt_finish=#dt_finish#
-		dt_start=#dt_start#
-		output="report"
-		debug=#isDefined("DEBUG")#
-	/><layout:xml qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.xml"/>
-	<cfabort/>
-	</cfif><cfif isDefined("output_json")><cfmodule template="mod/payg.cfm"
-		dt_finish=#dt_finish#
-		dt_start=#dt_start#
-		output="report"
-		debug=#isDefined("DEBUG")#
-	/><!--- <cfdump var=#report#/><cfabort/> ---><layout:json qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.json"/>
-	<cfabort/>
-	</cfif><!--- 
 ---><layout:page section="header" pageInfo=#pageInfo#>	
 	
 	<layout:attribute name="title">
@@ -39,117 +17,21 @@
 	</layout:attribute>
 </layout:page>
 
-<!--- Внимание! округление вверх при расчете метрик get, put S3. Расчетные суммы могут содержать погрешности округления, поэтому окончательный расчет стоимости (количество * цену) должен выполняться в бухгалтерской программе.
+<!--- <script type="text/javascript"/>
-<b>Если у клиента больше 1 действующего допника с услугами PAYG, то данные в отчете могут быть замножены, в этом случае считать вручную</b> --->
+$(document).ready(function() {	
+	document.location="payg.cfm";
+});
+</script> --->
 
-<cfoutput>
+<h1>
-<form method="post" action="">
+Подождите пожалуйста, формирование отчета может занять некоторое время
-Период с <input type="text" name="dt_start" value="#dateFormat(dt_start,'YYYY-MM-DD')#"/>
+</h1>
-по <input type="text" name="dt_finish" value="#dateFormat(dt_finish,'YYYY-MM-DD')#"/>
+<a href="payg.cfm">Если автоматического перенаправления не произошло, перейдите по ссылке</a>
-<input type="submit" style="cursor:pointer;"/>
-<!--- <input type="submit" name="DEBUG" value="DEBUG" style="cursor:pointer;"/> --->
-</form>
-
-
-
-<cfflush/>
-
-<cfmodule template="mod/payg.cfm"
-	dt_finish=#dt_finish#
-	dt_start=#dt_start#
-	output="report"
-	debug=#isDefined("DEBUG")#
-/>
-
-Часов в периоде: <b>#hours#</b> Строк в отчете: <b>#report.qCharge.recordCount#</b><br/>
-Актуальность данных: 
-VCD Computing: <b>#dateFormat(report.qComputingAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qComputingAge.dt_load,'HH:MM:SS')#</b>
-VCD Storage: <b>#dateFormat(report.qStorageAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qStorageAge.dt_load,'HH:MM:SS')#</b>
-S3 хранение: <b>#dateFormat(report.qS3VolAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3VolAge.dt_load,'HH:MM:SS')#</b>
-S3 операции и трафик: <b>#dateFormat(report.qS3OpsTrfAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3OpsTrfAge.dt_load,'HH:MM:SS')#</b>
-
-<br/>
-<a href="#request.thisPage#?output_xls" title="экспорт в Excel" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/xls.gif" style="vertical-align:text-bottom;"/></a>
-
-<a href="#request.thisPage#?output_json" title="экспорт в json" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/json.svg" style="vertical-align:text-bottom;" width="13" height="13"/></a>
-</cfoutput>
-<table class="worktable">	
-	<thead>
-		<td width="1%"></td>
-		<!--- <th width="3%">WZ</th> --->
-		<th width="7%">Артикул</th>		
-		<th width="7%">Кол-во (метрика)</th>
-		<th width="3%">Ед.изм.</th>
-		<th width="3%">Цена &#8381; со скид., с НДС</th>
-		<th width="3%">Стоимость &#8381; с НДС</th>
-		
-		<td width="3%">&nbsp;&nbsp;&nbsp;</td>	
-		
-		<td width="10%">Услуга</td>
-		<td width="10%">Компонент</td>
-<!--- 		<td width="10%">Клиентс. назв.</td> --->
-		
-		<td width="3%">GPL с НДС</td>
-		<td width="3%">Скидка%</td>
-		
-<!--- 		<td width="6%">Дата НОУ</td>
-		<td width="6%">Дата оконч.</td>	
-		
-		<td width="3%">Ключ строки</td> --->
-<!--- 		<td width="3%">Сырая метрика</td> --->
-		<td width="3%">Оплачиваемый объем</td>
-		
-<!--- 		<td width="5%">Договор</td>
-		<td width="10%">Допник</td>
-		<td width="10%">Сделка</td> --->
-	
-	</thead>
-		
-	<cfoutput query="report.qCharge" group="svc">
-		<cfset var acc=0/>			
-		<tr>
-			<td bgcolor="##ccc"></td>
-			<td bgcolor="##ccc" colspan="5" class="b"> #svc#</td>
-			<td></td>
-			<td bgcolor="##ccc" colspan="99"></td>
-		</tr>
-		<cfoutput>	
-		<cfset acc=acc+charge/>
-		<tr>
-			<td>#currentRow#</a></td>
-			
-			<td>#code#</td>	
-			<td class="r" style="font-size:120%; padding:0 1em;">#chargeable_metric#</td>
-			<td class="c" style="font-size:90%;">#unit#</td>
-			<td class="r">#discounted_price#</td>
-			<td class="r">#charge#</td>
-			
-			<td></td>	
-			
-			<td>#svc#</td>
-			<td>#component#</td>
-<!--- 			<td>#user_description#</td>	 --->
-						
-			<td class="r">#price#</td>
-			<td class="r">#discount#</td>
-			
-			<td class="r">#metric#</td>						
-	
-		</tr>
-		</cfoutput>
-		<tr>
-			<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
-			<td bgcolor="##eee" colspan="4" class="r" style="border-bottom:2px solid gray;"><b>Итого</b> #svc#:</td>
-			<td bgcolor="##eee" colspan="1" class="r b" style="border-bottom:2px solid gray;">#NumFmt(acc,2)#</td>
-			<td colspan="14" style="border-bottom:2px solid gray;"></td>
-		</tr >
-	</cfoutput>
-
-</table>
-<!--- <cfdump var=#qCharge#/> --->
 
 
 <layout:page section="footer"/>
 
+<cflocation url="payg.cfm" addToken="No"/>
+
 <!--- select * from s3billing.billing_per_user_fix_pl('2025-05-01 00:00:00','2025-06-01 00:00:00','1395'); --->
 

json.cfm

@@ -20,6 +20,16 @@
 	<cfreturn #reReplace(ARGUMENTS.camel,"([A-Z])","_\l\1","ALL")#/>	
 </cffunction>
 
+
+<cffunction name="iso8601dtFormat" 
+	returntype="string" 
+	output="false"
+	hint="formates date and time like this: 2023-12-18T15:41:42.516+0300">	
+	<cfargument name="input" required="true" />
+	<cfreturn "#dateFormat( input, "yyyy-mm-dd" )#T#timeFormat( input, "HH:mm:ss.lXX" )#"/>	
+</cffunction>
+
+
 <cffunction name="query2json" 
 	output="false"
 	hint="print query in json format as array of structures">	
@@ -54,17 +64,23 @@
 <cfmodule template="mod/payg.cfm"
 	dt_finish=#dt_finish#
 	dt_start=#dt_start#
+	tenant_wz_index=#tenant_wz_index#
 	output="report"
 	debug=#isDefined("DEBUG")#
 /> 
 <cfset out={
+	"appVersion"=#request.APP_VERSION#,
 	"hours"=#hours#,
-	"vcdComputingLoadedAt"="#dateFormat(report.qComputingAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qComputingAge.dt_load,'HH:MM:SS')#",
+	"dtStart="=#iso8601dtFormat(dt_start)#,
-	"vcdStorageLoadedAt"="#dateFormat(report.qStorageAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qStorageAge.dt_load,'HH:MM:SS')#",
+	"dtFinish"=#iso8601dtFormat(dt_finish)#,
-	"s3StorageLoadedAt"="#dateFormat(report.qComputingAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3VolAge.dt_load,'HH:MM:SS')#",
+	"vcdComputingLoadedAt"="#iso8601dtFormat(report.qComputingAge.dt_load)#",
-	"s3OpsTrfLoadedAt"="#dateFormat(report.qS3OpsTrfAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3OpsTrfAge.dt_load,'HH:MM:SS')#",	
+	"vcdStorageLoadedAt"="#iso8601dtFormat(report.qStorageAge.dt_load)#",
+	"s3StorageLoadedAt"="#iso8601dtFormat(report.qComputingAge.dt_load)#",
+	"s3OpsTrfLoadedAt"="#iso8601dtFormat(report.qS3OpsTrfAge.dt_load)#",	
 	"records"=#report.qCharge.recordCount#,
 	"queryDurationMs"=#(getTickCount() - msStartAt)#,
+	"wz"=#request.auth.wz#,
+	"login"=#request.auth.login#,
 	"report"=#report.qCharge.reduce((result, row) => {
 		result.append(row);
 		return result;

mod/conventions.txt

@@ -0,0 +1,3 @@
+White label
+	на экране логина предусматривать место для custom текста
+	Помимо лого, предусматривать custom text

mod/crm_contract.cfm

@@ -0,0 +1,94 @@
+<cfimport prefix="m" taglib="../lib"/>
+<cfimport prefix="d" taglib="../lib/data"/>
+
+<cfparam name="ATTRIBUTES.wz"/>
+<cfparam name="ATTRIBUTES.crm_cache_base" default="https://elma-cache.adl.nubes.ru/contract_ls.cfm"/>
+<cfparam name="ATTRIBUTES.out" default="qComponent"/>
+
+<cfhttp method="get" 	
+	url="#ATTRIBUTES.crm_cache_base#?wz=#ATTRIBUTES.wz#"
+	timeout=10
+	charset="utf-8"	
+	result="res"
+>	
+</cfhttp>
+
+<cfset local={}/>
+
+<cfset company=deserializeJson(res.fileContent)/>
+<!--- <cfdump var=#company#/> --->
+<!--- *** это не слишком надежно, некорректно представленный NULL (обыкновенно представляемый пустой строкой) может все сломать. Да и корректный --->
+<!--- мартышкин труд собирать этот запрос из JSON , может, лучше было динамически --->
+<cfset qComponent = queryNew("
+	 contractId
+	,contractOutsideId
+
+	,additionalAgreementId
+	,additionalAgreementName
+
+	,dealIndex
+	,serviceId
+	,serviceType
+	,catalogName
+	,serviceCode
+	,serviceCustomName
+	,serviceStart
+	,serviceEnd
+	,serviceDiscount
+	,serviceQuantity
+	,serviceHash
+
+	,paramId	
+	,componentCode	
+	,component	
+	,measureShort	
+	,quantity	
+	,priceWVat	
+	,discount	
+	,atomicCode
+	,fullCode
+")/>
+
+<!--- this.nullSupport = true in Application.cfc ... no way --->
+<cfloop array=#company.contracts# item="local.contract"><!--- имя массива писать в ##, иначе думает, что это строковый литерал --->
+	<cfloop array=#local.contract.additionalAgreements# item="local.additionalAgreement">
+		<cfif NOT local.additionalAgreement.isActual><cfcontinue/></cfif>
+		<cfloop array=#local.additionalAgreement.services# item="local.service">
+			<cfloop array=#local.service.components# item="local.component">
+				<cfset queryAddRow(qComponent, [{
+				contractId=local.contract.contractId,
+				contractOutsideId=local.contract.contractOutsideId,
+				
+				additionalAgreementId=local.additionalAgreement.additionalAgreementId,
+				additionalAgreementName=local.additionalAgreement.additionalAgreementName,
+				
+				dealIndex=local.service.dealIndex ,
+				serviceId=local.service.serviceId ,
+				serviceType=local.service.serviceType,
+				catalogName=local.service.catalogName,
+				serviceCode=local.service.serviceCode,
+				serviceCustomName=local.service.serviceCustomName,
+				serviceStart=parseDateTime(local.service.serviceStart.ts),
+				serviceEnd=isDate(structGet("local.service.serviceEnd.ts"))? parseDateTime(local.service.serviceEnd.ts):javacast('null',''),
+				serviceDiscount=local.service.discount,
+				serviceQuantity=local.service.quantity,
+				serviceHash=local.service.serviceHash,
+				
+				paramId=local.component.paramId,
+				componentCode=local.component.componentCode,
+				component=local.component.component,
+				measureShort=local.component.measureShort,
+				quantity=local.component.quantity,
+				priceWVat=local.component.priceWVat,
+				discount=local.component.discount,
+				atomicCode=local.component.atomicCode,
+				fullCode="#local.component.componentCode#-#listGetAt('i,f,m',local.service.serviceType)#"
+				}])/>
+			</cfloop>
+		</cfloop>
+	</cfloop>	
+</cfloop>
+
+<!--- <cfdump var=#qComponent#/> --->
+<cfset "CALLER.#ATTRIBUTES.out#" = qComponent/>
+<cfexit method="exittag"/>

mod/payg.cfm

@@ -5,30 +5,103 @@
 <cfparam name="ATTRIBUTES.dt_start" type="date" default=#dateAdd('m',-1,ATTRIBUTES.dt_finish)#/>
 <cfparam name="ATTRIBUTES.output" type="string" default="report"/>
 <cfparam name="ATTRIBUTES.debug" type="boolean" default=false/>
-
+<cfparam name="ATTRIBUTES.tenant_wz_index" type="string"/>
-<cfset hours=dateDiff('h', ATTRIBUTES.dt_start, ATTRIBUTES.dt_finish)/>
-<cfset tenant_wz_index=val(mid(request.auth.wz,3,5))/><!--- cut off WZ --->
 
 
-<!--- QoQ does not support join syntax, at least of Lucee 5.4--->
+<cfset hours=dateDiff('h', ATTRIBUTES.dt_start, ATTRIBUTES.dt_finish)/> <!--- *** нужно для каждого фрагмента --->
+<!--- 
+*** ВНИМАНИЕ! Вычитать минимальный лимит нужно после агрегации! 
+Исходная последовательность расчетов сначала делает агрегацию по месяцу, при расчете по дням нужно менять порядок
+--->
+<!--- 
+Скрытое противоречие, которое требует разрешения: если у нас несколько периодов тарификации в одном месяце (по разной цене), ИЗ КАКОГО вычитать минимальный лимит?
+Еще сложность, если лимита хватает на несколько периодов тарификации, как его распределять по периодам. Если тарификация строго по месяцам, этой проблемы нет.
+Это можно сделать процедурно, но сложность расчета все возрастает
+--->
+<!--- *** Проверить, что у нас не биллится закрытый период (закрытый следующим) - возможно, с учетом line_key 
+- насколько вижу, прошлый период закрывается, причем концы отрезки закрытые (конец включается). Считаем, что этой проблемы нет
+--->
 
 
-<!--- Для начала выкатываем просто кусок каталога, не фильтруя по спеке (которой иногда нет) --->
+<!--- QoQ does not support join syntax, and of course outer joins, at least of Lucee 5.4--->
-<cfquery name="qSpec">
+<!--- а внешние джойны хорошо подсвечивают ошибки, особенно помогает full --->
-	select * from (
+
-	values
+<cfmodule template="crm_contract.cfm" wz="WZ01348" out="qSpecification"/><!--- WZ01200 --->
-	 ('Объектное хранилище S3 CEPH','Дисковое пространство: Объем хранения','paas.s3.ceph.vol-m','ГБайт',1.80,0)
+<cfif (ATTRIBUTES.debug)>
-	,('Объектное хранилище S3 CEPH','Исходящий трафик','paas.s3.ceph.trf-m','ГБайт',1.50,0)
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
-	,('Объектное хранилище S3 CEPH','Запросы GET, HEAD, OPTIONS','paas.s3.ceph.get-m','10тыс.шт.',0.35,0)
+	<cfdump var=#qSpecification#/>
-	,('Объектное хранилище S3 CEPH','Запросы PUT, POST, PATCH','paas.s3.ceph.put-m','10тыс.шт.',4.50,0)
+	<cfflush/>
-	) as 
+</cfif>
-	s (svc, component, code, unit, price, discount)
+
-	order by code
+<cfquery name="qComputingAge">
+	select max(capacity_resource.timestamp) as dt_load from ngcloud_ru.capacity_resource
+</cfquery>
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qComputingAge#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qStorageAge" datasource="rpt">
+	select max(capacity_storage.timestamp) as dt_load from ngcloud_ru.capacity_storage
 </cfquery>
 
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qStorageAge#/>
+	<cfflush/>
+</cfif>
 
-<!--- Нужно еще реализовать в модели данных политики бесплатного минимума --->
+<cfquery name="qS3VolAge">
-<cfquery name="qComputing">
+	select max(timestamp_addition) as dt_load from s3billing.bucket_stat
+</cfquery>
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3VolAge#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qS3OpsTrfAge">
+	select max(time) as dt_load from s3billing.usage_bucket_by_user 
+</cfquery>
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3OpsTrfAge#/>
+	<cfflush/>
+</cfif>
+
+
+<cfset qFreeTier=queryNew("code,free_tier","CF_SQL_VARCHAR,CF_SQL_NUMERIC",[['paas.s3.ceph.vol-m',1],['paas.s3.ceph.get-m',10],['paas.s3.ceph.put-m',1],['paas.s3.ceph.trf-m',100]])/>
+<!--- -- все-таки пришлось прибить гвоздями - в каталоге нет даже бесплатного лимита, не то что скидочной политики
+-- придется добавить в каталог
+-- бесплатный лимит есть только для S3 HOT (в месяц в единицах измерения) --->
+
+
+<!--- здесь нужно организовать пересечение версионной спецификации с анализируемым диапазоном дат --->
+<cfquery name="qSpec" dbtype="query">
+select s.catalogName as svc, s.component, s.fullCode as code, s.measureShort as unit
+, s.priceWVat as price, (s.discount + s.serviceDiscount - s.discount*s.serviceDiscount/100) as discount 
+,s.serviceStart, s.serviceEnd, s.serviceHash, s.serviceCustomName, f.free_tier
+from qSpecification s, qFreeTier f 
+WHERE s.fullCode=f.code
+
+UNION 
+
+select s.catalogName as svc, s.component, s.fullCode as code, s.measureShort as unit
+, s.priceWVat as price, (s.discount + s.serviceDiscount - s.discount*s.serviceDiscount/100) as discount 
+,s.serviceStart, s.serviceEnd, s.serviceHash, s.serviceCustomName, 0
+from qSpecification s
+WHERE s.fullCode NOT IN (<cfqueryparam value="#ValueList(qFreeTier.code)#" cfsqltype="cf_sql_varchar" list="true">)
+</cfquery>
+
+<!--- <cfdump var=#qSpec# abort=true/> --->
+
+
+<!--- <cfloop from=#attributes.dt_start# to=#attributes.dt_finish# step="#CreateTimeSpan( 1, 0, 0, 0 )#" index="local.dt"> 
+	<cfdump var=#dateFormat(local.dt,"YYYY-MM-DD")#/>--->
+
+	<!--- *** Нужно еще реализовать в модели данных политики бесплатного минимума, сейчас пробито гвоздями --->
+	<cfquery name="qComputing">
 		select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, 
 		case 
 			when vdc.name like '%-v1cl1%' then 'iaas.ngc.i29' 
@@ -37,29 +110,26 @@
 			when vdc.name like '%-v1cl6%' then 'iaas.ngc.i28' 
 			else '['||vdc.name||']' end as code,
 		sum(cpu_used/cpu_speed)/4. as core_h,
-	sum(mem_used)/1024/4. as gb_h
+		sum(mem_used)/1024/4. as gb_h, 
+		capacity_resource.timestamp::date as dt
 		from ngcloud_ru.capacity_resource 
 		join ngcloud_ru.vdc on capacity_resource.vdc_id=vdc.id 
 		join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
-	where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#tenant_wz_index#/> 
+		where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/> 
-	AND capacity_resource.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+		AND capacity_resource.timestamp::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-	AND capacity_resource.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/> 
+		AND capacity_resource.timestamp::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
-	group by tenant.wzcode, vdc.name 
+		group by tenant.wzcode, vdc.name, capacity_resource.timestamp::date 
-	order by tenant.wzcode, vdc.name;
+		order by tenant.wzcode, vdc.name, capacity_resource.timestamp::date;
-</cfquery>
+	</cfquery>
 
-<cfif (ATTRIBUTES.debug)>
+	<cfif (ATTRIBUTES.debug)>
+		<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
 		<cfdump var=#qComputing#/>
 		<cfflush/>
-</cfif>
+	</cfif>
 
-<cfquery name="qComputingAge">
+	<!--- переделать storage_profile_types с расшифровкой ssd, sata, можно прямо до каталожного кода --->
-	select max(capacity_resource.timestamp) as dt_load from ngcloud_ru.capacity_resource
+	<cfquery name="qStorage">
-</cfquery>
-
-
-<!--- переделать storage_profile_types с расшифровкой ssd, sata, можно прямо до каталожного кода --->
-<cfquery name="qStorage">
 		select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, 
 		case 
 			WHEN vdc.name LIKE '%-v1cl1%' THEN 'iaas.ngc.i29' 
@@ -75,32 +145,26 @@
 		as code,
 		storage_profile_types.name, -- *** это не тип, а профайл
 		sum("limit")/1024./4 as gb_h_limit, -- 4 потому, что сбор раз в 15 минут
-	sum(used)/1024./4 as gb_h_used
+		sum(used)/1024./4 as gb_h_used,
+		capacity_storage.timestamp::date as dt
 		from ngcloud_ru.capacity_storage
 		join ngcloud_ru.vdc on capacity_storage.vdc_id=vdc.id 
 		join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
 		join ngcloud_ru.storage_profile_types on capacity_storage.storage_profile_types_id=storage_profile_types.id
-	where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#tenant_wz_index#/>
+		where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/>
-	AND capacity_storage.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/>
+		AND capacity_storage.timestamp::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-	AND capacity_storage.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/> 
+		AND capacity_storage.timestamp::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
-	group by tenant.wzcode, vdc.name, storage_profile_types.name 
+		group by tenant.wzcode, vdc.name, storage_profile_types.name, capacity_storage.timestamp::date 
-	order by tenant.wzcode, vdc.name, storage_profile_types.name;
+		order by tenant.wzcode, vdc.name, storage_profile_types.name, capacity_storage.timestamp::date;
-</cfquery>
+	</cfquery>
-<cfquery name="qStorageAge" datasource="rpt">
-	select max(capacity_storage.timestamp) as dt_load from ngcloud_ru.capacity_storage
-</cfquery>
 
-<cfif (ATTRIBUTES.debug)>
-	<cfdump var=#qStorage#/>
-	<cfflush/>
-</cfif>
 
-<!--- 
+	<!--- 
-"placement"	"size_gb"	"get_10k"	"put_10k"	"bytes_sent_gb"
+	"placement"	"size_gb"	"get_10k"	"put_10k"	"bytes_sent_gb"
-HOT_FREE_LIMIT	1	10	1	100 
+	HOT_FREE_LIMIT	1	10	1	100 
---->
+	--->
-<!--- надо дисконтировать не ГБ-часы а ГБ-месяцы --->
+	<!--- надо дисконтировать не ГБ-часы а ГБ-месяцы --->
-<cfquery name="qS3Vol">
+	<cfquery name="qS3Vol">
 		select /* *** ниже дублирование кода агрегации - round ceil etc, обратить внимание при правке */
 		 (sum(bucket_stat.usage_rgw_main_size_actual)/<cfqueryparam cfsqltype="cf_sql_integer" value=#hours#/>) as vol_B
 		,ceil(sum(bucket_stat.usage_rgw_main_size_actual)/<cfqueryparam cfsqltype="cf_sql_integer" value=#hours#/>/1024/1024/1024) as vol_GB
@@ -113,29 +177,27 @@ HOT_FREE_LIMIT	1	10	1	100
 			else '['|| TO_CHAR(bucket_stat.placement_id,'FM9') ||']' end as code
 		--,bucket_stat.placement_id
 		,'WZ'||lpad(bucket_stat.owner, 5, '0') as wz -- *** здесь не число, а строка, поэтому другая формула обратной сборки WZ
-	
+		,bucket_stat.timestamp_addition::date as dt
 		from s3billing.bucket_stat 
 		join s3billing.placement ON s3billing.placement.id=bucket_stat.placement_id 
 		join s3billing.bucket_info ON bucket_info.id=bucket_stat.bucket_id 
 		where bucket_stat.placement_id in (1,2) 
-	AND bucket_stat.owner = <cfqueryparam cfsqltype="cf_sql_varchar" value=#tenant_wz_index#/>
+		AND bucket_stat.owner = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
-	AND bucket_stat.timestamp_addition >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+		AND bucket_stat.timestamp_addition::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-	AND bucket_stat.timestamp_addition < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/>
+		AND bucket_stat.timestamp_addition::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
-	group by bucket_stat.owner, bucket_stat.placement_id
+		group by bucket_stat.owner, bucket_stat.placement_id, bucket_stat.timestamp_addition::date
-	order by bucket_stat.owner, bucket_stat.placement_id;
+		order by bucket_stat.owner, bucket_stat.placement_id, bucket_stat.timestamp_addition::date;
-</cfquery>
+	</cfquery>
 
-<cfif (ATTRIBUTES.debug)>
+	<cfif (ATTRIBUTES.debug)>
+		<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
 		<cfdump var=#qS3Vol#/>
 		<cfflush/>
-</cfif>
+	</cfif>
 
-<cfquery name="qS3VolAge">
-	select max(timestamp_addition) as dt_load from s3billing.bucket_stat
-</cfquery>
 
-<cfquery name="qS3OpsTrf">
+	<cfquery name="qS3OpsTrf">
-select	
+	select	
 		sum(
 			CASE WHEN 
 			(category.name LIKE 'get%'
@@ -189,7 +251,6 @@ select
 		,ceil(sum(bytes_sent)/1024/1024/1024) as bytes_sent_GB
 		,greatest(ceil(sum(bytes_sent)/1024/1024/1024) - CASE WHEN bucket_info.placement_id = 1 THEN 100 ELSE 0 END, 0
 		) as bytes_sent_GB_free_tier_subtracted	
-	
 		,case 
 			when bucket_info.placement_id = 1 then 'paas.s3.ceph'
 			when bucket_info.placement_id = 2 then 'paas.s3.cphc'
@@ -197,74 +258,160 @@ select
 		,bucket_info.placement_id
 		--category.name, bucket_info.name
 		,'WZ'||lpad(user_info.name, 5, '0') as wz
+		,usage_bucket_by_user.time::date as dt
 		from s3billing.usage_bucket_by_user 
 		join s3billing.user_info on usage_bucket_by_user.user_id=user_info.id  
 		join s3billing.category on usage_bucket_by_user.category_id=category.id
 		join s3billing.bucket_info on usage_bucket_by_user.bucketid=bucket_info.id 
 		join s3billing.placement on bucket_info.placement_id=placement.id 
 		where 1=1
-	AND user_info.name = <cfqueryparam cfsqltype="cf_sql_varchar" value=#tenant_wz_index#/>
+		AND user_info.name = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
-	AND usage_bucket_by_user.time >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+		AND usage_bucket_by_user.time::date >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_start#/> 
-	AND usage_bucket_by_user.time < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/>
+		AND usage_bucket_by_user.time::date <= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#attributes.dt_finish#/> 
-	group by user_info.name, bucket_info.placement_id
+		group by user_info.name, bucket_info.placement_id, usage_bucket_by_user.time::date
-	order by user_info.name, bucket_info.placement_id;
+		order by user_info.name, bucket_info.placement_id, usage_bucket_by_user.time::date;
-</cfquery>
+	</cfquery>
 
-<cfif (ATTRIBUTES.debug)>
+	<cfif (ATTRIBUTES.debug)>
+		<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
 		<cfdump var=#qS3OpsTrf#/>
 		<cfflush/>
-</cfif>
+	</cfif>
 
-<cfquery name="qS3OpsTrfAge">
+	<!--- собрали все метрики в один резалтсет --->
-	select max(time) as dt_load from s3billing.usage_bucket_by_user 
+	<cfquery name="qUnifiedMetric" dbType="query">
-</cfquery>
+		select dt, wz, code || '.vcpu-m' as code, core_h as raw_metric, core_h as metric from qComputing
+		union all
+		select dt, wz, code || '.ram-m' as code, gb_h as raw_metric, gb_h as metric from qComputing
+		union all
+		select dt, wz, code, gb_h_used as raw_metric, gb_h_used as metric from qStorage
+		union all
+		select dt, wz, code || '.vol-m', vol_b as raw_metric, vol_gb as metric from qS3Vol
+		union all
+		select dt, wz, code || '.get-m', get as raw_metric, get_10k as metric from qS3OpsTrf
+		union all
+		select dt, wz, code || '.put-m', put as raw_metric, put_10k as metric from qS3OpsTrf
+		union all
+		select dt, wz, code || '.trf-m', bytes_sent as raw_metric, bytes_sent_gb as metric from qS3OpsTrf
 		
+		order by dt, code
+	</cfquery>
 
-<cfquery name="qUnifiedMetric" dbType="query">
+	<!--- <cfdump var=#qUnifiedMetric#/> --->
-select wz, code || '.vcpu-m' as code, core_h as raw_metric, core_h as metric, core_h as chargeable_metric from qComputing
+	<cfif (ATTRIBUTES.debug)>
-union all
+		<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
-select wz, code || '.ram-m' as code, gb_h as raw_metric, gb_h as metric, gb_h as chargeable_metric from qComputing
-union all
-select wz, code, gb_h_used as raw_metric, gb_h_used as metric, gb_h_used as chargeable_metric from qStorage
-union all
-select wz, code || '.vol-m', vol_b as raw_metric, vol_gb as metric, vol_GB_free_tier_subtracted as chargeable_metric from qS3Vol
-union all
-select wz, code || '.get-m', get as raw_metric, get_10k as metric, get_10k_free_tier_subtracted as chargeable_metric from qS3OpsTrf
-union all
-select wz, code || '.put-m', put as raw_metric, put_10k as metric, put_10k_free_tier_subtracted as chargeable_metric from qS3OpsTrf
-union all
-select wz, code || '.trf-m', bytes_sent as raw_metric, bytes_sent_gb as metric, bytes_sent_gb_free_tier_subtracted as chargeable_metric from qS3OpsTrf
-</cfquery>
-
-<cfif (ATTRIBUTES.debug)>
 		<cfdump var=#qUnifiedMetric#/>
 		<cfflush/>
-</cfif>
+	</cfif>
 
-<cfquery name="qCharge" dbType="query">
+
-SELECT 
+	<!--- умножаем на цену, вычисляем дисконт (довольно поздно) и форматируем
-<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
+	*** здесь нужно учесть версионность. Самым простым кажется декомпозировать по дням и снова собрать 
+	*** только как нам это сделать без нормального SQL движка
+	Может быть, процедурная обработка не будет выглядеть ужасно, и не хуже SQL
+	В конце концов, можно просто  В ЦИКЛЕ обсчитать диапазон по дням, выполнив запрос 30 раз, или сколько надо
+	Если будет тупить - оптимизируем
+	--->
+
+	<!--- Для декомпозиции на более мелкие объекты мы можем как полумеру - профильтровать по конкретному бакету или ВМ-ВДЦ
+	Что не нравится - для ВМ у нас может быть целое дерево нижележащих объектов вместо линейного списка бакетов --->
+	
+	<!--- Вычитание Free Tier можно начинать с начала месяца - для этого можно сгруппировать по месяцам --->
+	<!--- Кажется, здесь еще рано агрегировать, если мы хотим OUTER JOIN --->
+	<cfquery name="qChargeDaily" dbType="query">
+		SELECT 
+		<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
 			<d:field title="Артикул">s.code</d:field>
+			<d:field title="Артикул">m.code as m_code</d:field>
 			<d:field title="Услуга">s.svc</d:field>
 			<d:field title="Компонент">s.component</d:field>
-	<d:field title="Кол-во (метрика)" cfSqlType="CF_SQL_NUMERIC">m.chargeable_metric</d:field>
 			<d:field title="Ед.изм.">s.unit</d:field>
 			<d:field title="Цена &##8381; с НДС" cfSqlType="CF_SQL_NUMERIC">s.price*(100-s.discount)/100 as discounted_price</d:field>
-	<d:field title="Стоимость &##8381; с НДС" cfSqlType="CF_SQL_NUMERIC">s.price*(100-s.discount)/100*m.chargeable_metric as charge</d:field>
+			<d:field title="Цена с НДС" cfSqlType="CF_SQL_NUMERIC">s.price</d:field>
-<!--- 	<d:field title="Дата НОУ" cfSqlType="CF_SQL_TIMESTAMP">s.dt_from</d:field> --->
-<!--- 	<d:field title="Дата оконч." cfSqlType="CF_SQL_TIMESTAMP">s.dt_to</d:field>
-	<d:field title="Ключ строки">s.line_key</d:field> --->
-	<d:field title="GPL с НДС" cfSqlType="CF_SQL_NUMERIC">s.price</d:field>
 			<d:field title="Скидка%" cfSqlType="CF_SQL_NUMERIC">s.discount</d:field>
 			<d:field title="Сырая метрика" cfSqlType="CF_SQL_NUMERIC">m.raw_metric</d:field>
 			<d:field title="Приведенная метрика" cfSqlType="CF_SQL_NUMERIC">m.metric</d:field>
+			<d:field title="serviceStart" cfSqlType="CF_SQL_TIMESTAMP">s.serviceStart</d:field>
+			<d:field title="serviceEnd" cfSqlType="CF_SQL_TIMESTAMP">s.serviceEnd</d:field>
+			<d:field title="serviceHash">s.serviceHash</d:field>
+			<d:field title="serviceCustomName">s.serviceCustomName</d:field>
+			<d:field title="dt" cfSqlType="CF_SQL_TIMESTAMP">m.dt</d:field>
+			<d:field title="free tier" cfSqlType="CF_SQL_NUMERIC">s.free_tier</d:field>
+		</d:field_set>
+		FROM qSpec as s, qUnifiedMetric as m 
+		WHERE m.wz=<cfqueryparam cfsqltype="cf_sql_varchar" value=#request.auth.wz#/> 
+		AND s.code=m.code
+		AND s.serviceStart <= m.dt
+		AND (m.dt <= s.serviceEnd OR s.serviceEnd IS NULL)
+		<!--- таким замысловатым способом мы реализуем FULL JOIN --->
+		UNION 
+		SELECT NULL, m.code, NULL, NULL, NULL, NULL, NULL, NULL, m.raw_metric, m.metric, NULL, NULL, NULL, NULL, m.dt, 0
+		FROM qUnifiedMetric as m where m.code NOT IN (<cfqueryparam value="#ValueList(qSpec.code)#" cfsqltype="cf_sql_varchar" list="true">)
+		
+		UNION 
+		SELECT s.code, NULL, s.svc, s.component, s.unit, s.price*(100-s.discount)/100, s.price, s.discount, NULL, NULL, s.serviceStart, s.serviceEnd, s.serviceHash, s.serviceCustomName, NULL, 0
+		FROM qSpec as s where s.code NOT IN (<cfqueryparam value="#listRemoveDuplicates(ValueList(qUnifiedMetric.code))#" cfsqltype="cf_sql_varchar" list="true">)
+		
+		order by m.dt, s.code
+	</cfquery>
+	
+	<cfquery name="qChargeMonthly" dbType="query">
+		SELECT 
+		<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
+			<d:field title="Артикул по договору">code</d:field>
+			<d:field title="Артикул по системам">m_code</d:field>
+			<d:field title="Услуга по каталогу">svc</d:field><!--- *** добавить пользовательское --->
+			<d:field title="Компонент">component</d:field>
+			<d:field title="Ед.изм.">unit</d:field>
+			<d:field title="Цена &##8381; с НДС" cfSqlType="CF_SQL_NUMERIC">discounted_price</d:field>
+			<d:field title="Сырая метрика" cfSqlType="CF_SQL_NUMERIC">sum(raw_metric) as raw_metric</d:field>
+			<d:field title="Приведенный объем" cfSqlType="CF_SQL_NUMERIC">sum(metric) as metric</d:field>			
+			<d:field title="Объем к оплате" cfSqlType="CF_SQL_NUMERIC">sum(metric) - free_tier as chargeable_metric</d:field>
+			<d:field title="Сумма к оплате" cfSqlType="CF_SQL_NUMERIC">(sum(metric) - free_tier)*discounted_price as charge</d:field>	
+			<d:field title="serviceStart" cfSqlType="CF_SQL_TIMESTAMP">serviceStart</d:field>
+			<d:field title="serviceEnd" cfSqlType="CF_SQL_TIMESTAMP">serviceEnd</d:field>
+			<d:field title="serviceHash">serviceHash</d:field>
+			<d:field title="serviceCustomName">serviceCustomName</d:field>
+			<d:field title="free tier" cfSqlType="CF_SQL_NUMERIC">free_tier</d:field>
+			<d:field title="Год" cfSqlType="CF_SQL_INTEGER">year(dt) as year</d:field>
+			<d:field title="Месяц" cfSqlType="CF_SQL_INTEGER">month(dt) as month</d:field>
+		</d:field_set>
+		from qChargeDaily
+		group by code, m_code, svc, serviceCustomName, component, unit, discounted_price, serviceStart, ServiceEnd, serviceHash, free_tier, year(dt), month(dt)
+		order by year(dt), month(dt), code, m_code
+	</cfquery>
+	<!--- в связи с бедностью языка QoQ (нет CASE) грубо патчим резалтсет --->
+	<cfloop query="qChargeMonthly">
+		<cfset qChargeMonthly.chargeable_metric = (chargeable_metric GT 0) ? chargeable_metric : 0/> <!--- имя в левой части должно быть квалифицировано запросом (резалтсетом) --->
+		<cfset qChargeMonthly.charge = (charge GT 0) ? charge : 0/>
+	</cfloop>
+	
+	
+	<!--- тут могут быть подводные камни с копированием и переиспользованием объектов --->
+<!--- 	<cfif isQuery(qTotal)>
+		<cfquery name="qTotalNew" dbType="query">
+			select * from qTotal 
+			union all 
+			select * from qCharge
+		</cfquery>
+		<cfset qTotal = qTotalNew/>
+	<cfelse>
+		<cfset qTotal = qCharge/>
+	</cfif>
+	<cfdump var=#qTotal#/> --->
+	
+<!--- 	<cfdump var=#qChargeMonthly#/> --->
+<!--- *** проверить краевые даты --->
+	<cfif (ATTRIBUTES.debug)>
+		<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+		<cfdump var=#qChargeMonthly#/>
+		<cfflush/>
+	</cfif>
+		
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfflush/>
+
 	
-<!--- 	<d:field title="Клиентс. назв.">s.user_description</d:field> --->
-</d:field_set>
-FROM qSpec as s, qUnifiedMetric as m 
-WHERE m.wz=<cfqueryparam cfsqltype="cf_sql_varchar" value=#request.auth.wz#/> AND s.code=m.code
-order by s.code
-</cfquery>
 	
 <cfset var report={}/>
 
@@ -272,7 +419,7 @@ order by s.code
 <cfset report.qStorageAge = qStorageAge/>
 <cfset report.qS3VolAge = qS3VolAge/>
 <cfset report.qS3OpsTrfAge = qS3OpsTrfAge/>
-<cfset report.qCharge = qCharge/>
+<cfset report.qCharge = qChargeMonthly/>
 <cfset report.chargeTitleMap = titleMap/>
 <cfset report.chargeFieldCount = fieldCount/>
 

mod/payg.cfm.1.bak

@@ -0,0 +1,346 @@
+<cfimport prefix="m" taglib="../lib"/>
+<cfimport prefix="d" taglib="../lib/data"/>
+
+<cfparam name="ATTRIBUTES.dt_finish" type="date" default=#createDateTime(year(Now()),month(Now()),1,0,0,0)#/>
+<cfparam name="ATTRIBUTES.dt_start" type="date" default=#dateAdd('m',-1,ATTRIBUTES.dt_finish)#/>
+<cfparam name="ATTRIBUTES.output" type="string" default="report"/>
+<cfparam name="ATTRIBUTES.debug" type="boolean" default=false/>
+<cfparam name="ATTRIBUTES.tenant_wz_index" type="string"/>
+
+
+<cfset hours=dateDiff('h', ATTRIBUTES.dt_start, ATTRIBUTES.dt_finish)/>
+
+
+
+<!--- QoQ does not support join syntax, and of course outer joins, at least of Lucee 5.4--->
+<!--- а внешние джойны хорошо подсвечивают ошибки, особенно помогает full --->
+
+<cfmodule template="crm_contract.cfm" wz="WZ01348" out="qSpecification"/>
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qSpecification#/>
+	<cfflush/>
+</cfif>
+
+<!--- Для начала выкатываем просто кусок каталога, не фильтруя по спеке (которой иногда нет) --->
+<!--- <cfquery name="qSpec">
+	select * from (
+	values
+	 ('Объектное хранилище S3 CEPH','Дисковое пространство: Объем хранения (HOT)','paas.s3.ceph.vol-m','ГБайт',1.80,0)
+	,('Объектное хранилище S3 CEPH','Исходящий трафик (HOT)','paas.s3.ceph.trf-m','ГБайт',1.50,0)
+	,('Объектное хранилище S3 CEPH','Запросы GET, HEAD, OPTIONS (HOT)','paas.s3.ceph.get-m','10тыс.шт.',0.35,0)
+	,('Объектное хранилище S3 CEPH','Запросы PUT, POST, PATCH (HOT)','paas.s3.ceph.put-m','10тыс.шт.',4.50,0)	 
+	
+	,('Объектное хранилище S3 CEPH','Дисковое пространство: Объем хранения (COLD)','paas.s3.cphc.vol-m','ГБайт',0.84*1.2,0)
+	,('Объектное хранилище S3 CEPH','Исходящий трафик (COLD)','paas.s3.cphc.trf-m','ГБайт',1.25*1.2,0)
+	,('Объектное хранилище S3 CEPH','Запросы GET, HEAD, OPTIONS (COLD)','paas.s3.cphc.get-m','10тыс.шт.',0.8*1.2,0)
+	,('Объектное хранилище S3 CEPH','Запросы PUT, POST, PATCH (COLD)','paas.s3.cphc.put-m','10тыс.шт.',9.7*1.2,0)
+	) as 
+	s (svc, component, code, unit, price, discount)
+	order by code
+</cfquery> --->
+<!--- здесь нужно организовать пересечение версионной спецификации с анализируемым диапазоном дат --->
+<cfquery name="qSpec" dbtype="query">
+select catalogName as svc, component, fullCode as code, measureShort as unit
+, priceWVat as price, (discount + serviceDiscount - discount*serviceDiscount/100) as discount 
+,serviceStart, serviceEnd
+from qSpecification
+</cfquery>
+
+
+<!--- Нужно еще реализовать в модели данных политики бесплатного минимума --->
+<cfquery name="qComputing">
+	select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, 
+	case 
+		when vdc.name like '%-v1cl1%' then 'iaas.ngc.i29' 
+		when vdc.name like '%-v1cl2%' then 'iaas.ngc.i31' 
+		when vdc.name like '%-v1cl4%' then 'iaas.ngc.a28' 
+		when vdc.name like '%-v1cl6%' then 'iaas.ngc.i28' 
+		else '['||vdc.name||']' end as code,
+	sum(cpu_used/cpu_speed)/4. as core_h,
+	sum(mem_used)/1024/4. as gb_h
+	from ngcloud_ru.capacity_resource 
+	join ngcloud_ru.vdc on capacity_resource.vdc_id=vdc.id 
+	join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
+	where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/> 
+	AND capacity_resource.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+	AND capacity_resource.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/> 
+	group by tenant.wzcode, vdc.name 
+	order by tenant.wzcode, vdc.name;
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qComputing#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qComputingAge">
+	select max(capacity_resource.timestamp) as dt_load from ngcloud_ru.capacity_resource
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qComputingAge#/>
+	<cfflush/>
+</cfif>
+
+
+<!--- переделать storage_profile_types с расшифровкой ssd, sata, можно прямо до каталожного кода --->
+<cfquery name="qStorage">
+	select 'WZ'||to_char(tenant.wzcode,'FM00000') as wz, vdc.name as vdc_name, 
+	case 
+		WHEN vdc.name LIKE '%-v1cl1%' THEN 'iaas.ngc.i29' 
+		WHEN vdc.name LIKE '%-v1cl2%' THEN 'iaas.ngc.i31' 
+		WHEN vdc.name LIKE '%-v1cl4%' THEN 'iaas.ngc.a28' 
+		WHEN vdc.name LIKE '%-v1cl6%' THEN 'iaas.ngc.i28' 
+		ELSE '['||vdc.name||']' END 
+	|| CASE 
+		WHEN storage_profile_types.name ILIKE '%-SSD%' THEN '.ssd-m'
+		WHEN storage_profile_types.name ILIKE '%-SAS' THEN '.sas-m'
+		WHEN storage_profile_types.name ILIKE '%-SATA' THEN '.sata-m'
+		ELSE '.['|| storage_profile_types.name ||']' END 
+	as code,
+	storage_profile_types.name, -- *** это не тип, а профайл
+	sum("limit")/1024./4 as gb_h_limit, -- 4 потому, что сбор раз в 15 минут
+	sum(used)/1024./4 as gb_h_used
+	from ngcloud_ru.capacity_storage
+	join ngcloud_ru.vdc on capacity_storage.vdc_id=vdc.id 
+	join ngcloud_ru.tenant on tenant.id=vdc.tenant_id 
+	join ngcloud_ru.storage_profile_types on capacity_storage.storage_profile_types_id=storage_profile_types.id
+	where tenant.wzcode = <cfqueryparam cfsqltype="cf_sql_integer" value=#ATTRIBUTES.tenant_wz_index#/>
+	AND capacity_storage.timestamp >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/>
+	AND capacity_storage.timestamp < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/> 
+	group by tenant.wzcode, vdc.name, storage_profile_types.name 
+	order by tenant.wzcode, vdc.name, storage_profile_types.name;
+</cfquery>
+<cfquery name="qStorageAge" datasource="rpt">
+	select max(capacity_storage.timestamp) as dt_load from ngcloud_ru.capacity_storage
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qStorage#/>
+	<cfflush/>
+</cfif>
+
+<!--- 
+"placement"	"size_gb"	"get_10k"	"put_10k"	"bytes_sent_gb"
+HOT_FREE_LIMIT	1	10	1	100 
+--->
+<!--- надо дисконтировать не ГБ-часы а ГБ-месяцы --->
+<cfquery name="qS3Vol">
+	select /* *** ниже дублирование кода агрегации - round ceil etc, обратить внимание при правке */
+	 (sum(bucket_stat.usage_rgw_main_size_actual)/<cfqueryparam cfsqltype="cf_sql_integer" value=#hours#/>) as vol_B
+	,ceil(sum(bucket_stat.usage_rgw_main_size_actual)/<cfqueryparam cfsqltype="cf_sql_integer" value=#hours#/>/1024/1024/1024) as vol_GB
+	,greatest(ceil(sum(bucket_stat.usage_rgw_main_size_actual)/<cfqueryparam cfsqltype="cf_sql_integer" value=#hours#/>
+	/1024/1024/1024)- 
+	case when bucket_stat.placement_id = 1 then 1 else 0 end, 0) as vol_GB_free_tier_subtracted /*считается не в точности так, как в функции*/	
+	,case 
+		when bucket_stat.placement_id = 1 then 'paas.s3.ceph'
+		when bucket_stat.placement_id = 2 then 'paas.s3.cphc'
+		else '['|| TO_CHAR(bucket_stat.placement_id,'FM9') ||']' end as code
+	--,bucket_stat.placement_id
+	,'WZ'||lpad(bucket_stat.owner, 5, '0') as wz -- *** здесь не число, а строка, поэтому другая формула обратной сборки WZ
+	
+	from s3billing.bucket_stat 
+	join s3billing.placement ON s3billing.placement.id=bucket_stat.placement_id 
+	join s3billing.bucket_info ON bucket_info.id=bucket_stat.bucket_id 
+	where bucket_stat.placement_id in (1,2) 
+	AND bucket_stat.owner = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
+	AND bucket_stat.timestamp_addition >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+	AND bucket_stat.timestamp_addition < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/>
+	group by bucket_stat.owner, bucket_stat.placement_id
+	order by bucket_stat.owner, bucket_stat.placement_id;
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3Vol#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qS3VolAge">
+	select max(timestamp_addition) as dt_load from s3billing.bucket_stat
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3VolAge#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qS3OpsTrf">
+select	
+	sum(
+		CASE WHEN 
+		(category.name LIKE 'get%'
+          OR category.name LIKE 'head%'
+          OR category.name LIKE 'options%'
+		) THEN ops ELSE 0 END
+		) as get 
+	,ceil(sum(
+		CASE WHEN 
+			(category.name LIKE 'get%'
+			  OR category.name LIKE 'head%'
+			  OR category.name LIKE 'options%'
+			) THEN ops ELSE 0 END
+		)/10000) as get_10k
+	,greatest(ceil(sum(
+			CASE WHEN 
+				(category.name LIKE 'get%'
+				  OR category.name LIKE 'head%'
+				  OR category.name LIKE 'options%'
+				) THEN ops ELSE 0 END
+		)/10000) - CASE WHEN bucket_info.placement_id = 1 THEN 10 ELSE 0 END, 0
+	 ) as get_10k_free_tier_subtracted
+		
+	,sum(
+		CASE WHEN 
+			(category.name LIKE 'put%'
+			  OR category.name LIKE 'post%'
+			  OR category.name LIKE 'patch%'
+			  OR category.name LIKE 'list%'
+			 ) THEN ops ELSE 0 END
+	 ) as put
+	,ceil(sum(
+		CASE WHEN 
+			(category.name LIKE 'put%'
+			  OR category.name LIKE 'post%'
+			  OR category.name LIKE 'patch%'
+			  OR category.name LIKE 'list%'
+			 ) THEN ops ELSE 0 END
+	 )/10000) as put_10k
+	,greatest(ceil(sum(
+			CASE WHEN 
+			(category.name LIKE 'put%'
+			  OR category.name LIKE 'post%'
+			  OR category.name LIKE 'patch%'
+			  OR category.name LIKE 'list%'
+			) THEN ops ELSE 0 END
+		)/10000) - CASE WHEN bucket_info.placement_id = 1 THEN 1 ELSE 0 END, 0
+	 ) as put_10k_free_tier_subtracted
+	 
+	,(sum(bytes_sent)) as bytes_sent
+	,ceil(sum(bytes_sent)/1024/1024/1024) as bytes_sent_GB
+	,greatest(ceil(sum(bytes_sent)/1024/1024/1024) - CASE WHEN bucket_info.placement_id = 1 THEN 100 ELSE 0 END, 0
+	) as bytes_sent_GB_free_tier_subtracted
+	
+	,case 
+		when bucket_info.placement_id = 1 then 'paas.s3.ceph'
+		when bucket_info.placement_id = 2 then 'paas.s3.cphc'
+		else '['|| TO_CHAR(bucket_info.placement_id,'FM9') ||']' end as code --*** зачем делать там ключ bigint
+	,bucket_info.placement_id
+	--category.name, bucket_info.name
+	,'WZ'||lpad(user_info.name, 5, '0') as wz
+	from s3billing.usage_bucket_by_user 
+	join s3billing.user_info on usage_bucket_by_user.user_id=user_info.id  
+	join s3billing.category on usage_bucket_by_user.category_id=category.id
+	join s3billing.bucket_info on usage_bucket_by_user.bucketid=bucket_info.id 
+	join s3billing.placement on bucket_info.placement_id=placement.id 
+	where 1=1
+	AND user_info.name = <cfqueryparam cfsqltype="cf_sql_varchar" value=#ATTRIBUTES.tenant_wz_index#/>
+	AND usage_bucket_by_user.time >= <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_start#/> 
+	AND usage_bucket_by_user.time < <cfqueryparam cfsqltype="cf_sql_timestamp" value=#ATTRIBUTES.dt_finish#/>
+	group by user_info.name, bucket_info.placement_id
+	order by user_info.name, bucket_info.placement_id;
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3OpsTrf#/>
+	<cfflush/>
+</cfif>
+
+<cfquery name="qS3OpsTrfAge">
+	select max(time) as dt_load from s3billing.usage_bucket_by_user 
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qS3OpsTrfAge#/>
+	<cfflush/>
+</cfif>
+
+<!--- собрали все метрики в один резалтсет --->
+<cfquery name="qUnifiedMetric" dbType="query">
+select wz, code || '.vcpu-m' as code, core_h as raw_metric, core_h as metric, core_h as chargeable_metric from qComputing
+union all
+select wz, code || '.ram-m' as code, gb_h as raw_metric, gb_h as metric, gb_h as chargeable_metric from qComputing
+union all
+select wz, code, gb_h_used as raw_metric, gb_h_used as metric, gb_h_used as chargeable_metric from qStorage
+union all
+select wz, code || '.vol-m', vol_b as raw_metric, vol_gb as metric, vol_GB_free_tier_subtracted as chargeable_metric from qS3Vol
+union all
+select wz, code || '.get-m', get as raw_metric, get_10k as metric, get_10k_free_tier_subtracted as chargeable_metric from qS3OpsTrf
+union all
+select wz, code || '.put-m', put as raw_metric, put_10k as metric, put_10k_free_tier_subtracted as chargeable_metric from qS3OpsTrf
+union all
+select wz, code || '.trf-m', bytes_sent as raw_metric, bytes_sent_gb as metric, bytes_sent_gb_free_tier_subtracted as chargeable_metric from qS3OpsTrf
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qUnifiedMetric#/>
+	<cfflush/>
+</cfif>
+
+<!--- умножаем на цену, вычисляем дисконт (довольно поздно) и форматируем
+*** здесь нужно учесть версионность. Самым простым кажется декомпозировать по дням и снова собрать 
+*** только как нам это сделать без нормального SQL движка
+Может быть, процедурная обработка не будет выглядеть ужасно, и не хуже SQL
+В конце концов, можно просто  В ЦИКЛЕ обсчитать диапазон по дням, выполнив запрос 30 раз, или сколько надо
+Если будет тупить - оптимизируем
+--->
+
+<!--- Для декомпозиции на более мелкие объекты мы можем как полумеру - профильтровать по конкретному бакету или ВМ-ВДЦ
+Что не нравится - для ВМ у нас может быть целое дерево нижележащих объектов --->
+
+<cfloop from=#attribute.dt_start# to=#attribute.dt_finish# index="dt">
+</cfloop>
+
+<cfquery name="qCharge" dbType="query">
+SELECT 
+<d:field_set titleMapOut="titleMap" lengthOut="fieldCount">
+	<d:field title="Артикул">s.code</d:field>
+	<d:field title="Артикул">m.code as m_code</d:field>
+	<d:field title="Услуга">s.svc</d:field>
+	<d:field title="Компонент">s.component</d:field>
+	<d:field title="Кол-во (метрика)" cfSqlType="CF_SQL_NUMERIC">m.chargeable_metric</d:field>
+	<d:field title="Ед.изм.">s.unit</d:field>
+	<d:field title="Цена &##8381; с НДС" cfSqlType="CF_SQL_NUMERIC">s.price*(100-s.discount)/100 as discounted_price</d:field>
+	<d:field title="Стоимость &##8381; с НДС" cfSqlType="CF_SQL_NUMERIC">s.price*(100-s.discount)/100*m.chargeable_metric as charge</d:field>
+<!--- 	<d:field title="Дата НОУ" cfSqlType="CF_SQL_TIMESTAMP">s.dt_from</d:field> --->
+<!--- 	<d:field title="Дата оконч." cfSqlType="CF_SQL_TIMESTAMP">s.dt_to</d:field>
+	<d:field title="Ключ строки">s.line_key</d:field> --->
+	<d:field title="Цена с НДС" cfSqlType="CF_SQL_NUMERIC">s.price</d:field>
+	<d:field title="Скидка%" cfSqlType="CF_SQL_NUMERIC">s.discount</d:field>
+	<d:field title="Сырая метрика" cfSqlType="CF_SQL_NUMERIC">m.raw_metric</d:field>
+	<d:field title="Приведенная метрика" cfSqlType="CF_SQL_NUMERIC">m.metric</d:field>
+
+<!--- 	<d:field title="Клиентс. назв.">s.user_description</d:field> --->
+</d:field_set>
+FROM qSpec as s, qUnifiedMetric as m 
+WHERE m.wz=<cfqueryparam cfsqltype="cf_sql_varchar" value=#request.auth.wz#/> AND s.code=m.code
+order by s.code
+</cfquery>
+
+<cfif (ATTRIBUTES.debug)>
+	<cfoutput>#getTickCount() - request.startTickCount#</cfoutput>
+	<cfdump var=#qCharge#/>
+	<cfflush/>
+</cfif>
+
+<cfset var report={}/>
+
+<cfset report.qComputingAge = qComputingAge/>
+<cfset report.qStorageAge = qStorageAge/>
+<cfset report.qS3VolAge = qS3VolAge/>
+<cfset report.qS3OpsTrfAge = qS3OpsTrfAge/>
+<cfset report.qCharge = qCharge/>
+<cfset report.chargeTitleMap = titleMap/>
+<cfset report.chargeFieldCount = fieldCount/>
+
+<cfset "CALLER.#ATTRIBUTES.output#" = report/>
+
+<cfexit method="exittag"/>

payg.cfm

@@ -0,0 +1,174 @@
+<cfsilent>
+<cfimport prefix="m" taglib="lib"/>
+<cfimport prefix="c" taglib="lib/controls"/>
+<cfimport prefix="d" taglib="lib/data"/>
+<cfimport prefix="layout" taglib="layout"/>
+</cfsilent>
+
+<m:prepare_ls entity="payg" accessObject="" pageInfoOut="pageInfo" trackOut="tr"/>
+
+<cfparam name="dt_finish" type="date" default=#createDateTime(year(Now()),month(Now()),1,0,0,0)#/>
+<cfparam name="dt_start" type="date" default=#dateAdd('m',-1,dt_finish)#/>
+<cfset hours=dateDiff('h',dt_start,dt_finish)/>
+
+<cfset tenant_wz_index=val(mid(request.auth.wz,3,5))/><!--- cut off WZ --->
+
+
+<cfif isDefined("output_xls")><cfmodule template="mod/payg.cfm"
+		dt_finish=#dt_finish#
+		dt_start=#dt_start#
+		tenant_wz_index=#tenant_wz_index#
+		output="report"
+		debug=#isDefined("DEBUG")#
+	/><layout:xml qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.xml"/>
+	<cfabort/>
+	</cfif><cfif isDefined("output_json")><cfmodule template="mod/payg.cfm"
+		dt_finish=#dt_finish#
+		dt_start=#dt_start#
+		tenant_wz_index=#tenant_wz_index#
+		output="report"
+		debug=#isDefined("DEBUG")#
+	/><!--- <cfdump var=#report#/><cfabort/> ---><layout:json qRead=#report.qCharge# titleMap=#report.chargeTitleMap# filename="#pageInfo.entity#.json"/>
+	<cfabort/>
+	</cfif><!--- 
+---><layout:page section="header" pageInfo=#pageInfo#>	
+	
+	<layout:attribute name="title">
+		<cfoutput><b>Отчет по PAYG</b> #request.auth.wz#</cfoutput>
+	</layout:attribute>	
+	<layout:attribute name="controls">
+		<!---skip filter link, filter is not implemented--->
+		<!---<layout:language_switch/>--->
+	</layout:attribute>
+</layout:page>
+
+<!--- Внимание! округление вверх при расчете метрик get, put S3. Расчетные суммы могут содержать погрешности округления, поэтому окончательный расчет стоимости (количество * цену) должен выполняться в бухгалтерской программе.
+<b>Если у клиента больше 1 действующего допника с услугами PAYG, то данные в отчете могут быть замножены, в этом случае считать вручную</b> --->
+
+<cfoutput>
+<form method="post" action="">
+Период с <input type="text" name="dt_start" value="#dateFormat(dt_start,'YYYY-MM-DD')#"/>
+по <input type="text" name="dt_finish" value="#dateFormat(dt_finish,'YYYY-MM-DD')#"/>
+<input type="submit" style="cursor:pointer;"/>
+<input type="submit" name="DEBUG" value="DEBUG" style="cursor:pointer;"/><!--- ********* --->
+</form>
+
+
+
+<!--- <cfflush/> --->
+
+<cfmodule template="mod/payg.cfm"
+	dt_finish=#dt_finish#
+	dt_start=#dt_start#
+	tenant_wz_index=#tenant_wz_index#
+	output="report"
+	debug=#isDefined("DEBUG")#
+/>
+
+Часов в периоде: <b>#hours#</b> Строк в отчете: <b>#report.qCharge.recordCount#</b><br/>
+Актуальность данных: 
+VCD Computing: <b>#dateFormat(report.qComputingAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qComputingAge.dt_load,'HH:MM:SS')#</b>
+VCD Storage: <b>#dateFormat(report.qStorageAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qStorageAge.dt_load,'HH:MM:SS')#</b>
+S3 хранение: <b>#dateFormat(report.qS3VolAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3VolAge.dt_load,'HH:MM:SS')#</b>
+S3 операции и трафик: <b>#dateFormat(report.qS3OpsTrfAge.dt_load,'YYYY-MM-DD')# #timeFormat(report.qS3OpsTrfAge.dt_load,'HH:MM:SS')#</b>
+Цены GPL<br/>
+
+<br/>
+<a href="#request.thisPage#?output_xls" title="экспорт в Excel" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/xls.gif" style="vertical-align:text-bottom;"/></a>
+
+<a href="#request.thisPage#?output_json" title="экспорт в json" style="margin-left:.5em; height:100%;" target="_blank"><img src="img/json.svg" style="vertical-align:text-bottom;" width="13" height="13"/></a>
+</cfoutput>
+<table class="worktable">	
+	<thead>
+		<td width="1%"></td>
+		<!--- <th width="3%">WZ</th> --->
+		<th width="7%">Артикул</th>
+		<th width="3%">Кол-во (метрика)</td>		
+		<th width="7%">Оплачиваемый объем</th>
+		
+		<th width="3%">Цена &#8381; с НДС</th>
+		<th width="3%">Стоимость &#8381; с НДС</th>
+		
+		<th width="3%">&nbsp;&nbsp;&nbsp;</th>	
+		
+		<th width="10%">Услуга</th>
+		<th width="10%">Компонент</th>
+		<th width="3%">Ед.изм.</th>
+<!--- 		<td width="10%">Клиентс. назв.</td> --->
+		
+<!--- 		<td width="3%">GPL с НДС</td>
+		<td width="3%">Скидка%</td> --->
+		
+<!--- 		<td width="6%">Дата НОУ</td>
+		<td width="6%">Дата оконч.</td>	
+		
+		<td width="3%">Ключ строки</td> --->
+<!--- 		<td width="3%">Сырая метрика</td> --->
+		
+		
+<!--- 		<td width="5%">Договор</td>
+		<td width="10%">Допник</td>
+		<td width="10%">Сделка</td> --->
+	
+	</thead>
+	
+<!--- 	видимо, Free Tier и единицу измерения нужно брать и для строк, которые не найдены в договоре 
+	(еше можно было бы туда для полноты добавлять GPL цену, но для этого нужен каталог)
+	Добавить реквизиты договора? --->
+	<cfoutput query="report.qCharge" group="year">
+		<cfoutput group="month">
+			<tr><td colspan="99"><b>#year#-#numberFormat(month,"00")#</b></td></tr>
+			<cfoutput group="svc">
+				<cfset var acc = 0/>			
+				<tr>
+					<td bgcolor="##ccc"></td>
+					<td bgcolor="##ccc" colspan="9">
+						<b>#svc#</b> 
+						<cfif len(serviceCustomName)>(#serviceCustomName#)</cfif> 
+						<cfif serviceHash EQ "">(не найдено в договоре)</cfif>
+					</td>
+					
+				</tr>
+				<cfoutput>	
+				
+				<cfset acc += isNumeric(charge) ? charge : 0/>
+				<tr>
+					<td>#currentRow#</a></td>
+					
+					<td>#code# <cfif code EQ "">(#m_code#)</cfif></td>	
+					<td class="r">#metric#</td>
+					<td class="r" style="font-size:120%; padding:0 1em;">#chargeable_metric#</td>
+					
+					<td class="r">#discounted_price#</td>
+					<td class="r">#numberFormat(charge,".00")#</td>
+					
+					<td><!--- #acc# ---></td>	
+					
+					<td>#svc#</td>
+					<td>#component#</td>
+					<td class="c">#unit#</td>
+		<!--- 			<td>#user_description#</td>	 --->
+								
+		<!--- 			<td class="r">#price#</td>
+					<td class="r">#discount#</td> --->
+			
+				</tr>
+				</cfoutput>
+				<tr>
+					<td bgcolor="##eee" style="border-bottom:2px solid gray;"></td>
+					<td bgcolor="##eee" colspan="4" class="r" style="border-bottom:2px solid gray;"><b>Итого</b> &nbsp;&nbsp;&nbsp; #svc#:</td>
+					<td bgcolor="##eee" colspan="1" class="r b" style="border-bottom:2px solid gray;">#NumFmt(acc,2)#</td>
+					<td colspan="12" style="border-bottom:2px solid gray;"></td>
+				</tr >
+			</cfoutput>
+		</cfoutput>
+	</cfoutput>
+
+</table>
+<!--- <cfdump var=#qCharge#/> --->
+
+
+<layout:page section="footer"/>
+
+<!--- select * from s3billing.billing_per_user_fix_pl('2025-05-01 00:00:00','2025-06-01 00:00:00','1395'); --->
+