From 1f5f3299f8d77950109a5846051ec6f0bdf0cf8c Mon Sep 17 00:00:00 2001
From: poignatov <poignatov@avito.ru>
Date: Mon, 9 Feb 2026 14:52:45 +0300
Subject: [PATCH] =?UTF-8?q?5.0.5:=20normalized=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B9=20=D0=BD=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B8=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=82=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION                    |  2 +-
 play-life-backend/main.go  | 17 +++++++++++++----
 play-life-web/package.json |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/VERSION b/VERSION
index 2d6c0bc..ab0fa33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.0.4
+5.0.5
diff --git a/play-life-backend/main.go b/play-life-backend/main.go
index c17f328..98a9095 100644
--- a/play-life-backend/main.go
+++ b/play-life-backend/main.go
@@ -6785,8 +6785,12 @@ func (a *App) getFullStatisticsHandler(w http.ResponseWriter, r *http.Request) {
 		if item.ReportYear == currentYearInt && item.ReportWeek == currentWeekInt {
 			if score, exists := currentWeekScores[projectID]; exists {
 				item.TotalScore = score
-				// Для текущей недели normalized_total_score не отправляем
-				item.NormalizedTotalScore = 0
+				// Нормализованный score для текущей недели — та же логика, что в MV: LEAST(score, max)
+				if item.MaxGoalScore > 0 {
+					item.NormalizedTotalScore = math.Min(score, item.MaxGoalScore)
+				} else {
+					item.NormalizedTotalScore = score
+				}
 			}
 		}
 
@@ -6847,14 +6851,19 @@ func (a *App) getFullStatisticsHandler(w http.ResponseWriter, r *http.Request) {
 						totalScore = score
 					}
 
-					// Для текущей недели normalized_total_score не отправляем
+					// Нормализованный score для текущей недели — та же логика, что в MV: LEAST(score, max)
+					normalizedScore := totalScore
+					if maxGoalScore > 0 {
+						normalizedScore = math.Min(totalScore, maxGoalScore)
+					}
+
 					_, weekISO := time.Now().ISOWeek()
 					item := FullStatisticsItem{
 						ProjectName:          projectName,
 						ReportYear:           time.Now().Year(),
 						ReportWeek:           weekISO,
 						TotalScore:           totalScore,
-						NormalizedTotalScore: 0,
+						NormalizedTotalScore: normalizedScore,
 						MinGoalScore:         minGoalScore,
 						MaxGoalScore:         maxGoalScore,
 						Color:                projectColor,
diff --git a/play-life-web/package.json b/play-life-web/package.json
index 833d9bf..2b23493 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "type": "module",
   "scripts": {
     "dev": "vite",