From a7ce571c69e1f1e396f08a8b95c61a67200b0094 Mon Sep 17 00:00:00 2001
From: michaelschal <35957947-michaelschal@users.noreply.replit.com>
Date: Mon, 13 Oct 2025 08:40:27 +0000
Subject: [PATCH] Update product expiration calculations to exclude invalid
 items

Refactor SQL queries in `DatabaseStorage` to filter out products with 'valides' status when calculating active, expiringSoon, and expired counts.

Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 1e4433b5-47ab-464c-b663-fea2e53367dd
Replit-Commit-Checkpoint-Type: intermediate_checkpoint
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/1e4433b5-47ab-464c-b663-fea2e53367dd/WkQ9cok
---
 server/storage.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/storage.ts b/server/storage.ts
index 2a72657..314eefb 100644
--- a/server/storage.ts
+++ b/server/storage.ts
@@ -2080,14 +2080,16 @@ export class DatabaseStorage implements IStorage {
       // Essayer d'abord avec les nouveaux champs
       const [stats] = await db
         .select({
-          active: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} > ${today.toISOString().split('T')[0]} THEN 1 END)`,
+          active: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} > ${today.toISOString().split('T')[0]} AND ${dlcProducts.status} != 'valides' THEN 1 END)`,
           expiringSoon: sql<number>`COUNT(CASE 
             WHEN ${dlcProducts.expiryDate} BETWEEN ${today.toISOString().split('T')[0]} AND ${alertDate.toISOString().split('T')[0]} 
+            AND ${dlcProducts.status} != 'valides'
             AND (${dlcProducts.processedUntilExpiry} IS NULL OR ${dlcProducts.processedUntilExpiry} = false)
             THEN 1 END)`,
           expired: sql<number>`COUNT(CASE 
             WHEN ${dlcProducts.expiryDate} <= ${today.toISOString().split('T')[0]} 
-            AND (${dlcProducts.processedUntilExpiry} IS NULL OR ${dlcProducts.processedUntilExpiry} = false OR ${dlcProducts.expiryDate} < ${today.toISOString().split('T')[0]})
+            AND ${dlcProducts.status} != 'valides'
+            AND (${dlcProducts.processedUntilExpiry} IS NULL OR ${dlcProducts.processedUntilExpiry} = false)
             THEN 1 END)`
         })
         .from(dlcProducts)
@@ -2102,9 +2104,9 @@ export class DatabaseStorage implements IStorage {
       // Fallback pour les bases de données sans les nouveaux champs
       const [stats] = await db
         .select({
-          active: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} > ${today.toISOString().split('T')[0]} THEN 1 END)`,
-          expiringSoon: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} BETWEEN ${today.toISOString().split('T')[0]} AND ${alertDate.toISOString().split('T')[0]} THEN 1 END)`,
-          expired: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} <= ${today.toISOString().split('T')[0]} THEN 1 END)`
+          active: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} > ${today.toISOString().split('T')[0]} AND ${dlcProducts.status} != 'valides' THEN 1 END)`,
+          expiringSoon: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} BETWEEN ${today.toISOString().split('T')[0]} AND ${alertDate.toISOString().split('T')[0]} AND ${dlcProducts.status} != 'valides' THEN 1 END)`,
+          expired: sql<number>`COUNT(CASE WHEN ${dlcProducts.expiryDate} <= ${today.toISOString().split('T')[0]} AND ${dlcProducts.status} != 'valides' THEN 1 END)`
         })
         .from(dlcProducts)
         .where(whereCondition);