@zauru-sdk/utils 6.30.1 → 6.30.2

package/dist/esm/zauru/weeklyItemPrice.utils.js

@@ -103,10 +103,41 @@ export const filterActiveSpecialItems = (specialItems) => (specialItems ?? [])
     .filter(isSpecialItemRow)
     .filter((row) => !row.data?.fechaEliminacion)
     .sort((a, b) => a.id - b.id);
-export const matchSpecialItemForWeeklyPrice = (specialItems, params) => filterActiveSpecialItems(specialItems).find((specialItem) => specialItem.data.item === params.itemId &&
-    specialItem.data.region === params.region &&
-    normalizeComparableValue(specialItem.data.tipo) ===
-        normalizeComparableValue(params.tipo));
+const normalizeOptionalSpecialValue = (value) => {
+    const normalized = normalizeComparableValue(value);
+    return normalized === "0" ? "" : normalized;
+};
+const optionalSpecialValueMatches = (configured, actual) => {
+    const expected = normalizeOptionalSpecialValue(configured);
+    return !expected || expected === normalizeOptionalSpecialValue(actual);
+};
+const specialItemSpecificity = (specialItem) => [
+    specialItem.provider,
+    specialItem.region,
+    specialItem.tipo,
+    specialItem.providerCategory,
+].filter((value) => normalizeOptionalSpecialValue(value)).length;
+export const matchSpecialItemForWeeklyPrice = (specialItems, params) => {
+    let bestMatch;
+    let bestSpecificity = -1;
+    for (const specialItem of filterActiveSpecialItems(specialItems)) {
+        const data = specialItem.data;
+        const matches = Number(data.item) === Number(params.itemId) &&
+            optionalSpecialValueMatches(data.provider, params.providerId) &&
+            optionalSpecialValueMatches(data.region, params.region) &&
+            optionalSpecialValueMatches(data.tipo, params.tipo) &&
+            optionalSpecialValueMatches(data.providerCategory, params.providerCategoryId);
+        if (!matches) {
+            continue;
+        }
+        const specificity = specialItemSpecificity(data);
+        if (specificity > bestSpecificity) {
+            bestMatch = specialItem;
+            bestSpecificity = specificity;
+        }
+    }
+    return bestMatch;
+};
 export const pickLatestMassiveCostBitacora = (rows, date) => {
     const masivas = (rows ?? [])
         .filter((row) => row.data?.accion === MASSIVE_VEGETABLE_COST_ACCION)
@@ -136,6 +167,8 @@ export const calculateItemPriceFromWeeklyMatrix = (input) => {
         itemId: input.itemId,
         region: input.region,
         tipo: input.tipo,
+        providerId: input.providerId,
+        providerCategoryId: input.providerCategoryId,
     });
     let source = "fallback";
     let basePrice = FALLBACK_UNIT_COST;
@@ -219,6 +252,7 @@ export const resolveItemPriceFromLatestWeeklyMatrix = (headers, session, params)
             date: params.date,
             region: params.region,
             tipo: params.tipo,
+            providerId: params.payeeId,
             providerCategoryId,
             matrix: matrixResponse.data,
             specialItems: specialItemsResponse.data ?? [],

package/dist/zauru/weeklyItemPrice.utils.d.ts

@@ -17,6 +17,8 @@ export declare const matchSpecialItemForWeeklyPrice: (specialItems: Array<Specia
     itemId: number;
     region?: string;
     tipo?: string;
+    providerId?: number;
+    providerCategoryId?: number;
 }) => WebAppRowGraphQL<SpecialItem> | undefined;
 export declare const pickLatestMassiveCostBitacora: (rows: WebAppRowGraphQL<BitacoraCostosItems>[] | undefined, date?: string) => WebAppRowGraphQL<BitacoraCostosItems> | undefined;
 export declare const calculateItemPriceFromWeeklyMatrix: (input: CalculateItemPriceFromWeeklyMatrixInput) => CalculateItemPriceFromWeeklyMatrixResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/utils",
-  "version": "6.30.1",
+  "version": "6.30.2",
   "description": "Utilidades, parseo de request y demás para desarrollo de webapps de Zauru",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -40,7 +40,7 @@
   "scripts": {
     "build": "npm run build:esm",
     "build:esm": "tsc -p tsconfig.esm.json",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "pnpm --dir ../common exec tsx --test ../utils/src/zauru/*.test.ts"
   },
   "files": [
     "dist"
@@ -75,8 +75,8 @@
     "@zauru-sdk/config": "^6.0.0",
     "@zauru-sdk/graphql": "^6.9.1",
     "@zauru-sdk/services": "^6.18.0",
-    "@zauru-sdk/types": "^6.30.0",
+    "@zauru-sdk/types": "^6.30.1",
     "moment": "^2.30.1"
   },
-  "gitHead": "dc5f6e04a2c4254710cbd86cb7016beefd84b9be"
+  "gitHead": "07c7b4434055c88b7d12f452a04e83b67ddeea61"
 }