reshape search

src/services/article/searchArticles.js

@@ -1,6 +1,7 @@
 import { getPool } from '../../db/mssqlClient.js';
 import { LOAD_KAT_MAP } from '../../db/mssql/categories.js';
 import * as Q from '../../db/mssql/searchArticles.js';
+import { bruttoFromNetto, loadSteuersatz } from '../misc/getSteuer.js';
 
 let katMapCache;
 
@@ -55,6 +56,22 @@ function buildKatAgg(recordset, katMap) {
     return katagg;
 }
 
+function shapeArticle(row, steuersaetze) {
+    const taxRow = steuersaetze.find((item) => item.kSteuerklasse === row.kSteuerklasse);
+    const brutto = bruttoFromNetto(row.fVKNEtto, row.kSteuerklasse, steuersaetze);
+
+    return {
+        katList: row.katList,
+        available: row.fVerfuegbar,
+        id: row.kArtikel,
+        stock: row.fBestand,
+        sku: row.cArtNr,
+        name: row.cName,
+        price: brutto == null ? null : Math.round(brutto * 10) / 10,
+        tax: taxRow?.fSteuersatz ?? null,
+    };
+}
+
 function buildTargetClause(request, target) {
     const parts = [];
     let i = 0;
@@ -120,12 +137,15 @@ function buildQuery(filter, categoryFilter) {
         WHERE `;
 }
 
-export async function searchArticles(target, filter = ['']) {
+export async function searchArticles(target, filter = [''], offset = 0, maxCount = 10) {
     const trimmed = target?.toString().trim();
     if (!trimmed) {
-        return { katagg: {}, recordset: [] };
+        return { katagg: {}, length: 0, recordset: [] };
     }
 
+    const start = Math.max(0, Number(offset) || 0);
+    const count = Math.max(0, Number(maxCount) || 10);
+
     const pool = await getPool();
     const request = pool.request();
     const { parts } = buildTargetClause(request, trimmed);
@@ -139,8 +159,17 @@ export async function searchArticles(target, filter = ['']) {
     }
 
     const result = await request.query(sql);
-    const katMap = await loadKatMap(pool);
+    const [katMap, steuersaetze] = await Promise.all([
+        loadKatMap(pool),
+        loadSteuersatz(),
+    ]);
     const katagg = buildKatAgg(result.recordset, katMap);
+    const length = result.recordset.length;
+    const recordset = result.recordset
+        .slice(start, start + count)
+        .map((row) => shapeArticle(row, steuersaetze));
+    
+        console.dir({ katagg, length, recordset }, { depth: null });
 
-    return { katagg, recordset: result.recordset };
+    return { katagg, length, recordset };
 }

src/services/misc/getSteuer.js

@@ -1,31 +1,56 @@
 import { getPool } from '../../db/mssqlClient.js';
-import { LOAD_STEUERKLASSEN } from '../../db/mssql/steuer.js';
+import { LOAD_STEUERSATZ, LOAD_STEUERKLASSEN } from '../../db/mssql/steuer.js';
+import env from '../../config/env.js';
 
-let cache;
+let steuersatzCache;
+let steuerklassenCache;
 
 /**
- * Loads JTL tax classes with domestic VAT rates (`tSteuerklasse` / `tSteuersatz`).
+ * Loads VAT rates per tax class for the configured steuer zone (`tSteuersatz` only).
+ * Results are cached for the process lifetime.
+ * @returns {Promise<Array<{ kSteuerklasse: number, fSteuersatz: number }>>}
+ */
+export async function loadSteuersatz() {
+    if (steuersatzCache) {
+        return steuersatzCache;
+    }
+
+    const pool = await getPool();
+    const result = await pool.request()
+        .input('steuerZone', env.steuerZone)
+        .query(LOAD_STEUERSATZ);
+    steuersatzCache = result.recordset.map((row) => ({
+        kSteuerklasse: row.kSteuerklasse,
+        fSteuersatz: row.fSteuersatz,
+    }));
+    return steuersatzCache;
+}
+
+/**
+ * Loads tax classes with display metadata for the configured steuer zone.
  * Results are cached for the process lifetime.
  * @returns {Promise<Array<{ kSteuerklasse: number, cName: string, nStandard: number, fSteuersatz: number }>>}
  */
 export async function loadSteuerklassen() {
-    if (cache) {
-        return cache;
+    if (steuerklassenCache) {
+        return steuerklassenCache;
     }
 
     const pool = await getPool();
-    const result = await pool.request().query(LOAD_STEUERKLASSEN);
-    cache = result.recordset.map((row) => ({
+    const result = await pool.request()
+        .input('steuerZone', env.steuerZone)
+        .query(LOAD_STEUERKLASSEN);
+    steuerklassenCache = result.recordset.map((row) => ({
         kSteuerklasse: row.kSteuerklasse,
         cName: row.cName,
         nStandard: row.nStandard,
         fSteuersatz: row.fSteuersatz,
     }));
-    return cache;
+    return steuerklassenCache;
 }
 
-export function bruttoFromNetto(netto, kSteuerklasse, steuerklassen) {
-    const row = steuerklassen.find((item) => item.kSteuerklasse === kSteuerklasse);
+export function bruttoFromNetto(netto, kSteuerklasse, steuersaetze) {
+    const row = steuersaetze.find((item) => item.kSteuerklasse === kSteuerklasse);
     if (row == null || netto == null) {
         return null;
     }