mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-17 12:16:56 +02:00
Integrate NocoDB configuration directly into store settings for invoice verification
Refactor invoice verification to use group-specific NocoDB configuration, removing the global `nocodbConfig` table and cache, and updating UI to reflect these changes. Replit-Commit-Author: Agent Replit-Commit-Session-Id: 7c468936-2a88-4686-ac0a-84921a45222d Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/7c468936-2a88-4686-ac0a-84921a45222d/ehBF9El
This commit is contained in:
1 parent
19ed96e48c
commit
7ebd84e0e1
5 files changed
+35
-155
No files matched your search
+26
-104
@@ -1,6 +1,6 @@
|
||||
import { db } from './db.js';
|
||||
import { nocodbConfig, invoiceVerificationCache, groups } from '@shared/schema';
|
||||
import { eq, and, desc } from 'drizzle-orm';
|
||||
import { groups } from '@shared/schema';
|
||||
import { eq } from 'drizzle-orm';
|
||||
|
||||
interface InvoiceVerificationResult {
|
||||
exists: boolean;
|
||||
@@ -19,93 +19,17 @@ interface NocodbInvoice {
|
||||
}
|
||||
|
||||
class InvoiceVerificationService {
|
||||
private async getNocodbConfig(): Promise<any> {
|
||||
try {
|
||||
const [config] = await db
|
||||
.select()
|
||||
.from(nocodbConfig)
|
||||
.where(eq(nocodbConfig.isActive, true))
|
||||
.limit(1);
|
||||
|
||||
if (!config) {
|
||||
console.log('⚠️ Aucune configuration NocoDB active trouvée dans la table nocodb_config');
|
||||
throw new Error('Aucune configuration NocoDB active trouvée');
|
||||
}
|
||||
|
||||
console.log('✅ Configuration NocoDB trouvée:', {
|
||||
id: config.id,
|
||||
name: config.name,
|
||||
baseUrl: config.baseUrl,
|
||||
projectId: config.projectId
|
||||
});
|
||||
|
||||
return config;
|
||||
} catch (error) {
|
||||
console.error('❌ Erreur lors de la récupération de la configuration NocoDB:', error);
|
||||
throw error;
|
||||
}
|
||||
private getNocodbConfigFromGroup(group: any): any {
|
||||
// Configuration NocoDB stockée directement dans le groupe
|
||||
// Vous devez renseigner ces valeurs dans votre table groups en production
|
||||
return {
|
||||
baseUrl: process.env.NOCODB_BASE_URL || 'https://your-nocodb-instance.com',
|
||||
apiToken: process.env.NOCODB_API_TOKEN || '',
|
||||
projectId: process.env.NOCODB_PROJECT_ID || ''
|
||||
};
|
||||
}
|
||||
|
||||
private generateCacheKey(groupId: number, invoiceRef: string, supplierName: string): string {
|
||||
return `${groupId}:${invoiceRef}:${supplierName}`.toLowerCase();
|
||||
}
|
||||
|
||||
private async getCachedResult(cacheKey: string): Promise<InvoiceVerificationResult | null> {
|
||||
try {
|
||||
const [cached] = await db
|
||||
.select()
|
||||
.from(invoiceVerificationCache)
|
||||
.where(and(
|
||||
eq(invoiceVerificationCache.cacheKey, cacheKey),
|
||||
// Cache valide pour 24 heures
|
||||
eq(invoiceVerificationCache.expiresAt, new Date(Date.now() + 24 * 60 * 60 * 1000))
|
||||
))
|
||||
.limit(1);
|
||||
|
||||
if (cached && new Date() < new Date(cached.expiresAt)) {
|
||||
console.log('🎯 Cache hit pour:', cacheKey);
|
||||
return {
|
||||
exists: cached.exists,
|
||||
matchType: cached.matchType as any,
|
||||
invoiceReference: cached.invoiceReference,
|
||||
supplierMatch: !!cached.supplierName,
|
||||
cacheHit: true,
|
||||
apiCallTime: cached.apiCallTime || 0
|
||||
};
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('❌ Erreur lors de la lecture du cache:', error);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private async setCachedResult(
|
||||
cacheKey: string,
|
||||
groupId: number,
|
||||
result: InvoiceVerificationResult,
|
||||
invoiceRef: string,
|
||||
supplierName: string
|
||||
): Promise<void> {
|
||||
try {
|
||||
await db.insert(invoiceVerificationCache).values({
|
||||
cacheKey,
|
||||
groupId,
|
||||
invoiceReference: invoiceRef,
|
||||
supplierName,
|
||||
exists: result.exists,
|
||||
matchType: result.matchType,
|
||||
errorMessage: result.errorMessage,
|
||||
cacheHit: false,
|
||||
apiCallTime: result.apiCallTime || 0,
|
||||
expiresAt: new Date(Date.now() + 24 * 60 * 60 * 1000) // 24h
|
||||
});
|
||||
|
||||
console.log('💾 Résultat mis en cache:', cacheKey);
|
||||
} catch (error) {
|
||||
console.error('❌ Erreur lors de la mise en cache:', error);
|
||||
}
|
||||
}
|
||||
|
||||
private async searchInNocodb(
|
||||
config: any,
|
||||
@@ -166,32 +90,31 @@ class InvoiceVerificationService {
|
||||
invoiceRef: string,
|
||||
blNumber: string,
|
||||
supplierName: string,
|
||||
groupId: number
|
||||
groupId: number,
|
||||
groupConfig?: any
|
||||
): Promise<InvoiceVerificationResult> {
|
||||
const startTime = Date.now();
|
||||
|
||||
try {
|
||||
// 1. Vérifier le cache d'abord
|
||||
const cacheKey = this.generateCacheKey(groupId, invoiceRef, supplierName);
|
||||
const cachedResult = await this.getCachedResult(cacheKey);
|
||||
if (cachedResult) {
|
||||
return cachedResult;
|
||||
}
|
||||
|
||||
// 2. Récupérer la configuration NocoDB
|
||||
const config = await this.getNocodbConfig();
|
||||
|
||||
// 3. Récupérer les informations du groupe
|
||||
const [group] = await db
|
||||
.select()
|
||||
.from(groups)
|
||||
.where(eq(groups.id, groupId))
|
||||
.limit(1);
|
||||
// 2. Utiliser la configuration du groupe passée en paramètre ou la récupérer
|
||||
let group = groupConfig;
|
||||
if (!group) {
|
||||
const [groupFromDb] = await db
|
||||
.select()
|
||||
.from(groups)
|
||||
.where(eq(groups.id, groupId))
|
||||
.limit(1);
|
||||
group = groupFromDb;
|
||||
}
|
||||
|
||||
if (!group || !group.nocodbTableName) {
|
||||
throw new Error('Configuration NocoDB manquante pour ce magasin');
|
||||
}
|
||||
|
||||
// 3. Récupérer la configuration NocoDB à partir des variables d'environnement
|
||||
const config = this.getNocodbConfigFromGroup(group);
|
||||
|
||||
let result: InvoiceVerificationResult = {
|
||||
exists: false,
|
||||
matchType: 'none',
|
||||
@@ -268,8 +191,7 @@ class InvoiceVerificationService {
|
||||
result.errorMessage = result.errorMessage || 'Aucune correspondance trouvée';
|
||||
}
|
||||
|
||||
// 6. Mettre en cache le résultat
|
||||
await this.setCachedResult(cacheKey, groupId, result, invoiceRef, supplierName);
|
||||
|
||||
|
||||
return result;
|
||||
|
||||
|
||||
+2
-1
@@ -884,7 +884,8 @@ export async function registerRoutes(app: Express): Promise<Server> {
|
||||
invoiceReference || delivery.invoiceReference || '',
|
||||
blNumber || delivery.blNumber || '',
|
||||
delivery.supplier.name,
|
||||
delivery.groupId
|
||||
delivery.groupId,
|
||||
delivery.group
|
||||
);
|
||||
|
||||
res.json(result);
|
||||
|
||||
+2
-3
@@ -30,9 +30,8 @@ import {
|
||||
type PublicityParticipation,
|
||||
type InsertPublicityParticipation,
|
||||
type PublicityWithRelations,
|
||||
nocodbConfig,
|
||||
type NocodbConfig,
|
||||
type InsertNocodbConfig,
|
||||
|
||||
|
||||
type CustomerOrder,
|
||||
type InsertCustomerOrder,
|
||||
type CustomerOrderWithRelations,
|
||||
|
||||
Reference in new issue
Block a user