@jytextiles/medusa-plugin-faire-store-sync 0.2.5 → 0.2.7
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/__tests__/faire-client.spec.js +124 -7
- package/.medusa/server/src/__tests__/ingest-faire-order-support.spec.js +61 -1
- package/.medusa/server/src/admin/index.js +167 -137
- package/.medusa/server/src/admin/index.mjs +168 -138
- package/.medusa/server/src/api/admin/faire/status/route.js +4 -2
- package/.medusa/server/src/api/admin/faire/taxonomy/route.js +12 -0
- package/.medusa/server/src/lib/faire-client.js +120 -18
- package/.medusa/server/src/lib/types.js +6 -2
- package/.medusa/server/src/modules/faire-sync/service.js +18 -3
- package/.medusa/server/src/workflows/ingest-faire-order-support.js +81 -28
- package/.medusa/server/src/workflows/sync-product-to-faire.js +108 -37
- package/package.json +1 -1
- package/src/__tests__/faire-client.spec.ts +135 -6
- package/src/__tests__/ingest-faire-order-support.spec.ts +63 -0
- package/src/admin/lib/api.ts +4 -0
- package/src/admin/routes/settings/faire/[id]/page.tsx +56 -61
- package/src/admin/routes/settings/faire/settings/page.tsx +62 -13
- package/src/api/admin/faire/status/route.ts +3 -1
- package/src/api/admin/faire/taxonomy/route.ts +10 -0
- package/src/lib/faire-client.ts +139 -16
- package/src/lib/types.ts +57 -18
- package/src/modules/faire-sync/service.ts +23 -2
- package/src/workflows/ingest-faire-order-support.ts +96 -29
- package/src/workflows/sync-product-to-faire.ts +146 -42
|
@@ -15,6 +15,14 @@ const fetchMock = jest.fn(async (url, init) => {
|
|
|
15
15
|
text: async () => JSON.stringify({ access_token: "tok", brand_id: "b_1", name: "Acme" }),
|
|
16
16
|
};
|
|
17
17
|
});
|
|
18
|
+
// Shared taxonomy types fixture (matches the shape Faire returns).
|
|
19
|
+
const taxonomyTypes = [
|
|
20
|
+
{ id: "tt_1", name: "Apparel" },
|
|
21
|
+
{ id: "tt_2", name: "Accessories" },
|
|
22
|
+
{ id: "tt_3", name: "Home & Living" },
|
|
23
|
+
{ id: "tt_4", name: "Dresses" },
|
|
24
|
+
{ id: "tt_5", name: "Address Book" },
|
|
25
|
+
];
|
|
18
26
|
global.fetch = fetchMock;
|
|
19
27
|
const oauthOpts = {
|
|
20
28
|
authMode: "oauth",
|
|
@@ -27,7 +35,7 @@ describe("FaireClient — issue #952 corrections", () => {
|
|
|
27
35
|
it("uses the verified base / auth / token URLs by default", () => {
|
|
28
36
|
const c = new faire_client_1.FaireClient({});
|
|
29
37
|
// defaults are exported from types and consumed verbatim
|
|
30
|
-
expect(types_1.DEFAULT_API_BASE).toBe("https://faire.com/external-api/v2");
|
|
38
|
+
expect(types_1.DEFAULT_API_BASE).toBe("https://www.faire.com/external-api/v2");
|
|
31
39
|
expect(types_1.DEFAULT_AUTH_URL).toBe("https://faire.com/oauth2/authorize");
|
|
32
40
|
expect(types_1.DEFAULT_TOKEN_URL).toBe("https://www.faire.com/api/external-api-oauth2/token");
|
|
33
41
|
});
|
|
@@ -85,21 +93,41 @@ describe("FaireClient — issue #952 corrections", () => {
|
|
|
85
93
|
});
|
|
86
94
|
it("pushes inventory via PATCH /product-inventory/by-skus (not GET /inventory)", async () => {
|
|
87
95
|
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
88
|
-
await c.updateInventory("t", [{ sku: "S1",
|
|
96
|
+
await c.updateInventory("t", [{ sku: "S1", on_hand_quantity: 7 }]);
|
|
89
97
|
expect(lastInit.method).toBe("PATCH");
|
|
90
98
|
expect(lastUrl).toBe(`${types_1.DEFAULT_API_BASE}/product-inventory/by-skus`);
|
|
91
99
|
expect(JSON.parse(lastInit.body)).toEqual({
|
|
92
|
-
inventories: [{ sku: "S1",
|
|
100
|
+
inventories: [{ sku: "S1", on_hand_quantity: 7 }],
|
|
93
101
|
});
|
|
94
102
|
});
|
|
95
|
-
it("lists orders with
|
|
103
|
+
it("lists orders with numeric page + updated_at_min", async () => {
|
|
96
104
|
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
97
|
-
await c.listOrders("t", { page: "
|
|
105
|
+
await c.listOrders("t", { page: "2", updated_at_min: "2026-01-01T00:00:00Z" });
|
|
98
106
|
const url = new URL(lastUrl);
|
|
99
107
|
expect(url.pathname).toBe("/external-api/v2/orders");
|
|
100
|
-
expect(url.searchParams.get("page")).toBe("
|
|
108
|
+
expect(url.searchParams.get("page")).toBe("2");
|
|
101
109
|
expect(url.searchParams.get("updated_at_min")).toBe("2026-01-01T00:00:00Z");
|
|
102
110
|
});
|
|
111
|
+
it("derives next_page from numeric page (Faire returns no cursor)", async () => {
|
|
112
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
113
|
+
const page = (rows) => ({
|
|
114
|
+
ok: true,
|
|
115
|
+
status: 200,
|
|
116
|
+
headers: new Map(),
|
|
117
|
+
text: async () => JSON.stringify({
|
|
118
|
+
page: undefined,
|
|
119
|
+
orders: Array.from({ length: rows }, (_, i) => ({ id: `bo_${i}` })),
|
|
120
|
+
}),
|
|
121
|
+
});
|
|
122
|
+
// A full page (rows === limit) → there may be more → next_page = current+1.
|
|
123
|
+
fetchMock.mockImplementationOnce(async () => page(2));
|
|
124
|
+
const full = await c.listOrders("t", { limit: 2, page: "1" });
|
|
125
|
+
expect(full.next_page).toBe("2");
|
|
126
|
+
// A short page → last page → no next_page.
|
|
127
|
+
fetchMock.mockImplementationOnce(async () => page(1));
|
|
128
|
+
const short = await c.listOrders("t", { limit: 2, page: "2" });
|
|
129
|
+
expect(short.next_page).toBeUndefined();
|
|
130
|
+
});
|
|
103
131
|
it("posts order processing (PUT) and shipments (POST) on the right paths", async () => {
|
|
104
132
|
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
105
133
|
await c.setOrderProcessing("t", "o_1", { accepted: true });
|
|
@@ -123,4 +151,93 @@ describe("FaireClient — issue #952 corrections", () => {
|
|
|
123
151
|
});
|
|
124
152
|
});
|
|
125
153
|
});
|
|
126
|
-
|
|
154
|
+
describe("FaireClient.resolveTaxonomyTypeId", () => {
|
|
155
|
+
beforeEach(() => {
|
|
156
|
+
fetchMock.mockClear();
|
|
157
|
+
// Reset the cache on each test by creating a fresh client.
|
|
158
|
+
});
|
|
159
|
+
it("passes a tt_ id straight through without an API call", async () => {
|
|
160
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
161
|
+
const result = await c.resolveTaxonomyTypeId("tok", "tt_abc123");
|
|
162
|
+
expect(result).toBe("tt_abc123");
|
|
163
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
164
|
+
});
|
|
165
|
+
it("returns null for empty / falsy input", async () => {
|
|
166
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
167
|
+
await expect(c.resolveTaxonomyTypeId("tok", "")).resolves.toBeNull();
|
|
168
|
+
await expect(c.resolveTaxonomyTypeId("tok", "")).resolves.toBeNull();
|
|
169
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
170
|
+
});
|
|
171
|
+
it("fetches taxonomy types on first call, caches, and resolves by exact name", async () => {
|
|
172
|
+
fetchMock.mockImplementationOnce(async () => ({
|
|
173
|
+
ok: true,
|
|
174
|
+
status: 200,
|
|
175
|
+
headers: new Map(),
|
|
176
|
+
text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
|
|
177
|
+
}));
|
|
178
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
179
|
+
const result = await c.resolveTaxonomyTypeId("tok", "Dresses");
|
|
180
|
+
expect(result).toBe("tt_4");
|
|
181
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
182
|
+
const callUrl = fetchMock.mock.calls[0][0];
|
|
183
|
+
expect(callUrl).toContain("/products/types");
|
|
184
|
+
// Second call uses the cache — no additional fetch.
|
|
185
|
+
const cached = await c.resolveTaxonomyTypeId("tok", "Accessories");
|
|
186
|
+
expect(cached).toBe("tt_2");
|
|
187
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
188
|
+
});
|
|
189
|
+
it("prefers whole-word match over loose substring (Dress vs Address Book)", async () => {
|
|
190
|
+
fetchMock.mockImplementationOnce(async () => ({
|
|
191
|
+
ok: true,
|
|
192
|
+
status: 200,
|
|
193
|
+
headers: new Map(),
|
|
194
|
+
text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
|
|
195
|
+
}));
|
|
196
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
197
|
+
// "Dress" should match "Dresses" (word-boundary) not "Address Book".
|
|
198
|
+
const result = await c.resolveTaxonomyTypeId("tok", "Dress");
|
|
199
|
+
expect(result).toBe("tt_4");
|
|
200
|
+
});
|
|
201
|
+
it("falls back to substring match when whole-word finds nothing", async () => {
|
|
202
|
+
fetchMock.mockImplementationOnce(async () => ({
|
|
203
|
+
ok: true,
|
|
204
|
+
status: 200,
|
|
205
|
+
headers: new Map(),
|
|
206
|
+
text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
|
|
207
|
+
}));
|
|
208
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
209
|
+
// "ccessori" is not a whole word but a substring of "Accessories".
|
|
210
|
+
const result = await c.resolveTaxonomyTypeId("tok", "ccessori");
|
|
211
|
+
expect(result).toBe("tt_2");
|
|
212
|
+
});
|
|
213
|
+
it("returns null when no taxonomy type matches — the condition that triggers the MedusaError", async () => {
|
|
214
|
+
fetchMock.mockImplementationOnce(async () => ({
|
|
215
|
+
ok: true,
|
|
216
|
+
status: 200,
|
|
217
|
+
headers: new Map(),
|
|
218
|
+
text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
|
|
219
|
+
}));
|
|
220
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
221
|
+
const result = await c.resolveTaxonomyTypeId("tok", "NonExistentCategory");
|
|
222
|
+
expect(result).toBeNull();
|
|
223
|
+
});
|
|
224
|
+
it("handles alternate response shapes (product_types / types / results)", async () => {
|
|
225
|
+
for (const key of ["product_types", "types", "results"]) {
|
|
226
|
+
fetchMock.mockImplementationOnce(async () => ({
|
|
227
|
+
ok: true,
|
|
228
|
+
status: 200,
|
|
229
|
+
headers: new Map(),
|
|
230
|
+
text: async () => JSON.stringify({ [key]: taxonomyTypes }),
|
|
231
|
+
}));
|
|
232
|
+
}
|
|
233
|
+
const c = new faire_client_1.FaireClient(oauthOpts);
|
|
234
|
+
// Each call should reset the cache because we used a fresh client.
|
|
235
|
+
const c1 = new faire_client_1.FaireClient(oauthOpts);
|
|
236
|
+
expect(await c1.resolveTaxonomyTypeId("tok", "Apparel")).toBe("tt_1");
|
|
237
|
+
const c2 = new faire_client_1.FaireClient(oauthOpts);
|
|
238
|
+
expect(await c2.resolveTaxonomyTypeId("tok", "Accessories")).toBe("tt_2");
|
|
239
|
+
const c3 = new faire_client_1.FaireClient(oauthOpts);
|
|
240
|
+
expect(await c3.resolveTaxonomyTypeId("tok", "Home & Living")).toBe("tt_3");
|
|
241
|
+
});
|
|
242
|
+
});
|
|
243
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"faire-client.spec.js","sourceRoot":"","sources":["../../../../src/__tests__/faire-client.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,66 @@ describe("mapFaireOrderToOrder", () => {
|
|
|
62
62
|
expect(mapped.shipping_address.first_name).toBe("Faire");
|
|
63
63
|
expect(mapped.items).toEqual([]);
|
|
64
64
|
});
|
|
65
|
+
it("maps a real ExternalOrderV2 (customer/address/item.price, no top-level total)", () => {
|
|
66
|
+
const order = {
|
|
67
|
+
id: "bo_bxdmjbwxid",
|
|
68
|
+
state: "NEW",
|
|
69
|
+
customer: { first_name: "John", last_name: "Smith" },
|
|
70
|
+
address: {
|
|
71
|
+
name: "John Smith",
|
|
72
|
+
company_name: "Faire Wholesale, Inc",
|
|
73
|
+
address1: "41 King Street West",
|
|
74
|
+
address2: "3rd Floor",
|
|
75
|
+
city: "Kitchener",
|
|
76
|
+
state: "Ontario",
|
|
77
|
+
state_code: "ON",
|
|
78
|
+
postal_code: "N2G 1A1",
|
|
79
|
+
country: "Canada",
|
|
80
|
+
country_code: "CAN",
|
|
81
|
+
phone_number: "555-123-4567",
|
|
82
|
+
},
|
|
83
|
+
items: [
|
|
84
|
+
{
|
|
85
|
+
id: "oi_bq425ju5vh",
|
|
86
|
+
product_id: "p_fccaefnahr",
|
|
87
|
+
variant_id: "po_3745tjzrpc",
|
|
88
|
+
sku: "goldenretriever",
|
|
89
|
+
quantity: 2,
|
|
90
|
+
product_name: "Golden Dog",
|
|
91
|
+
price: { amount_minor: 4999, currency: "USD" },
|
|
92
|
+
},
|
|
93
|
+
],
|
|
94
|
+
payout_costs: { total_payout: { amount_minor: 8000, currency: "USD" } },
|
|
95
|
+
};
|
|
96
|
+
const mapped = (0, ingest_faire_order_support_1.mapFaireOrderToOrder)(order);
|
|
97
|
+
expect(mapped.order_token).toBe("bo_bxdmjbwxid");
|
|
98
|
+
expect(mapped.currency_code).toBe("usd");
|
|
99
|
+
// no order-level total → sum of line values: 49.99 × 2
|
|
100
|
+
expect(mapped.total).toBe(99.98);
|
|
101
|
+
expect(mapped.buyer_name).toBe("John Smith");
|
|
102
|
+
expect(mapped.shipping_address).toMatchObject({
|
|
103
|
+
first_name: "John",
|
|
104
|
+
last_name: "Smith",
|
|
105
|
+
company: "Faire Wholesale, Inc",
|
|
106
|
+
address_1: "41 King Street West",
|
|
107
|
+
address_2: "3rd Floor",
|
|
108
|
+
city: "Kitchener",
|
|
109
|
+
province: "ON",
|
|
110
|
+
postal_code: "N2G 1A1",
|
|
111
|
+
country_code: "ca", // ISO-3 CAN → ISO-2 ca
|
|
112
|
+
phone: "555-123-4567",
|
|
113
|
+
});
|
|
114
|
+
expect(mapped.items[0]).toMatchObject({
|
|
115
|
+
title: "Golden Dog",
|
|
116
|
+
quantity: 2,
|
|
117
|
+
unit_price: 49.99,
|
|
118
|
+
});
|
|
119
|
+
expect(mapped.items[0].metadata).toMatchObject({
|
|
120
|
+
faire_product_token: "p_fccaefnahr",
|
|
121
|
+
faire_variant_id: "po_3745tjzrpc",
|
|
122
|
+
faire_sku: "goldenretriever",
|
|
123
|
+
});
|
|
124
|
+
});
|
|
65
125
|
it("uses buyer email when provided", () => {
|
|
66
126
|
const mapped = (0, ingest_faire_order_support_1.mapFaireOrderToOrder)({
|
|
67
127
|
order_token: "o_2",
|
|
@@ -71,4 +131,4 @@ describe("mapFaireOrderToOrder", () => {
|
|
|
71
131
|
expect(mapped.email).toBe("retailer@example.com");
|
|
72
132
|
});
|
|
73
133
|
});
|
|
74
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5nZXN0LWZhaXJlLW9yZGVyLXN1cHBvcnQuc3BlYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9fX3Rlc3RzX18vaW5nZXN0LWZhaXJlLW9yZGVyLXN1cHBvcnQuc3BlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHdGQUEwRjtBQUUxRixRQUFRLENBQUMsWUFBWSxFQUFFLEdBQUcsRUFBRTtJQUMxQixFQUFFLENBQUMsK0NBQStDLEVBQUUsR0FBRyxFQUFFO1FBQ3ZELE1BQU0sQ0FBQyxJQUFBLHVDQUFVLEVBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUE7UUFDakMsTUFBTSxDQUFDLElBQUEsdUNBQVUsRUFBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQTtJQUN0QyxDQUFDLENBQUMsQ0FBQTtJQUNGLEVBQUUsQ0FBQyw0QkFBNEIsRUFBRSxHQUFHLEVBQUU7UUFDcEMsTUFBTSxDQUFDLElBQUEsdUNBQVUsRUFBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUNyQyxNQUFNLENBQUMsSUFBQSx1Q0FBVSxFQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2pDLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFDLENBQUE7QUFFRixRQUFRLENBQUMsc0JBQXNCLEVBQUUsR0FBRyxFQUFFO0lBQ3BDLEVBQUUsQ0FBQywyQ0FBMkMsRUFBRSxHQUFHLEVBQUU7UUFDbkQsTUFBTSxLQUFLLEdBQUc7WUFDWixXQUFXLEVBQUUsT0FBTztZQUNwQixRQUFRLEVBQUUsS0FBSztZQUNmLFdBQVcsRUFBRSxJQUFJO1lBQ2pCLFVBQVUsRUFBRSxjQUFjO1lBQzFCLE9BQU8sRUFBRTtnQkFDUCxVQUFVLEVBQUUsS0FBSztnQkFDakIsU0FBUyxFQUFFLFVB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
|