From 5401b7e96d0c90a1fbbc30d54bcd20e8aad90cfa Mon Sep 17 00:00:00 2001
From: unknown <smishchuk@nubes.ru>
Date: Thu, 30 Jul 2026 16:02:05 +0300
Subject: [PATCH] 030 s3vol critical fix

---
 Application.cfc      |  2 +-
 mod/compute_payg.cfm | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Application.cfc b/Application.cfc
index 6214a96..d0193e8 100644
--- a/Application.cfc
+++ b/Application.cfc
@@ -94,7 +94,7 @@
 
 		<!--- global settings --->				
 		<cfset request.RECORDS_PER_PAGE=500/>
-		<cfset request.APP_VERSION="0.00.029"/>
+		<cfset request.APP_VERSION="0.00.030"/>
 		<cfheader name="X-Application-Version" value=#request.APP_VERSION#/>
 		<cfset request.STAND=getStand()/>	
 		
diff --git a/mod/compute_payg.cfm b/mod/compute_payg.cfm
index 1bf0e29..ae431b7 100644
--- a/mod/compute_payg.cfm
+++ b/mod/compute_payg.cfm
@@ -10,7 +10,7 @@
 
 
 
-<cfset hours=dateDiff('h', ATTRIBUTES.dt_start, ATTRIBUTES.dt_finish)/> <!--- *** нужно для каждого фрагмента --->
+<cfset hours=dateDiff('h', ATTRIBUTES.dt_start, dateAdd("d",1,ATTRIBUTES.dt_finish))/> <!--- *** нужно для каждого фрагмента --->
 <cfif hours LE 0>
 	<cfthrow message="Некорректный период" detail="Период должен быть больше 0"/>
 </cfif>
@@ -189,8 +189,8 @@ from a
 			ELSE '.['|| storage_profile_types.name ||']' END 
 		as code,
 		storage_profile_types.name, -- *** это не тип, а профайл
-		sum("limit")/1024./4./720. as gb_m_limit, -- 4 потому, что сбор раз в 15 минут, а цена за УСЛОВНЫЙ ГБ-месяц (720 ГБ-часов)
-		sum(used)/1024./4./720. as gb_m_used,
+		sum("limit")/1024./4./720 as gb_m_limit, 
+		sum(used)/1024./4./720 as gb_m_used,
 		capacity_storage.timestamp::date as dt,
 		vdc.name as dimension_1,
 		storage_profile_types.name as dimension_2
@@ -220,8 +220,9 @@ from a
 	<!--- надо дисконтировать не ГБ-часы а ГБ-месяцы --->
 	<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
+		/* *** переделать на avg - сначала агрегировать по бакетам*/
+		 (sum(bucket_stat.usage_rgw_main_size_actual)/720) as vol_B
+		,ceil(sum(bucket_stat.usage_rgw_main_size_actual)/720/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  /*считается не в точности так, как в функции*/	 --->