@jytextiles/medusa-plugin-faire-store-sync 0.2.5 → 0.2.7

package/.medusa/server/src/workflows/sync-product-to-faire.js

@@ -16,6 +16,27 @@ const productDisplayUrl = (product) => {
         return null;
     return `https://www.faire.com/brand/products/${product.product_token}`;
 };
+/**
+ * Faire variant prices are geo-scoped (`geo_constraint`). Derive a sensible
+ * default from the brand's currency (and country when known). Eurozone brands
+ * map to the EUROPEAN_UNION country_group; otherwise scope to a single country.
+ */
+const geoForCurrency = (currency, country) => {
+    switch (currency) {
+        case "EUR":
+            return { country_group: "EUROPEAN_UNION" };
+        case "GBP":
+            return { country: "GB" };
+        case "USD":
+            return { country: "US" };
+        case "CAD":
+            return { country: "CA" };
+        case "AUD":
+            return { country: "AU" };
+        default:
+            return country ? { country } : { country_group: "EUROPEAN_UNION" };
+    }
+};
 // ── Step 1: resolve account (fresh token) + settings ─────────────────────
 const resolveFaireConfigStep = (0, workflows_sdk_1.createStep)("faire-resolve-config-step", async (_, { container }) => {
     const service = container.resolve(faire_sync_1.FAIRE_SYNC_MODULE);
@@ -27,6 +48,7 @@ const resolveFaireConfigStep = (0, workflows_sdk_1.createStep)("faire-resolve-co
         access_token: account.access_token,
         auth_mode: account.auth_mode ?? "oauth",
         currency: account.currency ?? null,
+        country: account.country ?? null,
         settings,
     });
 });
@@ -46,6 +68,8 @@ const prepareProductStep = (0, workflows_sdk_1.createStep)("faire-prepare-produc
             "tags.*",
             "variants.*",
             "variants.prices.*",
+            "variants.options.*",
+            "variants.options.option.*",
             "variants.inventory_items.*",
             "images.*",
             "variants.sku",
@@ -54,7 +78,7 @@ const prepareProductStep = (0, workflows_sdk_1.createStep)("faire-prepare-produc
     });
     const product = products?.[0];
     if (!product) {
-        throw new Error(`Product ${input.product_id} not found`);
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `Product ${input.product_id} not found`);
     }
     // Resolve existing Faire product (from link)
     let existing_product_token = null;
@@ -75,53 +99,94 @@ const prepareProductStep = (0, workflows_sdk_1.createStep)("faire-prepare-produc
     const settings = input.settings;
     const metadata = product.metadata || {};
     const variants = product.variants || [];
-    // Medusa v2 stores money as a whole decimal in the price's currency (NOT
-    // minor units). Faire wants integer cents, so round to cents.
-    const toCents = (amount) => Math.round(Number(amount || 0) * 100);
+    // ── Currency + geo constraint (Faire prices are geo-scoped) ────────────
+    // Prefer the brand's own currency; fall back to the price currency Medusa
+    // stored, then EUR. Currency picks the price row + drives the geo default.
+    const currency = String(metadata.faire_currency ||
+        input.currency ||
+        (variants.flatMap((v) => v.prices || [])[0]?.currency_code ?? "EUR")).toUpperCase();
+    const geoConstraint = metadata.faire_geo_constraint && typeof metadata.faire_geo_constraint === "object"
+        ? metadata.faire_geo_constraint
+        : geoForCurrency(currency, input.country);
+    // Medusa v2 stores money as a whole decimal in the price's currency; Faire
+    // wants integer minor units (cents), so round.
+    const toMinor = (amount) => Math.round(Number(amount || 0) * 100);
     const markupPercent = Number(metadata.faire_wholesale_markup_percent ?? settings.default_wholesale_markup_percent) ||
         0;
-    const buildVariant = (v) => {
-        const prices = v.prices || [];
-        const retail = prices[0] ?? prices.find(Boolean);
-        const retailCents = retail ? toCents(retail.amount) : 0;
-        const wholesaleCents = markupPercent > 0
-            ? Math.round((retailCents * (100 - markupPercent)) / 100)
-            : retailCents;
+    // Pick the price row matching the chosen currency (fall back to first).
+    const pickPrice = (prices) => prices.find((p) => String(p.currency_code || "").toUpperCase() === currency) ??
+        prices[0] ??
+        null;
+    const buildVariant = (v, idx) => {
+        const retail = pickPrice(v.prices || []);
+        const retailMinor = retail ? toMinor(retail.amount) : 0;
+        const wholesaleMinor = markupPercent > 0
+            ? Math.round((retailMinor * (100 - markupPercent)) / 100)
+            : retailMinor;
+        const sku = v.sku || v.id;
+        const options = (v.options || [])
+            .map((o) => ({
+            name: String(o.option?.title || o.title || "Option"),
+            value: String(o.value ?? ""),
+        }))
+            .filter((o) => o.value) || [];
         return {
-            sku: v.sku || v.id,
-            name: v.title || undefined,
-            retail_price_cents: retailCents || undefined,
-            wholesale_price_cents: wholesaleCents || undefined,
-            inventory_count: Number(v.inventory_quantity) || 0,
+            sku,
+            name: v.title || sku,
+            idempotence_token: `${product.id}:${v.id || sku}`,
+            options: options.length ? options : undefined,
+            available_quantity: Number(v.inventory_quantity) || 0,
+            prices: retailMinor > 0
+                ? [
+                    {
+                        geo_constraint: geoConstraint,
+                        wholesale_price: { amount_minor: wholesaleMinor, currency },
+                        retail_price: { amount_minor: retailMinor, currency },
+                    },
+                ]
+                : undefined,
         };
     };
-    // Aggregate retail/wholesale from min-variant for the product-level price.
-    const allPrices = variants.flatMap((v) => v.prices || []);
-    const minRetail = allPrices
-        .map((p) => toCents(p.amount))
-        .filter((a) => a > 0)
-        .sort((a, b) => a - b)[0] ?? 0;
-    const minWholesale = markupPercent > 0
-        ? Math.round((minRetail * (100 - markupPercent)) / 100)
-        : minRetail;
-    const tags = (product.tags || [])
-        .map((t) => t.value)
-        .filter(Boolean);
     const images = (product.images || [])
         .map((img) => ({ url: img.url }))
         .filter((i) => i.url);
+    // Resolve taxonomy_type.id — REQUIRED by Faire create. Priority:
+    //   product.metadata.faire_taxonomy_type_id (tt_… or a category name)
+    //   → settings.default_category (id or name) → error.
+    const client = service.getClient(input.auth_mode);
+    const categoryHint = metadata.faire_taxonomy_type_id ||
+        metadata.faire_category ||
+        settings.default_category ||
+        "";
+    const taxonomyTypeId = await client.resolveTaxonomyTypeId(input.access_token, String(categoryHint));
+    if (!taxonomyTypeId) {
+        throw new utils_1.MedusaError(utils_1.MedusaError.Types.INVALID_DATA, "Faire requires a product category (taxonomy_type). Set a Faire " +
+            "category in sync settings (default_category) or on the product " +
+            "(metadata.faire_taxonomy_type_id — a `tt_…` id or a category name).");
+    }
+    const lifecycle_state = settings.follow_product_status !== false && product.status === "published"
+        ? "PUBLISHED"
+        : "DRAFT";
+    const builtVariants = (variants.length ? variants : [null]).map((v, i) => v
+        ? buildVariant(v, i)
+        : {
+            // Single-variant fallback for products with no explicit variants.
+            sku: product.id,
+            name: product.title || "Default",
+            idempotence_token: `${product.id}:default`,
+            available_quantity: 0,
+        });
     const product_input = {
-        brand_id: input.brand_id,
         name: (product.title || "Untitled Product").slice(0, 140),
+        idempotence_token: product.id,
+        lifecycle_state,
+        taxonomy_type: { id: taxonomyTypeId },
         description: product.description || "",
-        wholesale_price_cents: minWholesale || undefined,
-        retail_price_cents: minRetail || undefined,
-        images,
-        variants: variants.length ? variants.map(buildVariant) : undefined,
-        tags,
         short_description: typeof metadata.faire_short_description === "string"
             ? metadata.faire_short_description
             : undefined,
+        images,
+        variants: builtVariants,
     };
     return new workflows_sdk_1.StepResponse({
         product_id: input.product_id,
@@ -144,9 +209,11 @@ const syncProductStep = (0, workflows_sdk_1.createStep)("faire-sync-product-step
             product = await client.updateProduct(access_token, existing_product_token, {
                 name: product_input.name,
                 description: product_input.description,
+                short_description: product_input.short_description,
+                lifecycle_state: product_input.lifecycle_state,
+                taxonomy_type: product_input.taxonomy_type,
                 images: product_input.images,
                 variants: product_input.variants,
-                tags: product_input.tags,
             });
         }
         else {
@@ -163,7 +230,7 @@ const syncProductStep = (0, workflows_sdk_1.createStep)("faire-sync-product-step
         try {
             const levels = product_input.variants.map((v) => ({
                 sku: v.sku,
-                current_count: v.inventory_count ?? 0,
+                on_hand_quantity: v.available_quantity ?? 0,
             }));
             await client.updateInventory(access_token, levels);
         }
@@ -242,6 +309,10 @@ exports.syncProductToFaireWorkflow = (0, workflows_sdk_1.createWorkflow)(exports
         product_id: data.input.product_id,
         settings: data.config.settings,
         brand_id: data.config.brand_id,
+        currency: data.config.currency,
+        country: data.config.country,
+        access_token: data.config.access_token,
+        auth_mode: data.config.auth_mode,
     })));
     const result = syncProductStep((0, workflows_sdk_1.transform)({ config, prepared }, (data) => ({
         config: data.config,
@@ -260,4 +331,4 @@ exports.syncProductToFaireWorkflow = (0, workflows_sdk_1.createWorkflow)(exports
         warnings: result.warnings,
     });
 });
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-product-to-faire.js","sourceRoot":"","sources":["../../../../src/workflows/sync-product-to-faire.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-product-to-faire.js","sourceRoot":"","sources":["../../../../src/workflows/sync-product-to-faire.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jytextiles/medusa-plugin-faire-store-sync",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/__tests__/faire-client.spec.ts

@@ -15,6 +15,15 @@ const fetchMock = jest.fn(async (url: string, init: any) => {
   } as any
 })
 
+// Shared taxonomy types fixture (matches the shape Faire returns).
+const taxonomyTypes = [
+  { id: "tt_1", name: "Apparel" },
+  { id: "tt_2", name: "Accessories" },
+  { id: "tt_3", name: "Home & Living" },
+  { id: "tt_4", name: "Dresses" },
+  { id: "tt_5", name: "Address Book" },
+]
+
 ;(global as any).fetch = fetchMock
 
 const oauthOpts = {
@@ -30,7 +39,7 @@ describe("FaireClient — issue #952 corrections", () => {
   it("uses the verified base / auth / token URLs by default", () => {
     const c = new FaireClient({})
     // defaults are exported from types and consumed verbatim
-    expect(DEFAULT_API_BASE).toBe("https://faire.com/external-api/v2")
+    expect(DEFAULT_API_BASE).toBe("https://www.faire.com/external-api/v2")
     expect(DEFAULT_AUTH_URL).toBe("https://faire.com/oauth2/authorize")
     expect(DEFAULT_TOKEN_URL).toBe("https://www.faire.com/api/external-api-oauth2/token")
   })
@@ -94,23 +103,45 @@ describe("FaireClient — issue #952 corrections", () => {
 
   it("pushes inventory via PATCH /product-inventory/by-skus (not GET /inventory)", async () => {
     const c = new FaireClient(oauthOpts)
-    await c.updateInventory("t", [{ sku: "S1", current_count: 7 }])
+    await c.updateInventory("t", [{ sku: "S1", on_hand_quantity: 7 }])
     expect(lastInit.method).toBe("PATCH")
     expect(lastUrl).toBe(`${DEFAULT_API_BASE}/product-inventory/by-skus`)
     expect(JSON.parse(lastInit.body)).toEqual({
-      inventories: [{ sku: "S1", current_count: 7 }],
+      inventories: [{ sku: "S1", on_hand_quantity: 7 }],
     })
   })
 
-  it("lists orders with cursor page + updated_at_min", async () => {
+  it("lists orders with numeric page + updated_at_min", async () => {
     const c = new FaireClient(oauthOpts)
-    await c.listOrders("t", { page: "cursor-xyz", updated_at_min: "2026-01-01T00:00:00Z" })
+    await c.listOrders("t", { page: "2", updated_at_min: "2026-01-01T00:00:00Z" })
     const url = new URL(lastUrl)
     expect(url.pathname).toBe("/external-api/v2/orders")
-    expect(url.searchParams.get("page")).toBe("cursor-xyz")
+    expect(url.searchParams.get("page")).toBe("2")
     expect(url.searchParams.get("updated_at_min")).toBe("2026-01-01T00:00:00Z")
   })
 
+  it("derives next_page from numeric page (Faire returns no cursor)", async () => {
+    const c = new FaireClient(oauthOpts)
+    const page = (rows: number) => ({
+      ok: true,
+      status: 200,
+      headers: new Map(),
+      text: async () =>
+        JSON.stringify({
+          page: undefined,
+          orders: Array.from({ length: rows }, (_, i) => ({ id: `bo_${i}` })),
+        }),
+    })
+    // A full page (rows === limit) → there may be more → next_page = current+1.
+    fetchMock.mockImplementationOnce(async () => page(2) as any)
+    const full = await c.listOrders("t", { limit: 2, page: "1" })
+    expect(full.next_page).toBe("2")
+    // A short page → last page → no next_page.
+    fetchMock.mockImplementationOnce(async () => page(1) as any)
+    const short = await c.listOrders("t", { limit: 2, page: "2" })
+    expect(short.next_page).toBeUndefined()
+  })
+
   it("posts order processing (PUT) and shipments (POST) on the right paths", async () => {
     const c = new FaireClient(oauthOpts)
     await c.setOrderProcessing("t", "o_1", { accepted: true })
@@ -136,3 +167,101 @@ describe("FaireClient — issue #952 corrections", () => {
     })
   })
 })
+
+describe("FaireClient.resolveTaxonomyTypeId", () => {
+  beforeEach(() => {
+    fetchMock.mockClear()
+    // Reset the cache on each test by creating a fresh client.
+  })
+
+  it("passes a tt_ id straight through without an API call", async () => {
+    const c = new FaireClient(oauthOpts)
+    const result = await c.resolveTaxonomyTypeId("tok", "tt_abc123")
+    expect(result).toBe("tt_abc123")
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
+  it("returns null for empty / falsy input", async () => {
+    const c = new FaireClient(oauthOpts)
+    await expect(c.resolveTaxonomyTypeId("tok", "")).resolves.toBeNull()
+    await expect(c.resolveTaxonomyTypeId("tok", "")).resolves.toBeNull()
+    expect(fetchMock).not.toHaveBeenCalled()
+  })
+
+  it("fetches taxonomy types on first call, caches, and resolves by exact name", async () => {
+    fetchMock.mockImplementationOnce(async () => ({
+      ok: true,
+      status: 200,
+      headers: new Map(),
+      text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
+    } as any))
+    const c = new FaireClient(oauthOpts)
+    const result = await c.resolveTaxonomyTypeId("tok", "Dresses")
+    expect(result).toBe("tt_4")
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+    const callUrl = fetchMock.mock.calls[0][0] as string
+    expect(callUrl).toContain("/products/types")
+
+    // Second call uses the cache — no additional fetch.
+    const cached = await c.resolveTaxonomyTypeId("tok", "Accessories")
+    expect(cached).toBe("tt_2")
+    expect(fetchMock).toHaveBeenCalledTimes(1)
+  })
+
+  it("prefers whole-word match over loose substring (Dress vs Address Book)", async () => {
+    fetchMock.mockImplementationOnce(async () => ({
+      ok: true,
+      status: 200,
+      headers: new Map(),
+      text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
+    } as any))
+    const c = new FaireClient(oauthOpts)
+    // "Dress" should match "Dresses" (word-boundary) not "Address Book".
+    const result = await c.resolveTaxonomyTypeId("tok", "Dress")
+    expect(result).toBe("tt_4")
+  })
+
+  it("falls back to substring match when whole-word finds nothing", async () => {
+    fetchMock.mockImplementationOnce(async () => ({
+      ok: true,
+      status: 200,
+      headers: new Map(),
+      text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
+    } as any))
+    const c = new FaireClient(oauthOpts)
+    // "ccessori" is not a whole word but a substring of "Accessories".
+    const result = await c.resolveTaxonomyTypeId("tok", "ccessori")
+    expect(result).toBe("tt_2")
+  })
+
+  it("returns null when no taxonomy type matches — the condition that triggers the MedusaError", async () => {
+    fetchMock.mockImplementationOnce(async () => ({
+      ok: true,
+      status: 200,
+      headers: new Map(),
+      text: async () => JSON.stringify({ taxonomy_types: taxonomyTypes }),
+    } as any))
+    const c = new FaireClient(oauthOpts)
+    const result = await c.resolveTaxonomyTypeId("tok", "NonExistentCategory")
+    expect(result).toBeNull()
+  })
+
+  it("handles alternate response shapes (product_types / types / results)", async () => {
+    for (const key of ["product_types", "types", "results"]) {
+      fetchMock.mockImplementationOnce(async () => ({
+        ok: true,
+        status: 200,
+        headers: new Map(),
+        text: async () => JSON.stringify({ [key]: taxonomyTypes }),
+      } as any))
+    }
+    const c = new FaireClient(oauthOpts)
+    // Each call should reset the cache because we used a fresh client.
+    const c1 = new FaireClient(oauthOpts)
+    expect(await c1.resolveTaxonomyTypeId("tok", "Apparel")).toBe("tt_1")
+    const c2 = new FaireClient(oauthOpts)
+    expect(await c2.resolveTaxonomyTypeId("tok", "Accessories")).toBe("tt_2")
+    const c3 = new FaireClient(oauthOpts)
+    expect(await c3.resolveTaxonomyTypeId("tok", "Home & Living")).toBe("tt_3")
+  })
+})

package/src/__tests__/ingest-faire-order-support.spec.ts

@@ -66,6 +66,69 @@ describe("mapFaireOrderToOrder", () => {
     expect(mapped.items).toEqual([])
   })
 
+  it("maps a real ExternalOrderV2 (customer/address/item.price, no top-level total)", () => {
+    const order = {
+      id: "bo_bxdmjbwxid",
+      state: "NEW",
+      customer: { first_name: "John", last_name: "Smith" },
+      address: {
+        name: "John Smith",
+        company_name: "Faire Wholesale, Inc",
+        address1: "41 King Street West",
+        address2: "3rd Floor",
+        city: "Kitchener",
+        state: "Ontario",
+        state_code: "ON",
+        postal_code: "N2G 1A1",
+        country: "Canada",
+        country_code: "CAN",
+        phone_number: "555-123-4567",
+      },
+      items: [
+        {
+          id: "oi_bq425ju5vh",
+          product_id: "p_fccaefnahr",
+          variant_id: "po_3745tjzrpc",
+          sku: "goldenretriever",
+          quantity: 2,
+          product_name: "Golden Dog",
+          price: { amount_minor: 4999, currency: "USD" },
+        },
+      ],
+      payout_costs: { total_payout: { amount_minor: 8000, currency: "USD" } },
+    }
+
+    const mapped = mapFaireOrderToOrder(order)
+
+    expect(mapped.order_token).toBe("bo_bxdmjbwxid")
+    expect(mapped.currency_code).toBe("usd")
+    // no order-level total → sum of line values: 49.99 × 2
+    expect(mapped.total).toBe(99.98)
+    expect(mapped.buyer_name).toBe("John Smith")
+    expect(mapped.shipping_address).toMatchObject({
+      first_name: "John",
+      last_name: "Smith",
+      company: "Faire Wholesale, Inc",
+      address_1: "41 King Street West",
+      address_2: "3rd Floor",
+      city: "Kitchener",
+      province: "ON",
+      postal_code: "N2G 1A1",
+      country_code: "ca", // ISO-3 CAN → ISO-2 ca
+      phone: "555-123-4567",
+    })
+    expect(mapped.items[0]).toMatchObject({
+      title: "Golden Dog",
+      quantity: 2,
+      unit_price: 49.99,
+    })
+    expect(mapped.items[0].metadata).toMatchObject({
+      faire_product_token: "p_fccaefnahr",
+      faire_variant_id: "po_3745tjzrpc",
+      faire_sku: "goldenretriever",
+    })
+  })
+
   it("uses buyer email when provided", () => {
     const mapped = mapFaireOrderToOrder({
       order_token: "o_2",

package/src/admin/lib/api.ts

@@ -84,6 +84,10 @@ export const faireApi = {
   retrySync: (id: string) =>
     sdk.client.fetch(`/admin/faire/syncs/${id}`, { method: "POST" }),
   brand: () => sdk.client.fetch("/admin/faire/brand"),
+  taxonomy: () =>
+    sdk.client.fetch<{ taxonomy: Array<{ id: string; name: string }> }>(
+      "/admin/faire/taxonomy"
+    ),
   products: (opts: { limit?: number; page?: string; updated_at_min?: string } = {}) => {
     const query: Record<string, string> = {}
     if (opts.limit !== undefined) query.limit = String(opts.limit)