6.8.3: Последний объём из истории в плейсхолдере

VERSION

@@ -1 +1 @@
-6.8.2
+6.8.3

play-life-backend/main.go

@@ -17742,6 +17742,7 @@ type ShoppingItem struct {
 	Completed        int      `json:"completed"`
 	LastCompletedAt  *string  `json:"last_completed_at,omitempty"`
 	CreatedAt        string   `json:"created_at"`
+	LastVolume       *float64 `json:"last_volume,omitempty"`
 }
 
 type ShoppingItemRequest struct {
@@ -18722,6 +18723,18 @@ func (a *App) getShoppingItemHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	item.CreatedAt = createdAt.Format(time.RFC3339)
 
+	// Получаем последний купленный объём из истории
+	var lastVolume sql.NullFloat64
+	a.DB.QueryRow(`
+		SELECT volume FROM shopping_item_history
+		WHERE item_id = $1
+		ORDER BY completed_at DESC
+		LIMIT 1
+	`, itemID).Scan(&lastVolume)
+	if lastVolume.Valid {
+		item.LastVolume = &lastVolume.Float64
+	}
+
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(item)
 }

play-life-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.8.2",
+  "version": "6.8.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

play-life-web/src/components/ShoppingItemDetail.jsx

@@ -54,7 +54,7 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav
           throw new Error('Неверное значение объёма')
         }
       } else {
-        payload.volume = item.volume_base
+        payload.volume = item.last_volume ?? item.volume_base
       }
 
       const response = await authFetch(`/api/shopping/items/${itemId}/complete`, {
@@ -189,7 +189,7 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav
                     step="any"
                     value={volumeValue}
                     onChange={(e) => setVolumeValue(e.target.value)}
-                    placeholder={item.volume_base?.toString() || '1'}
+                    placeholder={(item.last_volume ?? item.volume_base)?.toString() || '1'}
                     className="progression-input"
                   />
                   <div className="progression-controls-capsule">