medusa-product-helper 0.0.13 → 0.0.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.medusa/server/src/admin/index.js +59 -117
- package/.medusa/server/src/admin/index.mjs +59 -117
- package/.medusa/server/src/api/store/product-helper/products/route.js +112 -0
- package/.medusa/server/src/api/store/product-helper/products/validators.js +3 -1
- package/.medusa/server/src/config/product-helper-options.js +15 -1
- package/.medusa/server/src/index.js +101 -0
- package/.medusa/server/src/providers/filter-providers/availability-provider.js +82 -0
- package/.medusa/server/src/providers/filter-providers/base-filter-provider.js +14 -0
- package/.medusa/server/src/providers/filter-providers/base-product-provider.js +59 -0
- package/.medusa/server/src/providers/filter-providers/category-provider.js +36 -0
- package/.medusa/server/src/providers/filter-providers/collection-provider.js +36 -0
- package/.medusa/server/src/providers/filter-providers/index.js +58 -0
- package/.medusa/server/src/providers/filter-providers/metadata-provider.js +69 -0
- package/.medusa/server/src/providers/filter-providers/price-range-provider.js +95 -0
- package/.medusa/server/src/providers/filter-providers/promotion-provider.js +134 -0
- package/.medusa/server/src/providers/filter-providers/promotion-window-provider.js +85 -0
- package/.medusa/server/src/providers/filter-providers/rating-provider.js +69 -0
- package/.medusa/server/src/services/dynamic-filter-service.js +525 -0
- package/.medusa/server/src/services/filter-provider-loader.js +107 -0
- package/.medusa/server/src/services/filter-provider-registry.js +43 -0
- package/.medusa/server/src/services/product-filter-service.js +183 -0
- package/.medusa/server/src/shared/product-metadata/utils.js +66 -116
- package/.medusa/server/src/utils/query-builders/product-filters.js +89 -111
- package/.medusa/server/src/utils/query-parser.js +51 -0
- package/.medusa/server/src/workflows/add-to-wishlist.js +12 -26
- package/.medusa/server/src/workflows/get-wishlist.js +53 -51
- package/.medusa/server/src/workflows/remove-from-wishlist.js +3 -8
- package/README.md +89 -0
- package/package.json +3 -3
|
@@ -0,0 +1,525 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DynamicFilterService = void 0;
|
|
4
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const filter_provider_registry_1 = require("./filter-provider-registry");
|
|
6
|
+
class DynamicFilterService {
|
|
7
|
+
constructor(container) {
|
|
8
|
+
this.registry = this.resolveRegistry(container);
|
|
9
|
+
this.query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
10
|
+
}
|
|
11
|
+
getRegistry() {
|
|
12
|
+
return this.registry;
|
|
13
|
+
}
|
|
14
|
+
async applyFilters(options) {
|
|
15
|
+
const { filterParams, options: pluginOptions, pagination, projection, context = {} } = options;
|
|
16
|
+
const filterContext = { ...context, options: pluginOptions };
|
|
17
|
+
const { queryFilters, priceRangeFilter, promotionFilter } = await this.processFilters(filterParams, filterContext);
|
|
18
|
+
const fields = this.buildFields(projection?.fields);
|
|
19
|
+
const queryContext = this.buildQueryContext(context);
|
|
20
|
+
const queryOptions = this.buildQueryOptions(queryFilters, fields, pagination, queryContext);
|
|
21
|
+
const result = await this.query.graph(queryOptions);
|
|
22
|
+
const { data: productsRaw = [], metadata } = result;
|
|
23
|
+
let products = this.normalizeProducts(productsRaw);
|
|
24
|
+
products = await this.applyPostQueryFilters(products, priceRangeFilter, promotionFilter);
|
|
25
|
+
// Count should reflect filtered products, not initial query count
|
|
26
|
+
// If post-query filters were applied, use filtered products length
|
|
27
|
+
// Otherwise, use metadata count or products length
|
|
28
|
+
const hasPostQueryFilters = priceRangeFilter || promotionFilter;
|
|
29
|
+
const count = hasPostQueryFilters
|
|
30
|
+
? products.length
|
|
31
|
+
: await this.getCount(queryFilters, metadata, products.length);
|
|
32
|
+
return {
|
|
33
|
+
products,
|
|
34
|
+
count,
|
|
35
|
+
metadata: {
|
|
36
|
+
count,
|
|
37
|
+
skip: pagination?.offset,
|
|
38
|
+
take: pagination?.limit || (hasPostQueryFilters ? undefined : 20),
|
|
39
|
+
},
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
resolveRegistry(container) {
|
|
43
|
+
try {
|
|
44
|
+
return container.resolve("filterProviderRegistry");
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
const registry = new filter_provider_registry_1.FilterProviderRegistry();
|
|
48
|
+
this.autoRegisterBuiltInProviders(registry);
|
|
49
|
+
return registry;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
autoRegisterBuiltInProviders(registry) {
|
|
53
|
+
try {
|
|
54
|
+
const { registerBuiltInProviders } = require("../providers/filter-providers");
|
|
55
|
+
registerBuiltInProviders(registry);
|
|
56
|
+
}
|
|
57
|
+
catch (error) {
|
|
58
|
+
console.warn("[DynamicFilterService] Failed to auto-register built-in providers:", error);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
async processFilters(filterParams, filterContext) {
|
|
62
|
+
let queryFilters = {};
|
|
63
|
+
let priceRangeFilter;
|
|
64
|
+
let promotionFilter;
|
|
65
|
+
for (const [identifier, value] of Object.entries(filterParams)) {
|
|
66
|
+
if (value == null)
|
|
67
|
+
continue;
|
|
68
|
+
const provider = this.registry.get(identifier);
|
|
69
|
+
if (!provider) {
|
|
70
|
+
console.warn(`[DynamicFilterService] No filter provider found for: "${identifier}"`);
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
try {
|
|
74
|
+
this.validateWithProvider(provider, value);
|
|
75
|
+
const result = await Promise.resolve(provider.apply(queryFilters, value, filterContext));
|
|
76
|
+
queryFilters = result;
|
|
77
|
+
priceRangeFilter = queryFilters.__price_range_filter__;
|
|
78
|
+
promotionFilter = queryFilters.__promotion_filter__;
|
|
79
|
+
delete queryFilters.__price_range_filter__;
|
|
80
|
+
delete queryFilters.__promotion_filter__;
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
throw new Error(`Error applying filter "${identifier}": ${error}`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return { queryFilters, priceRangeFilter, promotionFilter };
|
|
87
|
+
}
|
|
88
|
+
validateWithProvider(provider, value) {
|
|
89
|
+
if (provider.validate) {
|
|
90
|
+
const validationResult = provider.validate(value);
|
|
91
|
+
if (Array.isArray(validationResult)) {
|
|
92
|
+
const errors = validationResult.map(err => `${err.path ? `${err.path}: ` : ""}${err.message}`).join(", ");
|
|
93
|
+
throw new Error(errors);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
buildFields(requestedFields) {
|
|
98
|
+
const essentialRelations = [
|
|
99
|
+
"variants.*", "variants.prices.*",
|
|
100
|
+
"options.*", "options.values.*",
|
|
101
|
+
"images.*", "collection.*", "type.*"
|
|
102
|
+
];
|
|
103
|
+
if (!requestedFields?.length || requestedFields.includes("*")) {
|
|
104
|
+
return ["*", ...essentialRelations];
|
|
105
|
+
}
|
|
106
|
+
const fields = [...requestedFields];
|
|
107
|
+
const has = (prefix) => fields.some(f => f.startsWith(prefix));
|
|
108
|
+
if (!has("variants"))
|
|
109
|
+
fields.push("variants.*", "variants.prices.*");
|
|
110
|
+
if (!has("options"))
|
|
111
|
+
fields.push("options.*", "options.values.*");
|
|
112
|
+
if (!has("images"))
|
|
113
|
+
fields.push("images.*");
|
|
114
|
+
if (!has("collection"))
|
|
115
|
+
fields.push("collection.*");
|
|
116
|
+
if (!has("type"))
|
|
117
|
+
fields.push("type.*");
|
|
118
|
+
return fields;
|
|
119
|
+
}
|
|
120
|
+
buildQueryContext(context) {
|
|
121
|
+
if (context?.pricingContext) {
|
|
122
|
+
return { variants: { calculated_price: context.pricingContext } };
|
|
123
|
+
}
|
|
124
|
+
return {};
|
|
125
|
+
}
|
|
126
|
+
buildQueryOptions(filters, fields, pagination, queryContext) {
|
|
127
|
+
const options = {
|
|
128
|
+
entity: "product",
|
|
129
|
+
fields,
|
|
130
|
+
...(Object.keys(filters).length > 0 && { filters }),
|
|
131
|
+
};
|
|
132
|
+
if (pagination) {
|
|
133
|
+
options.pagination = {};
|
|
134
|
+
// Ensure default limit if limit is 0 or undefined
|
|
135
|
+
if (pagination.limit !== undefined && pagination.limit > 0) {
|
|
136
|
+
options.pagination.take = pagination.limit;
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
// Default limit when limit is 0 or undefined
|
|
140
|
+
options.pagination.take = 20;
|
|
141
|
+
}
|
|
142
|
+
if (pagination.offset !== undefined) {
|
|
143
|
+
options.pagination.skip = pagination.offset;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
// If no pagination provided, set default
|
|
148
|
+
options.pagination = {
|
|
149
|
+
take: 20,
|
|
150
|
+
skip: 0
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
if (queryContext && Object.keys(queryContext).length > 0) {
|
|
154
|
+
options.context = queryContext;
|
|
155
|
+
}
|
|
156
|
+
return options;
|
|
157
|
+
}
|
|
158
|
+
normalizeProducts(productsRaw) {
|
|
159
|
+
if (Array.isArray(productsRaw)) {
|
|
160
|
+
return productsRaw.filter(p => p != null);
|
|
161
|
+
}
|
|
162
|
+
console.warn("[DynamicFilterService] Unexpected data structure from query.graph()");
|
|
163
|
+
return [];
|
|
164
|
+
}
|
|
165
|
+
async applyPostQueryFilters(products, priceRangeFilter, promotionFilter) {
|
|
166
|
+
let filteredProducts = products;
|
|
167
|
+
if (priceRangeFilter && filteredProducts.length > 0) {
|
|
168
|
+
filteredProducts = this.filterByPriceRange(filteredProducts, priceRangeFilter);
|
|
169
|
+
}
|
|
170
|
+
if (promotionFilter && filteredProducts.length > 0) {
|
|
171
|
+
filteredProducts = await this.filterByPromotion(filteredProducts, promotionFilter);
|
|
172
|
+
}
|
|
173
|
+
return filteredProducts;
|
|
174
|
+
}
|
|
175
|
+
filterByPriceRange(products, priceRangeFilter) {
|
|
176
|
+
return products.filter(product => {
|
|
177
|
+
if (!product.variants?.length)
|
|
178
|
+
return false;
|
|
179
|
+
return product.variants.some((variant) => {
|
|
180
|
+
const priceInfo = this.getPriceInfo(variant);
|
|
181
|
+
if (!priceInfo.price)
|
|
182
|
+
return false;
|
|
183
|
+
if (priceRangeFilter.currency_code && priceInfo.currency !== priceRangeFilter.currency_code) {
|
|
184
|
+
return false;
|
|
185
|
+
}
|
|
186
|
+
const { min, max } = priceRangeFilter;
|
|
187
|
+
if (min !== undefined && priceInfo.price < min)
|
|
188
|
+
return false;
|
|
189
|
+
if (max !== undefined && priceInfo.price > max)
|
|
190
|
+
return false;
|
|
191
|
+
return true;
|
|
192
|
+
});
|
|
193
|
+
});
|
|
194
|
+
}
|
|
195
|
+
getPriceInfo(variant) {
|
|
196
|
+
if (variant.calculated_price?.calculated_amount !== undefined) {
|
|
197
|
+
return {
|
|
198
|
+
price: variant.calculated_price.calculated_amount,
|
|
199
|
+
currency: variant.calculated_price.currency_code
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
if (variant.prices?.[0]) {
|
|
203
|
+
const price = variant.prices[0];
|
|
204
|
+
return { price: price.amount, currency: price.currency_code };
|
|
205
|
+
}
|
|
206
|
+
return {};
|
|
207
|
+
}
|
|
208
|
+
async filterByPromotion(products, promotionFilter) {
|
|
209
|
+
try {
|
|
210
|
+
const promotions = await this.fetchPromotions(promotionFilter);
|
|
211
|
+
// Debug logging
|
|
212
|
+
console.log(`[DynamicFilterService] Found ${promotions.length} promotions matching filter`);
|
|
213
|
+
if (promotions.length === 0) {
|
|
214
|
+
console.warn("[DynamicFilterService] No promotions found - returning empty array");
|
|
215
|
+
return [];
|
|
216
|
+
}
|
|
217
|
+
const productPromotionData = await this.extractProductPromotionData(promotions);
|
|
218
|
+
// Debug logging
|
|
219
|
+
console.log(`[DynamicFilterService] Extracted ${productPromotionData.productIds.size} unique product IDs from promotions`);
|
|
220
|
+
console.log(`[DynamicFilterService] Found discounts for ${productPromotionData.discounts.size} products`);
|
|
221
|
+
console.log(`[DynamicFilterService] Has universal promotions (no rules): ${productPromotionData.hasUniversalPromotions}`);
|
|
222
|
+
// If we have universal promotions (no rules = applies to all products)
|
|
223
|
+
// or if we have product IDs, filter accordingly
|
|
224
|
+
const hasProductIds = productPromotionData.productIds.size > 0;
|
|
225
|
+
const hasUniversalPromotions = productPromotionData.hasUniversalPromotions;
|
|
226
|
+
if (!hasProductIds && !hasUniversalPromotions) {
|
|
227
|
+
console.warn("[DynamicFilterService] No product IDs found and no universal promotions - returning empty array");
|
|
228
|
+
return [];
|
|
229
|
+
}
|
|
230
|
+
const filtered = products.filter(product => {
|
|
231
|
+
const productId = product?.id;
|
|
232
|
+
if (!productId)
|
|
233
|
+
return false;
|
|
234
|
+
// If promotion has no rules (universal), it applies to all products
|
|
235
|
+
// Otherwise, check if product is in the promotion's product list
|
|
236
|
+
if (hasProductIds && !productPromotionData.productIds.has(productId)) {
|
|
237
|
+
return false;
|
|
238
|
+
}
|
|
239
|
+
// Get discount for this product (from specific promotion or universal promotion)
|
|
240
|
+
let discount = productPromotionData.discounts.get(productId) || 0;
|
|
241
|
+
// If no specific discount found but we have universal promotions, use the universal discount
|
|
242
|
+
if (discount === 0 && hasUniversalPromotions) {
|
|
243
|
+
// Use the discount from the first universal promotion
|
|
244
|
+
discount = productPromotionData.universalDiscount || 0;
|
|
245
|
+
}
|
|
246
|
+
const meetsCriteria = this.meetsDiscountCriteria(discount, promotionFilter);
|
|
247
|
+
if (!meetsCriteria) {
|
|
248
|
+
console.log(`[DynamicFilterService] Product ${productId} discount ${discount}% does not meet criteria (min: ${promotionFilter.min_discount_percentage}, max: ${promotionFilter.max_discount_percentage})`);
|
|
249
|
+
}
|
|
250
|
+
return meetsCriteria;
|
|
251
|
+
});
|
|
252
|
+
console.log(`[DynamicFilterService] Filtered ${products.length} products down to ${filtered.length} matching promotion criteria`);
|
|
253
|
+
return filtered;
|
|
254
|
+
}
|
|
255
|
+
catch (error) {
|
|
256
|
+
console.warn("[DynamicFilterService] Error filtering by promotions:", error);
|
|
257
|
+
return products;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
async fetchPromotions(promotionFilter) {
|
|
261
|
+
const queryOptions = {
|
|
262
|
+
entity: "promotion",
|
|
263
|
+
fields: [
|
|
264
|
+
"id", "code", "type", "application_method.*", "campaign.*",
|
|
265
|
+
"rules.*", "rules.values.*", "starts_at", "ends_at", "status", "metadata"
|
|
266
|
+
],
|
|
267
|
+
};
|
|
268
|
+
const filters = {};
|
|
269
|
+
// Status filter (default to active if not specified)
|
|
270
|
+
if (promotionFilter.status) {
|
|
271
|
+
filters.status = promotionFilter.status;
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
// Default to active promotions
|
|
275
|
+
filters.status = "active";
|
|
276
|
+
}
|
|
277
|
+
if (promotionFilter.promotion_type) {
|
|
278
|
+
filters.type = promotionFilter.promotion_type;
|
|
279
|
+
}
|
|
280
|
+
if (Object.keys(filters).length > 0) {
|
|
281
|
+
queryOptions.filters = filters;
|
|
282
|
+
}
|
|
283
|
+
// Fetch all promotions matching status/type filters
|
|
284
|
+
// Date filtering will be done in code since Medusa query API
|
|
285
|
+
// may not support complex date range queries
|
|
286
|
+
const result = await this.query.graph(queryOptions);
|
|
287
|
+
let promotions = Array.isArray(result.data) ? result.data : [];
|
|
288
|
+
// Filter by date ranges in code
|
|
289
|
+
const now = new Date();
|
|
290
|
+
promotions = promotions.filter((promo) => {
|
|
291
|
+
// Check starts_at
|
|
292
|
+
if (promo.starts_at) {
|
|
293
|
+
const startsAt = new Date(promo.starts_at);
|
|
294
|
+
if (promotionFilter.starts_at) {
|
|
295
|
+
// If specific starts_at filter provided, check if promotion starts at or before it
|
|
296
|
+
const filterStartsAt = new Date(promotionFilter.starts_at);
|
|
297
|
+
if (startsAt > filterStartsAt)
|
|
298
|
+
return false;
|
|
299
|
+
}
|
|
300
|
+
else {
|
|
301
|
+
// Default: only include promotions that have started
|
|
302
|
+
if (startsAt > now)
|
|
303
|
+
return false;
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
// Check ends_at
|
|
307
|
+
if (promo.ends_at) {
|
|
308
|
+
const endsAt = new Date(promo.ends_at);
|
|
309
|
+
if (promotionFilter.ends_at) {
|
|
310
|
+
// If specific ends_at filter provided, check if promotion ends at or after it
|
|
311
|
+
const filterEndsAt = new Date(promotionFilter.ends_at);
|
|
312
|
+
if (endsAt < filterEndsAt)
|
|
313
|
+
return false;
|
|
314
|
+
}
|
|
315
|
+
else {
|
|
316
|
+
// Default: only include promotions that haven't ended yet
|
|
317
|
+
if (endsAt < now)
|
|
318
|
+
return false;
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
else {
|
|
322
|
+
// Open-ended promotion (no ends_at)
|
|
323
|
+
// Include if include_open_ended is true (default) or not explicitly false
|
|
324
|
+
if (promotionFilter.include_open_ended === false) {
|
|
325
|
+
return false;
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
return true;
|
|
329
|
+
});
|
|
330
|
+
return promotions;
|
|
331
|
+
}
|
|
332
|
+
async extractProductPromotionData(promotions) {
|
|
333
|
+
const productIds = new Set();
|
|
334
|
+
const discounts = new Map();
|
|
335
|
+
let hasUniversalPromotions = false;
|
|
336
|
+
let universalDiscount = 0;
|
|
337
|
+
for (const promotion of promotions) {
|
|
338
|
+
const discount = this.calculateDiscountPercentage(promotion);
|
|
339
|
+
// Debug: Log full promotion structure for first promotion
|
|
340
|
+
if (promotions.indexOf(promotion) === 0) {
|
|
341
|
+
console.log(`[DynamicFilterService] Promotion structure:`, JSON.stringify({
|
|
342
|
+
id: promotion.id,
|
|
343
|
+
code: promotion.code,
|
|
344
|
+
type: promotion.type,
|
|
345
|
+
rules: promotion.rules,
|
|
346
|
+
application_method: promotion.application_method,
|
|
347
|
+
metadata: promotion.metadata
|
|
348
|
+
}, null, 2));
|
|
349
|
+
}
|
|
350
|
+
// Check if promotion has no rules (universal promotion - applies to all products)
|
|
351
|
+
const hasNoRules = !promotion.rules || promotion.rules.length === 0;
|
|
352
|
+
if (hasNoRules) {
|
|
353
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code} has no rules - applies to all products`);
|
|
354
|
+
hasUniversalPromotions = true;
|
|
355
|
+
if (discount !== undefined && discount > universalDiscount) {
|
|
356
|
+
universalDiscount = discount;
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
const ids = await this.extractProductIdsFromPromotion(promotion);
|
|
360
|
+
// Debug logging for first promotion
|
|
361
|
+
if (promotions.indexOf(promotion) === 0) {
|
|
362
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code}: discount=${discount}%, productIds=${ids.length}, universal=${hasNoRules}`);
|
|
363
|
+
if (ids.length > 0) {
|
|
364
|
+
console.log(`[DynamicFilterService] Sample product IDs: ${ids.slice(0, 3).join(", ")}`);
|
|
365
|
+
}
|
|
366
|
+
else if (!hasNoRules) {
|
|
367
|
+
console.warn(`[DynamicFilterService] No product IDs extracted from promotion ${promotion.id || promotion.code}`);
|
|
368
|
+
}
|
|
369
|
+
}
|
|
370
|
+
// Only add product IDs if promotion has rules
|
|
371
|
+
// Universal promotions (no rules) apply to all products
|
|
372
|
+
if (!hasNoRules) {
|
|
373
|
+
ids.forEach(id => {
|
|
374
|
+
productIds.add(id);
|
|
375
|
+
if (discount !== undefined) {
|
|
376
|
+
const currentMax = discounts.get(id) || 0;
|
|
377
|
+
discounts.set(id, Math.max(currentMax, discount));
|
|
378
|
+
}
|
|
379
|
+
});
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
return { productIds, discounts, hasUniversalPromotions, universalDiscount };
|
|
383
|
+
}
|
|
384
|
+
calculateDiscountPercentage(promotion) {
|
|
385
|
+
const appMethod = promotion.application_method;
|
|
386
|
+
if (!appMethod || typeof appMethod !== "object") {
|
|
387
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code}: No application_method`);
|
|
388
|
+
return undefined;
|
|
389
|
+
}
|
|
390
|
+
// Try to get discount from application_method.type === "percentage"
|
|
391
|
+
if (appMethod.type === "percentage" && "value" in appMethod) {
|
|
392
|
+
const value = typeof appMethod.value === "number" ? appMethod.value : Number(appMethod.value);
|
|
393
|
+
if (!Number.isNaN(value)) {
|
|
394
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code}: Found percentage discount ${value}% from application_method.type=percentage`);
|
|
395
|
+
return value;
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
// Try to get discount from promotion type
|
|
399
|
+
if (promotion.type === "percentage_off_product" || promotion.type === "percentage_off_order") {
|
|
400
|
+
if ("value" in appMethod) {
|
|
401
|
+
const value = typeof appMethod.value === "number" ? appMethod.value : Number(appMethod.value);
|
|
402
|
+
if (!Number.isNaN(value)) {
|
|
403
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code}: Found percentage discount ${value}% from promotion.type=${promotion.type}`);
|
|
404
|
+
return value;
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
console.log(`[DynamicFilterService] Promotion ${promotion.id || promotion.code}: Could not calculate discount percentage. type=${promotion.type}, appMethod.type=${appMethod.type}, appMethod.value=${appMethod.value}`);
|
|
409
|
+
return undefined;
|
|
410
|
+
}
|
|
411
|
+
async extractProductIdsFromPromotion(promotion) {
|
|
412
|
+
const productIds = new Set();
|
|
413
|
+
// Debug: Log rule structure
|
|
414
|
+
if (promotion.rules?.length) {
|
|
415
|
+
console.log(`[DynamicFilterService] Processing ${promotion.rules.length} rules for promotion ${promotion.id || promotion.code}`);
|
|
416
|
+
for (const rule of promotion.rules) {
|
|
417
|
+
const ruleType = rule.type || rule.attribute || "";
|
|
418
|
+
const normalizedType = String(ruleType).toLowerCase();
|
|
419
|
+
console.log(`[DynamicFilterService] Rule: type=${ruleType}, attribute=${rule.attribute}, values=`, rule.values);
|
|
420
|
+
// Skip rules that definitely don't contain product IDs
|
|
421
|
+
if (normalizedType &&
|
|
422
|
+
(normalizedType === "customer_groups" ||
|
|
423
|
+
normalizedType === "regions" ||
|
|
424
|
+
normalizedType === "currency" ||
|
|
425
|
+
normalizedType === "customer_group" ||
|
|
426
|
+
normalizedType === "region")) {
|
|
427
|
+
console.log(`[DynamicFilterService] Skipping non-product rule: ${ruleType}`);
|
|
428
|
+
continue;
|
|
429
|
+
}
|
|
430
|
+
// Process all other rules (including product-related ones)
|
|
431
|
+
// In Medusa v2, rules.values can be:
|
|
432
|
+
// - An array of strings (product IDs)
|
|
433
|
+
// - An array of objects with id/value fields
|
|
434
|
+
// - A single value
|
|
435
|
+
let values = [];
|
|
436
|
+
if (Array.isArray(rule.values)) {
|
|
437
|
+
values = rule.values;
|
|
438
|
+
}
|
|
439
|
+
else if (rule.values !== undefined && rule.values !== null) {
|
|
440
|
+
values = [rule.values];
|
|
441
|
+
}
|
|
442
|
+
console.log(`[DynamicFilterService] Processing ${values.length} values from rule ${ruleType}`);
|
|
443
|
+
for (const value of values) {
|
|
444
|
+
if (typeof value === "string") {
|
|
445
|
+
// String values could be product IDs
|
|
446
|
+
if (value.length > 0) {
|
|
447
|
+
console.log(`[DynamicFilterService] Adding product ID from string: ${value}`);
|
|
448
|
+
productIds.add(value);
|
|
449
|
+
}
|
|
450
|
+
}
|
|
451
|
+
else if (typeof value === "object" && value !== null) {
|
|
452
|
+
// Handle object values - could be { id: "prod_123" } or similar
|
|
453
|
+
console.log(`[DynamicFilterService] Processing object value:`, value);
|
|
454
|
+
if ("id" in value && typeof value.id === "string") {
|
|
455
|
+
console.log(`[DynamicFilterService] Adding product ID from object.id: ${value.id}`);
|
|
456
|
+
productIds.add(value.id);
|
|
457
|
+
}
|
|
458
|
+
else if ("value" in value && typeof value.value === "string") {
|
|
459
|
+
console.log(`[DynamicFilterService] Adding product ID from object.value: ${value.value}`);
|
|
460
|
+
productIds.add(value.value);
|
|
461
|
+
}
|
|
462
|
+
else if ("product_id" in value && typeof value.product_id === "string") {
|
|
463
|
+
console.log(`[DynamicFilterService] Adding product ID from object.product_id: ${value.product_id}`);
|
|
464
|
+
productIds.add(value.product_id);
|
|
465
|
+
}
|
|
466
|
+
else {
|
|
467
|
+
// Try to extract any string field that looks like an ID
|
|
468
|
+
for (const [key, val] of Object.entries(value)) {
|
|
469
|
+
if (typeof val === "string" && val.length > 0 && (val.startsWith("prod_") || key.toLowerCase().includes("id"))) {
|
|
470
|
+
console.log(`[DynamicFilterService] Adding product ID from object.${key}: ${val}`);
|
|
471
|
+
productIds.add(val);
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
}
|
|
476
|
+
}
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
else {
|
|
480
|
+
console.log(`[DynamicFilterService] No rules found in promotion ${promotion.id || promotion.code}`);
|
|
481
|
+
}
|
|
482
|
+
// Also check metadata for product IDs (fallback)
|
|
483
|
+
if (promotion.metadata?.product_ids?.length) {
|
|
484
|
+
console.log(`[DynamicFilterService] Found product IDs in metadata:`, promotion.metadata.product_ids);
|
|
485
|
+
promotion.metadata.product_ids.forEach((id) => {
|
|
486
|
+
if (typeof id === "string") {
|
|
487
|
+
productIds.add(id);
|
|
488
|
+
}
|
|
489
|
+
});
|
|
490
|
+
}
|
|
491
|
+
const result = Array.from(productIds);
|
|
492
|
+
console.log(`[DynamicFilterService] Extracted ${result.length} product IDs:`, result);
|
|
493
|
+
return result;
|
|
494
|
+
}
|
|
495
|
+
meetsDiscountCriteria(discount, promotionFilter) {
|
|
496
|
+
if (promotionFilter.min_discount_percentage !== undefined &&
|
|
497
|
+
discount < promotionFilter.min_discount_percentage) {
|
|
498
|
+
return false;
|
|
499
|
+
}
|
|
500
|
+
if (promotionFilter.max_discount_percentage !== undefined &&
|
|
501
|
+
discount > promotionFilter.max_discount_percentage) {
|
|
502
|
+
return false;
|
|
503
|
+
}
|
|
504
|
+
return true;
|
|
505
|
+
}
|
|
506
|
+
async getCount(queryFilters, metadata, productsLength) {
|
|
507
|
+
if (metadata?.count !== undefined)
|
|
508
|
+
return metadata.count;
|
|
509
|
+
try {
|
|
510
|
+
const countResult = await this.query.graph({
|
|
511
|
+
entity: "product",
|
|
512
|
+
fields: ["id"],
|
|
513
|
+
...(Object.keys(queryFilters).length > 0 && { filters: queryFilters }),
|
|
514
|
+
});
|
|
515
|
+
return countResult.metadata?.count ||
|
|
516
|
+
(Array.isArray(countResult.data) ? countResult.data.length : productsLength);
|
|
517
|
+
}
|
|
518
|
+
catch (error) {
|
|
519
|
+
console.warn("[DynamicFilterService] Could not determine count:", error);
|
|
520
|
+
return productsLength;
|
|
521
|
+
}
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
exports.DynamicFilterService = DynamicFilterService;
|
|
525
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dynamic-filter-service.js","sourceRoot":"","sources":["../../../../src/services/dynamic-filter-service.ts"],"names":[],"mappings":"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"}
|