@devx-commerce/plugin-gati 0.0.34 → 0.0.35-beta.3
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/api/admin/masters/[master]/[id]/route.js +121 -0
- package/.medusa/server/src/api/admin/masters/[master]/route.js +33 -0
- package/.medusa/server/src/api/admin/masters/middlewares.js +35 -0
- package/.medusa/server/src/api/admin/masters/query-config.js +14 -0
- package/.medusa/server/src/api/admin/masters/search-middleware.js +16 -0
- package/.medusa/server/src/api/admin/masters/utils.js +108 -0
- package/.medusa/server/src/api/admin/masters/validators.js +28 -0
- package/.medusa/server/src/api/admin/middlewares.js +6 -2
- package/.medusa/server/src/api/admin/variant-options/recalculate/route.js +446 -0
- package/.medusa/server/src/api/admin/variant-options/sync/route.js +329 -0
- package/.medusa/server/src/api/erp/webhook/config.js +37 -6
- package/.medusa/server/src/api/erp/webhook/route.js +10 -137
- package/.medusa/server/src/api/middlewares.js +3 -1
- package/.medusa/server/src/api/pos/gold-rate/middleware.js +13 -0
- package/.medusa/server/src/api/pos/gold-rate/route.js +96 -0
- package/.medusa/server/src/api/pos/middleware.js +13 -0
- package/.medusa/server/src/api/store/gold-rate/current/route.js +70 -0
- package/.medusa/server/src/api/store/gold-rate/historical/route.js +108 -0
- package/.medusa/server/src/api/store/gold-rate/middleware.js +19 -0
- package/.medusa/server/src/api/store/gold-rate/validators.js +37 -0
- package/.medusa/server/src/api/store/middleware.js +3 -1
- package/.medusa/server/src/jobs/process-erp-events.js +205 -0
- package/.medusa/server/src/jobs/process-variant-option-sync.js +536 -0
- package/.medusa/server/src/jobs/sync-order-erp.js +2 -2
- package/.medusa/server/src/modules/category-group-master/migrations/Migration20251031061116.js +14 -0
- package/.medusa/server/src/modules/category-group-master/migrations/Migration20251104045912.js +14 -0
- package/.medusa/server/src/modules/category-master/migrations/Migration20251031061327.js +14 -0
- package/.medusa/server/src/modules/category-master/migrations/Migration20251104045755.js +14 -0
- package/.medusa/server/src/modules/collection-group-master/migrations/Migration20251031061432.js +14 -0
- package/.medusa/server/src/modules/collection-group-master/migrations/Migration20251104050102.js +14 -0
- package/.medusa/server/src/modules/collection-master/migrations/Migration20251031060941.js +14 -0
- package/.medusa/server/src/modules/collection-master/migrations/Migration20251104050012.js +14 -0
- package/.medusa/server/src/modules/discount-master/migrations/Migration20251031061523.js +14 -0
- package/.medusa/server/src/modules/discount-master/migrations/Migration20251104050153.js +14 -0
- package/.medusa/server/src/modules/erp/service.js +59 -2
- package/.medusa/server/src/modules/extended-product/migrations/Migration20251103182726.js +14 -0
- package/.medusa/server/src/modules/extended-product/migrations/Migration20251119062526.js +16 -0
- package/.medusa/server/src/modules/extended-product/migrations/Migration20251202055742.js +14 -0
- package/.medusa/server/src/modules/extended-product/migrations/Migration20251202064200.js +16 -0
- package/.medusa/server/src/modules/extended-product/models/extended-product.js +89 -9
- package/.medusa/server/src/modules/extended-variant/migrations/Migration20251119063328.js +20 -0
- package/.medusa/server/src/modules/extended-variant/migrations/Migration20251120045708.js +14 -0
- package/.medusa/server/src/modules/extended-variant/migrations/Migration20251120051832.js +14 -0
- package/.medusa/server/src/modules/extended-variant/migrations/Migration20251120052514.js +14 -0
- package/.medusa/server/src/modules/extended-variant/migrations/Migration20251202055952.js +14 -0
- package/.medusa/server/src/modules/extended-variant/models/extended-variant.js +145 -12
- package/.medusa/server/src/modules/item-size-master/index.js +13 -0
- package/.medusa/server/src/modules/item-size-master/migrations/Migration20251031111036.js +17 -0
- package/.medusa/server/src/modules/item-size-master/models/item-size-master.js +14 -0
- package/.medusa/server/src/modules/item-size-master/service.js +10 -0
- package/.medusa/server/src/modules/party-master/migrations/Migration20251031061657.js +14 -0
- package/.medusa/server/src/modules/party-master/migrations/Migration20251104050242.js +14 -0
- package/.medusa/server/src/modules/promocode-master/migrations/Migration20251031061829.js +14 -0
- package/.medusa/server/src/modules/promocode-master/migrations/Migration20251104050332.js +14 -0
- package/.medusa/server/src/modules/quality-master/index.js +13 -0
- package/.medusa/server/src/modules/quality-master/migrations/Migration20251031095211.js +16 -0
- package/.medusa/server/src/modules/quality-master/migrations/Migration20251105045114.js +14 -0
- package/.medusa/server/src/modules/quality-master/models/quality-master.js +17 -0
- package/.medusa/server/src/modules/quality-master/service.js +10 -0
- package/.medusa/server/src/modules/raw-master/migrations/Migration20251031061912.js +14 -0
- package/.medusa/server/src/modules/raw-master/models/raw-master.js +2 -1
- package/.medusa/server/src/modules/shape-master/migrations/Migration20251031062019.js +14 -0
- package/.medusa/server/src/modules/shape-master/models/shape-master.js +2 -1
- package/.medusa/server/src/modules/shipping-info-master/migrations/Migration20251031062128.js +14 -0
- package/.medusa/server/src/modules/shipping-info-master/migrations/Migration20251104050501.js +14 -0
- package/.medusa/server/src/modules/shipping-info-master/migrations/Migration20251203083315.js +16 -0
- package/.medusa/server/src/modules/shipping-info-master/models/shipping-info-master.js +2 -2
- package/.medusa/server/src/modules/sub-category-master/migrations/Migration20251031062303.js +14 -0
- package/.medusa/server/src/modules/sub-category-master/migrations/Migration20251104050743.js +14 -0
- package/.medusa/server/src/modules/tone-master/index.js +13 -0
- package/.medusa/server/src/modules/tone-master/migrations/Migration20251031104320.js +16 -0
- package/.medusa/server/src/modules/tone-master/models/tone-master.js +15 -0
- package/.medusa/server/src/modules/tone-master/service.js +10 -0
- package/.medusa/server/src/modules/variant-option-sync-queue/index.js +13 -0
- package/.medusa/server/src/modules/variant-option-sync-queue/migrations/Migration20251101082220.js +19 -0
- package/.medusa/server/src/modules/variant-option-sync-queue/migrations/Migration20251103123857.js +16 -0
- package/.medusa/server/src/modules/variant-option-sync-queue/models/variant-option-sync-queue.js +23 -0
- package/.medusa/server/src/modules/variant-option-sync-queue/service.js +49 -0
- package/.medusa/server/src/subscribers/party-master.js +35 -34
- package/.medusa/server/src/utils/build-redis-key.js +30 -0
- package/.medusa/server/src/workflows/create-or-update-product-options/steps/create-update-product-options.js +39 -2
- package/.medusa/server/src/workflows/helpers/product-helper.js +444 -115
- package/.medusa/server/src/workflows/helpers/update-variant-option-metadata.js +105 -0
- package/.medusa/server/src/workflows/helpers/variant-helper.js +215 -0
- package/.medusa/server/src/workflows/hooks/product-updated.js +6 -11
- package/.medusa/server/src/workflows/inward-master/helper/index.js +88 -40
- package/.medusa/server/src/workflows/inward-master/steps/create-inward-exploration-lines.js +1 -2
- package/.medusa/server/src/workflows/inward-master/steps/create-inward-extra-charges-lines.js +1 -2
- package/.medusa/server/src/workflows/inward-master/workflows/update-inward.js +6 -2
- package/.medusa/server/src/workflows/item-size-master/create-or-update-item-size-master.js +51 -0
- package/.medusa/server/src/workflows/item-size-master/index.js +15 -0
- package/.medusa/server/src/workflows/item-size-master/steps/create-item-size.js +21 -0
- package/.medusa/server/src/workflows/item-size-master/steps/delete-item-size.js +23 -0
- package/.medusa/server/src/workflows/item-size-master/steps/fetch-item-size-master.js +55 -0
- package/.medusa/server/src/workflows/item-size-master/steps/update-item-size.js +36 -0
- package/.medusa/server/src/workflows/orders/steps/sync-order-to-erp.js +3 -2
- package/.medusa/server/src/workflows/orders/utils/order-helper.js +6 -5
- package/.medusa/server/src/workflows/orders/workflows/sync-order-to-erp.js +27 -2
- package/.medusa/server/src/workflows/party-master/steps/delete-party.js +3 -7
- package/.medusa/server/src/workflows/party-master/steps/fetch-party-master.js +2 -1
- package/.medusa/server/src/workflows/party-master/workflows/create-or-update-party-master.js +2 -50
- package/.medusa/server/src/workflows/party-master/workflows/delete-party-master.js +60 -0
- package/.medusa/server/src/workflows/party-master/workflows/index.js +2 -1
- package/.medusa/server/src/workflows/party-style-master/steps/update-product-options-after-deletion.js +79 -195
- package/.medusa/server/src/workflows/party-style-master/steps/update-product-options-after-variant-update.js +447 -0
- package/.medusa/server/src/workflows/party-style-master/workflows/create-or-update-party-style-master.js +126 -4
- package/.medusa/server/src/workflows/quality-master/create-or-update-quality-master.js +58 -0
- package/.medusa/server/src/workflows/quality-master/index.js +30 -0
- package/.medusa/server/src/workflows/quality-master/steps/create-quality.js +22 -0
- package/.medusa/server/src/workflows/quality-master/steps/delete-quality.js +20 -0
- package/.medusa/server/src/workflows/quality-master/steps/fetch-quality-master.js +54 -0
- package/.medusa/server/src/workflows/quality-master/steps/update-quality.js +37 -0
- package/.medusa/server/src/workflows/raw-master/create-or-update-raw-master.js +58 -0
- package/.medusa/server/src/workflows/raw-master/steps/delete-raw.js +9 -11
- package/.medusa/server/src/workflows/shape-master/create-or-update-shape-master.js +53 -0
- package/.medusa/server/src/workflows/shape-master/steps/delete-shape.js +9 -9
- package/.medusa/server/src/workflows/tone-master/create-or-update-tone-master.js +52 -0
- package/.medusa/server/src/workflows/tone-master/index.js +30 -0
- package/.medusa/server/src/workflows/tone-master/steps/create-tone.js +22 -0
- package/.medusa/server/src/workflows/tone-master/steps/delete-tone.js +20 -0
- package/.medusa/server/src/workflows/tone-master/steps/fetch-tone-master.js +54 -0
- package/.medusa/server/src/workflows/tone-master/steps/update-tone.js +37 -0
- package/.medusa/server/src/workflows/update-extended-product-from-product/index.js +6 -8
- package/.medusa/server/src/workflows/update-extended-variant-from-variant/workflows/update-extended-variant-status-from-variant.js +9 -3
- package/package.json +1 -1
- package/.medusa/server/development/erp-order-payload-example.js +0 -76
|
@@ -0,0 +1,447 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.updateProductOptionsAfterVariantUpdateStep = void 0;
|
|
4
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
5
|
+
const workflows_sdk_1 = require("@medusajs/framework/workflows-sdk");
|
|
6
|
+
const core_flows_1 = require("@medusajs/medusa/core-flows");
|
|
7
|
+
const update_variant_option_metadata_1 = require("../../helpers/update-variant-option-metadata");
|
|
8
|
+
exports.updateProductOptionsAfterVariantUpdateStep = (0, workflows_sdk_1.createStep)("update-product-options-after-variant-update", async (input, { container }) => {
|
|
9
|
+
try {
|
|
10
|
+
const query = container.resolve(utils_1.ContainerRegistrationKeys.QUERY);
|
|
11
|
+
// Get products with their options
|
|
12
|
+
const { data: products } = await query.graph({
|
|
13
|
+
entity: "product",
|
|
14
|
+
fields: ["id", "options.*"],
|
|
15
|
+
filters: {
|
|
16
|
+
id: input.productIds,
|
|
17
|
+
},
|
|
18
|
+
});
|
|
19
|
+
// Get all variants for these products with extended variant data and existing options
|
|
20
|
+
const { data: variants } = await query.graph({
|
|
21
|
+
entity: "product_variant",
|
|
22
|
+
fields: [
|
|
23
|
+
"id",
|
|
24
|
+
"product_id",
|
|
25
|
+
"extended_variant.id",
|
|
26
|
+
"extended_variant.item_size",
|
|
27
|
+
"extended_variant.party_style_details.*",
|
|
28
|
+
"options.*",
|
|
29
|
+
"options.option.title",
|
|
30
|
+
],
|
|
31
|
+
filters: {
|
|
32
|
+
product_id: input.productIds,
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
// Get extended variant IDs
|
|
36
|
+
const extendedVariantIds = variants
|
|
37
|
+
.map((v) => v.extended_variant?.id)
|
|
38
|
+
.filter(Boolean);
|
|
39
|
+
// Get extended variants with party_style_details
|
|
40
|
+
const { data: extendedVariants } = await query.graph({
|
|
41
|
+
entity: "extended_variant",
|
|
42
|
+
fields: ["id", "item_size", "stock_type", "party_style_details.*"],
|
|
43
|
+
filters: {
|
|
44
|
+
id: extendedVariantIds,
|
|
45
|
+
},
|
|
46
|
+
});
|
|
47
|
+
// Load master maps
|
|
48
|
+
const { data: rawMasterArr } = await query.graph({
|
|
49
|
+
entity: "raw_master",
|
|
50
|
+
fields: ["id", "title", "raw_code"],
|
|
51
|
+
});
|
|
52
|
+
const { data: qualityMasterArr } = await query.graph({
|
|
53
|
+
entity: "quality_master",
|
|
54
|
+
fields: ["id", "title", "qly_code"],
|
|
55
|
+
});
|
|
56
|
+
const { data: toneMasterArr } = await query.graph({
|
|
57
|
+
entity: "tone_master",
|
|
58
|
+
fields: ["id", "title", "tone_code"],
|
|
59
|
+
});
|
|
60
|
+
const { data: itemSizeMasterArr } = await query.graph({
|
|
61
|
+
entity: "item_size_master",
|
|
62
|
+
fields: ["id", "title", "item_size_code"],
|
|
63
|
+
});
|
|
64
|
+
const { data: shapeMasterArr } = await query.graph({
|
|
65
|
+
entity: "shape_master",
|
|
66
|
+
fields: ["id", "title", "shape_code"],
|
|
67
|
+
});
|
|
68
|
+
const rawMasterMap = new Map();
|
|
69
|
+
rawMasterArr?.forEach((x) => rawMasterMap.set(x.raw_code, x.title));
|
|
70
|
+
const qualityMasterMap = new Map();
|
|
71
|
+
qualityMasterArr?.forEach((x) => qualityMasterMap.set(x.qly_code, x.title));
|
|
72
|
+
const toneMasterMap = new Map();
|
|
73
|
+
toneMasterArr?.forEach((x) => toneMasterMap.set(x.tone_code, x.title));
|
|
74
|
+
const itemSizeMasterMap = new Map();
|
|
75
|
+
itemSizeMasterArr?.forEach((x) => itemSizeMasterMap.set(x.item_size_code, x.title));
|
|
76
|
+
const shapeMasterMap = new Map();
|
|
77
|
+
shapeMasterArr?.forEach((x) => shapeMasterMap.set(x.shape_code, x.title));
|
|
78
|
+
const masterMaps = {
|
|
79
|
+
rawMasterMap,
|
|
80
|
+
qualityMasterMap,
|
|
81
|
+
toneMasterMap,
|
|
82
|
+
itemSizeMasterMap,
|
|
83
|
+
shapeMasterMap,
|
|
84
|
+
};
|
|
85
|
+
// Recalculate variant options from extended variant data
|
|
86
|
+
const variantsToUpdate = [];
|
|
87
|
+
const productOptionsMap = new Map();
|
|
88
|
+
// Track raw values for metadata updates
|
|
89
|
+
const rawValueMappings = [];
|
|
90
|
+
for (const variant of variants) {
|
|
91
|
+
const productId = variant.product_id;
|
|
92
|
+
if (!productId)
|
|
93
|
+
continue;
|
|
94
|
+
const product = products?.find((p) => p.id === productId);
|
|
95
|
+
const extendedVariant = extendedVariants?.find((ev) => ev.id === variant.extended_variant?.id);
|
|
96
|
+
if (!product || !extendedVariant)
|
|
97
|
+
continue;
|
|
98
|
+
// Initialize product options map if not exists
|
|
99
|
+
if (!productOptionsMap.has(productId)) {
|
|
100
|
+
productOptionsMap.set(productId, new Map());
|
|
101
|
+
}
|
|
102
|
+
const productOptionMap = productOptionsMap.get(productId);
|
|
103
|
+
// Start with existing variant options to ensure all product options are represented
|
|
104
|
+
const variantOptions = {};
|
|
105
|
+
if (variant.options) {
|
|
106
|
+
for (const optionValue of variant.options) {
|
|
107
|
+
const optionTitle = optionValue.option?.title;
|
|
108
|
+
const optionValueStr = optionValue.value;
|
|
109
|
+
if (optionTitle && optionValueStr) {
|
|
110
|
+
variantOptions[optionTitle] = optionValueStr;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
// Now update/override with new values from extended variant data
|
|
115
|
+
// Detect solitaire styles based on stock_type
|
|
116
|
+
const stockType = extendedVariant
|
|
117
|
+
?.stock_type;
|
|
118
|
+
const isSolitaire = stockType === "LG SOLITAIRE" || stockType === "SOLITAIRE";
|
|
119
|
+
// Size
|
|
120
|
+
if (extendedVariant.item_size) {
|
|
121
|
+
const sizeTitle = (masterMaps.itemSizeMasterMap.get(extendedVariant.item_size) ||
|
|
122
|
+
String(extendedVariant.item_size)).trim();
|
|
123
|
+
const sizeOption = product.options?.find((opt) => opt.title === "Size");
|
|
124
|
+
if (sizeOption) {
|
|
125
|
+
variantOptions["Size"] = sizeTitle;
|
|
126
|
+
if (!productOptionMap.has("Size")) {
|
|
127
|
+
productOptionMap.set("Size", new Set());
|
|
128
|
+
}
|
|
129
|
+
productOptionMap.get("Size").add(sizeTitle);
|
|
130
|
+
// Track raw value for metadata
|
|
131
|
+
rawValueMappings.push({
|
|
132
|
+
variantId: variant.id,
|
|
133
|
+
optionTitle: "Size",
|
|
134
|
+
optionValue: sizeTitle,
|
|
135
|
+
rawValue: extendedVariant.item_size,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
// Process party_style_details for metals, metal colors, diamond qualities, shapes and solitaire carat
|
|
140
|
+
if (extendedVariant.party_style_details) {
|
|
141
|
+
// First, find diamond details for processing
|
|
142
|
+
const diamondDetails = extendedVariant.party_style_details.filter((detail) => detail.raw_type === "Diamond" &&
|
|
143
|
+
detail.tone_code &&
|
|
144
|
+
detail.qly_code);
|
|
145
|
+
const baseDiamondDetail = diamondDetails.find((detail) => detail.is_base);
|
|
146
|
+
const diamondDetailToUse = baseDiamondDetail || diamondDetails[0];
|
|
147
|
+
// For solitaire shapes/carat, find LGS diamond details
|
|
148
|
+
const lgsDiamondDetails = extendedVariant.party_style_details.filter((detail) => isSolitaire &&
|
|
149
|
+
detail.raw_type === "Diamond" &&
|
|
150
|
+
detail.raw_code === "LGS");
|
|
151
|
+
const baseLgsDiamondDetail = lgsDiamondDetails.find((detail) => detail.is_base);
|
|
152
|
+
const lgsDiamondDetailToUse = baseLgsDiamondDetail || lgsDiamondDetails[0];
|
|
153
|
+
for (const detail of extendedVariant.party_style_details) {
|
|
154
|
+
// Metal options
|
|
155
|
+
if (detail.raw_type === "Metal" && detail.is_base) {
|
|
156
|
+
const qualityTitle = (masterMaps.qualityMasterMap.get(detail.qly_code) ||
|
|
157
|
+
detail.qly_code).trim();
|
|
158
|
+
const rawTitle = (masterMaps.rawMasterMap.get(detail.raw_code) || detail.raw_code).trim();
|
|
159
|
+
const metalValue = `${qualityTitle} ${rawTitle}`.trim();
|
|
160
|
+
const metalOption = product.options?.find((opt) => opt.title === "Metal");
|
|
161
|
+
if (metalOption && metalValue) {
|
|
162
|
+
variantOptions["Metal"] = metalValue;
|
|
163
|
+
if (!productOptionMap.has("Metal")) {
|
|
164
|
+
productOptionMap.set("Metal", new Set());
|
|
165
|
+
}
|
|
166
|
+
productOptionMap.get("Metal").add(metalValue);
|
|
167
|
+
// Track raw values for metadata (combine raw_code and qly_code)
|
|
168
|
+
rawValueMappings.push({
|
|
169
|
+
variantId: variant.id,
|
|
170
|
+
optionTitle: "Metal",
|
|
171
|
+
optionValue: metalValue,
|
|
172
|
+
rawValue: `${detail.qly_code || ""}:${detail.raw_code || ""}`.trim(),
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
// Metal Color
|
|
176
|
+
if (detail.tone_code) {
|
|
177
|
+
let colorTitle = masterMaps.toneMasterMap.get(detail.tone_code) ||
|
|
178
|
+
detail.tone_code;
|
|
179
|
+
// Fallback to static mappings if not in master
|
|
180
|
+
if (!masterMaps.toneMasterMap.has(detail.tone_code)) {
|
|
181
|
+
if (detail.tone_code === "R")
|
|
182
|
+
colorTitle = "Rose";
|
|
183
|
+
else if (detail.tone_code === "Y")
|
|
184
|
+
colorTitle = "Yellow";
|
|
185
|
+
else if (detail.tone_code === "W")
|
|
186
|
+
colorTitle = "White";
|
|
187
|
+
else if (detail.tone_code === "YRW")
|
|
188
|
+
colorTitle = "YELLOW/ROSE/WHITE";
|
|
189
|
+
else if (detail.tone_code === "YW")
|
|
190
|
+
colorTitle = "YELLOW/WHITE";
|
|
191
|
+
else if (detail.tone_code === "RW")
|
|
192
|
+
colorTitle = "ROSE/WHITE";
|
|
193
|
+
else if (detail.tone_code === "BU")
|
|
194
|
+
colorTitle = "BLUE";
|
|
195
|
+
else if (detail.tone_code === "BL")
|
|
196
|
+
colorTitle = "BLACK";
|
|
197
|
+
}
|
|
198
|
+
colorTitle = colorTitle.trim();
|
|
199
|
+
const metalColorOption = product.options?.find((opt) => opt.title === "Metal Color");
|
|
200
|
+
if (metalColorOption && colorTitle) {
|
|
201
|
+
variantOptions["Metal Color"] = colorTitle;
|
|
202
|
+
if (!productOptionMap.has("Metal Color")) {
|
|
203
|
+
productOptionMap.set("Metal Color", new Set());
|
|
204
|
+
}
|
|
205
|
+
productOptionMap.get("Metal Color").add(colorTitle);
|
|
206
|
+
// Track raw value for metadata
|
|
207
|
+
rawValueMappings.push({
|
|
208
|
+
variantId: variant.id,
|
|
209
|
+
optionTitle: "Metal Color",
|
|
210
|
+
optionValue: colorTitle,
|
|
211
|
+
rawValue: detail.tone_code || "",
|
|
212
|
+
});
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
// Diamond Quality
|
|
217
|
+
if (diamondDetailToUse &&
|
|
218
|
+
detail === diamondDetailToUse) {
|
|
219
|
+
const toneTitle = (masterMaps.toneMasterMap.get(detail.tone_code) ||
|
|
220
|
+
detail.tone_code).trim();
|
|
221
|
+
const qualityTitle = (masterMaps.qualityMasterMap.get(detail.qly_code) ||
|
|
222
|
+
detail.qly_code).trim();
|
|
223
|
+
const diamondValue = `${toneTitle} ${qualityTitle}`.trim();
|
|
224
|
+
const diamondOption = product.options?.find((opt) => opt.title === "Diamond Quality");
|
|
225
|
+
if (diamondOption && diamondValue && toneTitle && qualityTitle) {
|
|
226
|
+
variantOptions["Diamond Quality"] = diamondValue;
|
|
227
|
+
if (!productOptionMap.has("Diamond Quality")) {
|
|
228
|
+
productOptionMap.set("Diamond Quality", new Set());
|
|
229
|
+
}
|
|
230
|
+
productOptionMap.get("Diamond Quality").add(diamondValue);
|
|
231
|
+
// Track raw values for metadata (combine tone_code and qly_code)
|
|
232
|
+
rawValueMappings.push({
|
|
233
|
+
variantId: variant.id,
|
|
234
|
+
optionTitle: "Diamond Quality",
|
|
235
|
+
optionValue: diamondValue,
|
|
236
|
+
rawValue: `${detail.tone_code || ""}:${detail.qly_code || ""}`.trim(),
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
// Shape and Carat logic aligned with helper
|
|
241
|
+
if (lgsDiamondDetailToUse &&
|
|
242
|
+
detail === lgsDiamondDetailToUse) {
|
|
243
|
+
const shapeTitle = (masterMaps.shapeMasterMap.get(detail.shape_code) ||
|
|
244
|
+
String(detail.shape_code || "")).trim();
|
|
245
|
+
if (shapeTitle) {
|
|
246
|
+
const shapeOption = product.options?.find((opt) => opt.title === "Shape");
|
|
247
|
+
if (shapeOption) {
|
|
248
|
+
variantOptions["Shape"] = shapeTitle;
|
|
249
|
+
if (!productOptionMap.has("Shape")) {
|
|
250
|
+
productOptionMap.set("Shape", new Set());
|
|
251
|
+
}
|
|
252
|
+
productOptionMap.get("Shape").add(shapeTitle);
|
|
253
|
+
// Track raw value for metadata
|
|
254
|
+
rawValueMappings.push({
|
|
255
|
+
variantId: variant.id,
|
|
256
|
+
optionTitle: "Shape",
|
|
257
|
+
optionValue: shapeTitle,
|
|
258
|
+
rawValue: detail.shape_code || "",
|
|
259
|
+
});
|
|
260
|
+
}
|
|
261
|
+
}
|
|
262
|
+
const weightStr = String(detail?.weight || "").trim();
|
|
263
|
+
if (weightStr) {
|
|
264
|
+
variantOptions["Carat"] = weightStr;
|
|
265
|
+
if (!productOptionMap.has("Carat")) {
|
|
266
|
+
productOptionMap.set("Carat", new Set());
|
|
267
|
+
}
|
|
268
|
+
productOptionMap.get("Carat").add(weightStr);
|
|
269
|
+
// Track raw value for metadata (weight is already the raw value)
|
|
270
|
+
rawValueMappings.push({
|
|
271
|
+
variantId: variant.id,
|
|
272
|
+
optionTitle: "Carat",
|
|
273
|
+
optionValue: weightStr,
|
|
274
|
+
rawValue: weightStr,
|
|
275
|
+
});
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
// Ensure all product options are present in variant options
|
|
281
|
+
// MedusaJS requires all product options to have values when updating variants
|
|
282
|
+
if (product.options && product.options.length > 0) {
|
|
283
|
+
for (const productOption of product.options) {
|
|
284
|
+
const optionTitle = productOption.title;
|
|
285
|
+
if (optionTitle && !variantOptions[optionTitle]) {
|
|
286
|
+
// If option is missing, log a warning
|
|
287
|
+
// The existing options should have been preserved above, but if still missing,
|
|
288
|
+
// this variant might be in an invalid state
|
|
289
|
+
console.warn(`Variant ${variant.id} is missing option "${optionTitle}" for product ${productId}. This may cause update to fail.`);
|
|
290
|
+
}
|
|
291
|
+
}
|
|
292
|
+
}
|
|
293
|
+
// Ensure variant options keys are in a consistent alphabetical order
|
|
294
|
+
// Filter out any undefined, null, or empty string values
|
|
295
|
+
const sortedVariantOptions = {};
|
|
296
|
+
const sortedKeys = Object.keys(variantOptions).sort((a, b) => a.localeCompare(b));
|
|
297
|
+
for (const key of sortedKeys) {
|
|
298
|
+
const value = variantOptions[key];
|
|
299
|
+
// Only include non-empty, non-undefined, non-null values
|
|
300
|
+
if (value && typeof value === "string" && value.trim().length > 0) {
|
|
301
|
+
sortedVariantOptions[key] = value.trim();
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
// Only add variant if it has at least one option value
|
|
305
|
+
// and validate that all required product options are present
|
|
306
|
+
const hasAllRequiredOptions = !product.options ||
|
|
307
|
+
product.options.length === 0 ||
|
|
308
|
+
product.options.every((opt) => !opt.title || sortedVariantOptions[opt.title]);
|
|
309
|
+
if (hasAllRequiredOptions && Object.keys(sortedVariantOptions).length > 0) {
|
|
310
|
+
variantsToUpdate.push({
|
|
311
|
+
variant: {
|
|
312
|
+
id: variant.id,
|
|
313
|
+
options: sortedVariantOptions,
|
|
314
|
+
},
|
|
315
|
+
});
|
|
316
|
+
}
|
|
317
|
+
else {
|
|
318
|
+
console.warn(`Skipping variant ${variant.id} - missing required options. Product has ${product.options?.length || 0} options, variant has ${Object.keys(sortedVariantOptions).length} options.`);
|
|
319
|
+
}
|
|
320
|
+
}
|
|
321
|
+
// STEP 1: Update products FIRST with all option values that will be used
|
|
322
|
+
// This ensures option values exist before assigning them to variants
|
|
323
|
+
const productsToUpdate = Array.from(productOptionsMap.entries()).map(([productId, optionsMap]) => {
|
|
324
|
+
const options = Array.from(optionsMap.entries())
|
|
325
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
326
|
+
.map(([title, values]) => ({
|
|
327
|
+
title,
|
|
328
|
+
values: Array.from(values).sort((x, y) => x.localeCompare(y)),
|
|
329
|
+
}));
|
|
330
|
+
return {
|
|
331
|
+
id: productId,
|
|
332
|
+
options,
|
|
333
|
+
};
|
|
334
|
+
});
|
|
335
|
+
if (productsToUpdate.length > 0) {
|
|
336
|
+
await (0, core_flows_1.updateProductsWorkflow)(container).run({
|
|
337
|
+
input: {
|
|
338
|
+
products: productsToUpdate,
|
|
339
|
+
},
|
|
340
|
+
});
|
|
341
|
+
}
|
|
342
|
+
// STEP 2: Update variants with recalculated options (now that product options exist)
|
|
343
|
+
if (variantsToUpdate.length > 0) {
|
|
344
|
+
console.log(`Updating ${variantsToUpdate.length} variants with recalculated options`);
|
|
345
|
+
// Validate all variants have all required options before updating
|
|
346
|
+
const validatedVariants = variantsToUpdate.filter((v) => {
|
|
347
|
+
const variant = v.variant;
|
|
348
|
+
const variantData = variants.find((variantData) => variantData.id === variant.id);
|
|
349
|
+
const product = variantData ? products?.find((p) => p.id === variantData.product_id) : null;
|
|
350
|
+
if (!product || !product.options)
|
|
351
|
+
return true; // Can't validate, allow through
|
|
352
|
+
const requiredOptions = product.options.map((opt) => opt.title).filter(Boolean);
|
|
353
|
+
const providedOptions = Object.keys(variant.options || {});
|
|
354
|
+
// Check if all required options are present and have non-empty values
|
|
355
|
+
const hasAllOptions = requiredOptions.every((optTitle) => providedOptions.includes(optTitle) &&
|
|
356
|
+
variant.options[optTitle] &&
|
|
357
|
+
typeof variant.options[optTitle] === "string" &&
|
|
358
|
+
variant.options[optTitle].trim().length > 0);
|
|
359
|
+
if (!hasAllOptions) {
|
|
360
|
+
console.warn(`Skipping variant ${variant.id}: Missing required options. Required: ${requiredOptions.join(", ")}, Provided: ${providedOptions.join(", ")}`);
|
|
361
|
+
return false;
|
|
362
|
+
}
|
|
363
|
+
// Check for undefined values
|
|
364
|
+
const hasUndefinedValues = Object.values(variant.options || {}).some((val) => val === undefined || val === null);
|
|
365
|
+
if (hasUndefinedValues) {
|
|
366
|
+
console.warn(`Skipping variant ${variant.id}: Contains undefined/null option values`);
|
|
367
|
+
return false;
|
|
368
|
+
}
|
|
369
|
+
return true;
|
|
370
|
+
});
|
|
371
|
+
if (validatedVariants.length === 0) {
|
|
372
|
+
console.warn("No valid variants to update after validation");
|
|
373
|
+
return new workflows_sdk_1.StepResponse([]);
|
|
374
|
+
}
|
|
375
|
+
if (validatedVariants.length < variantsToUpdate.length) {
|
|
376
|
+
console.warn(`Filtered out ${variantsToUpdate.length - validatedVariants.length} invalid variants`);
|
|
377
|
+
}
|
|
378
|
+
await (0, core_flows_1.updateProductVariantsWorkflow)(container).run({
|
|
379
|
+
input: {
|
|
380
|
+
product_variants: validatedVariants.map((v) => v.variant),
|
|
381
|
+
},
|
|
382
|
+
});
|
|
383
|
+
// Update variant option metadata with raw values
|
|
384
|
+
if (rawValueMappings.length > 0) {
|
|
385
|
+
console.log(`Updating metadata for ${rawValueMappings.length} variant options with raw values`);
|
|
386
|
+
await (0, update_variant_option_metadata_1.updateVariantOptionMetadata)(container, rawValueMappings);
|
|
387
|
+
}
|
|
388
|
+
}
|
|
389
|
+
// STEP 3: Recalculate product options from all updated variants to ensure consistency
|
|
390
|
+
// Get all variants again after update to collect latest option values
|
|
391
|
+
const { data: updatedVariants } = await query.graph({
|
|
392
|
+
entity: "product_variant",
|
|
393
|
+
fields: ["id", "product_id", "options.*", "options.option.title"],
|
|
394
|
+
filters: {
|
|
395
|
+
product_id: input.productIds,
|
|
396
|
+
},
|
|
397
|
+
});
|
|
398
|
+
// Group options by product_id, then by title within each product
|
|
399
|
+
const finalProductOptionsMap = new Map();
|
|
400
|
+
updatedVariants.forEach((variant) => {
|
|
401
|
+
const productId = variant.product_id;
|
|
402
|
+
if (!productId)
|
|
403
|
+
return;
|
|
404
|
+
if (!finalProductOptionsMap.has(productId)) {
|
|
405
|
+
finalProductOptionsMap.set(productId, new Map());
|
|
406
|
+
}
|
|
407
|
+
const optionsMap = finalProductOptionsMap.get(productId);
|
|
408
|
+
variant.options?.forEach((optionValue) => {
|
|
409
|
+
const title = optionValue.option?.title;
|
|
410
|
+
const value = optionValue.value;
|
|
411
|
+
if (title && value) {
|
|
412
|
+
if (!optionsMap.has(title)) {
|
|
413
|
+
optionsMap.set(title, new Set());
|
|
414
|
+
}
|
|
415
|
+
optionsMap.get(title).add(value);
|
|
416
|
+
}
|
|
417
|
+
});
|
|
418
|
+
});
|
|
419
|
+
// Convert to products array format for final update
|
|
420
|
+
const finalProductsToUpdate = Array.from(finalProductOptionsMap.entries()).map(([productId, optionsMap]) => {
|
|
421
|
+
const options = Array.from(optionsMap.entries())
|
|
422
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
423
|
+
.map(([title, values]) => ({
|
|
424
|
+
title,
|
|
425
|
+
values: Array.from(values).sort((x, y) => x.localeCompare(y)),
|
|
426
|
+
}));
|
|
427
|
+
return {
|
|
428
|
+
id: productId,
|
|
429
|
+
options,
|
|
430
|
+
};
|
|
431
|
+
});
|
|
432
|
+
// Final update of products with all option values from updated variants
|
|
433
|
+
if (finalProductsToUpdate.length > 0) {
|
|
434
|
+
await (0, core_flows_1.updateProductsWorkflow)(container).run({
|
|
435
|
+
input: {
|
|
436
|
+
products: finalProductsToUpdate,
|
|
437
|
+
},
|
|
438
|
+
});
|
|
439
|
+
}
|
|
440
|
+
return new workflows_sdk_1.StepResponse(finalProductsToUpdate);
|
|
441
|
+
}
|
|
442
|
+
catch (error) {
|
|
443
|
+
console.error("Error updating product options after variant update:", error);
|
|
444
|
+
throw error;
|
|
445
|
+
}
|
|
446
|
+
});
|
|
447
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"update-product-options-after-variant-update.js","sourceRoot":"","sources":["../../../../../../src/workflows/party-style-master/steps/update-product-options-after-variant-update.ts"],"names":[],"mappings":"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"}
|