Michael/LogiFlow
1
0 Fork 0
mirror of https://github.com/R0m1k3/LogiFlow.git synced 2026-10-11 17:27:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #483 from R0m1k3/1.1

Browse Source 
1.1
This commit is contained in:
LogiFlow authored and GitHub committed 2025-10-31 07:43:48 +01:00
2 parents de0ad7bdc9 386129ca0c
commit 6089d40bef
2 files changed
+307 -310
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

backups/backup_automatic_2025-09-26T02-58-35-800Z.sql → backups/backup_automatic_2025-10-29T10-01-57-019Z.sql
+271 -262
View File
File diff suppressed because it is too large. Load diff
server/storage.ts
+36 -48
View File
@@ -2076,49 +2076,34 @@ export class DatabaseStorage implements IStorage {
whereCondition = inArray(dlcProducts.groupId, groupIds);
}
// Version rétrocompatible - fonctionne avec ou sans les nouveaux champs
// IMPORTANT: Ne PAS filtrer sur processedUntilExpiry car cela crée une incohérence
// entre getDlcProducts (qui ne filtre pas) et getDlcStats (qui filtrait)
// Les produits expirés sont expirés, qu'ils aient été traités ou non
try {
// 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]} 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);
// IMPORTANT: Filtrer sur processedUntilExpiry pour ne pas réafficher les produits déjà traités
// Les produits "traités" (processedUntilExpiry=true) ne doivent pas apparaître dans les alertes quotidiennes
const [stats] = await db
.select({
active: sql<number>`COUNT(CASE
WHEN ${dlcProducts.expiryDate} > ${today.toISOString().split('T')[0]}
AND ${dlcProducts.status} != 'valides'
AND (${dlcProducts.processedUntilExpiry} IS NULL OR ${dlcProducts.processedUntilExpiry} = false)
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.status} != 'valides'
AND (${dlcProducts.processedUntilExpiry} IS NULL OR ${dlcProducts.processedUntilExpiry} = false)
THEN 1 END)`
})
.from(dlcProducts)
.where(whereCondition);
return {
active: stats.active || 0,
expiringSoon: stats.expiringSoon || 0,
expired: stats.expired || 0
};
} catch (error) {
// 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]} 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);
return {
active: stats.active || 0,
expiringSoon: stats.expiringSoon || 0,
expired: stats.expired || 0
};
}
return {
active: stats.active || 0,
expiringSoon: stats.expiringSoon || 0,
expired: stats.expired || 0
};
}
async getTasks(groupIds?: number[], userRole?: string): Promise<TaskWithRelations[]> {
@@ -4242,20 +4227,23 @@ export class MemStorage implements IStorage {
products = products.filter(product => groupIds.includes(product.groupId));
}
// IMPORTANT: Ne PAS filtrer sur processedUntilExpiry car cela crée une incohérence
// entre getDlcProducts (qui ne filtre pas) et getDlcStats (qui filtrait)
// Les produits expirés sont expirés, qu'ils aient été traités ou non
// IMPORTANT: Filtrer sur processedUntilExpiry pour ne pas réafficher les produits déjà traités
// Les produits "traités" (processedUntilExpiry=true) ne doivent pas apparaître dans les alertes quotidiennes
return {
active: products.filter(p => new Date(p.expiryDate) > today && p.status !== 'valides').length,
active: products.filter(p =>
new Date(p.expiryDate) > today &&
p.status !== 'valides' &&
!p.processedUntilExpiry
).length,
expiringSoon: products.filter(p => {
const expiry = new Date(p.expiryDate);
const isExpiringSoon = expiry >= today && expiry <= alertDate;
return isExpiringSoon && p.status !== 'valides';
return isExpiringSoon && p.status !== 'valides' && !p.processedUntilExpiry;
}).length,
expired: products.filter(p => {
const expiry = new Date(p.expiryDate);
const isExpired = expiry <= today;
return isExpired && p.status !== 'valides';
return isExpired && p.status !== 'valides' && !p.processedUntilExpiry;
}).length
};
}