@deenruv/merchant-plugin 1.0.15 → 1.0.17-dev.14

package/dist/plugin-server/services/platform-integration.service.js

@@ -35,6 +35,7 @@ const core_1 = require("@deenruv/core");
 const common_1 = require("@nestjs/common");
 const platform_integration_settings_entity_js_1 = require("../entities/platform-integration-settings.entity.js");
 const facebook_platform_integration_service_js_1 = require("./facebook-platform-integration.service.js");
+const google_merchant_api_js_1 = require("./google-merchant-api.js");
 const google_platform_integration_service_js_1 = require("./google-platform-integration.service.js");
 const merchant_strategy_service_js_1 = require("./merchant-strategy.service.js");
 const BATCH_SIZE = 200;
@@ -127,6 +128,9 @@ let PlatformIntegrationService = class PlatformIntegrationService {
                             else {
                                 this.log("Error sending products to google");
                                 googleResponse = false;
+                                throw response.error instanceof Error
+                                    ? response.error
+                                    : new Error("Google product sync failed");
                             }
                         }
                         if (platform === "facebook") {
@@ -141,6 +145,7 @@ let PlatformIntegrationService = class PlatformIntegrationService {
                             else {
                                 this.log("Error sending products to facebook");
                                 facebookResponse = false;
+                                throw new Error(response.message || "Facebook product sync failed");
                             }
                         }
                         return { status: "SUCCESS", facebookResponse, googleResponse };
@@ -166,33 +171,40 @@ let PlatformIntegrationService = class PlatformIntegrationService {
                 const service = map[platform];
                 if (!service)
                     throw new Error("Unknown platform");
-                const results = await service.getAllProducts(ctx);
+                const remoteProducts = await service.getAllProducts(ctx);
                 const products = [];
-                try {
-                    for (var _d = true, _e = __asyncValues(this.fetchProducts({ ctx, worker: 0 }, (progress) => {
-                        if (job.state === admin_types_1.JobState.CANCELLED) {
-                            throw new Error("Job was cancelled");
+                const { totalItems } = await this.productService.findAll(ctx, {
+                    take: 1,
+                    skip: 0,
+                });
+                const workers = Math.ceil(totalItems / WORKER_THRESHOLD);
+                for (let worker = 0; worker < workers; worker++) {
+                    try {
+                        for (var _d = true, _e = (e_2 = void 0, __asyncValues(this.fetchProducts({ ctx, worker }, (progress) => {
+                            if (job.state === admin_types_1.JobState.CANCELLED) {
+                                throw new Error("Job was cancelled");
+                            }
+                            else
+                                job.setProgress(progress);
+                        }))), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
+                            _c = _f.value;
+                            _d = false;
+                            const product = _c;
+                            products.push(...product);
                         }
-                        else
-                            job.setProgress(progress);
-                    })), _f; _f = await _e.next(), _a = _f.done, !_a; _d = true) {
-                        _c = _f.value;
-                        _d = false;
-                        const product = _c;
-                        products.push(...product);
                     }
-                }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (!_d && !_a && (_b = _e.return)) await _b.call(_e);
+                        }
+                        finally { if (e_2) throw e_2.error; }
                     }
-                    finally { if (e_2) throw e_2.error; }
                 }
-                const missingProducts = products.filter((product) => !results.find((result) => result.communicateID === product.communicateID));
-                if (missingProducts.length > 0) {
-                    this.log(`Found ${missingProducts.length} orphan items for platform ${platform}`);
-                    await service.removeOrphanItems(ctx, missingProducts);
+                const orphanProducts = (0, google_merchant_api_js_1.selectRemoteOrphanProducts)(remoteProducts, products);
+                if (orphanProducts.length > 0) {
+                    this.log(`Found ${orphanProducts.length} orphan items for platform ${platform}`);
+                    await service.removeOrphanItems(ctx, orphanProducts);
                 }
                 else {
                     this.log(`No orphan items found for platform ${platform}`);

package/dist/plugin-server/types.d.ts

@@ -1,22 +1,31 @@
 import { InjectableStrategy, Product, RequestContext } from "@deenruv/core";
-import { content_v2_1 } from "googleapis";
+import type { protos } from "@google-shopping/products";
 export type BaseData = {
     communicateID: string;
     variantID: string | number;
 };
 export type BaseProductData<T extends BaseData> = Array<T>;
 export type MerchantPluginOptions = {
-    strategy?: MerchantExportStrategy<BaseProductData<any>>;
+    strategy?: MerchantExportStrategy<BaseProductData<BaseData>>;
+};
+export type GoogleProductInput = protos.google.shopping.merchant.products.v1.IProductInput;
+export type GoogleProcessedProduct = protos.google.shopping.merchant.products.v1.IProduct;
+export type GoogleProduct = BaseData & {
+    productAttributes: NonNullable<GoogleProductInput["productAttributes"]>;
+    customAttributes?: GoogleProductInput["customAttributes"];
+    versionNumber?: GoogleProductInput["versionNumber"];
+};
+export type RemoteProduct = Pick<BaseData, "communicateID"> & {
+    name?: string;
 };
-export type GoogleProduct = Omit<content_v2_1.Schema$Product, "brand"> & BaseData;
 export type FacebookProduct = Record<string, unknown> & {
     communicateID: string;
     variantID: string | number;
 };
-export interface MerchantExportStrategy<T extends BaseProductData<any>> extends InjectableStrategy {
-    getBaseData: (ctx: RequestContext, product: Product) => Promise<T | undefined>;
-    prepareGoogleProductPayload: (ctx: RequestContext, data: T) => Promise<Array<GoogleProduct> | undefined>;
-    prepareFacebookProductPayload: (ctx: RequestContext, data: T) => Promise<Array<FacebookProduct> | undefined>;
+export interface MerchantExportStrategy<T extends BaseProductData<BaseData>> extends InjectableStrategy {
+    getBaseData(ctx: RequestContext, product: Product): Promise<T | undefined>;
+    prepareGoogleProductPayload(ctx: RequestContext, data: T): Promise<Array<GoogleProduct> | undefined>;
+    prepareFacebookProductPayload(ctx: RequestContext, data: T): Promise<Array<FacebookProduct> | undefined>;
 }
 declare module "@deenruv/core" {
     interface CustomProductFields {

package/dist/plugin-server/ui/pages/GooglePage.tsx

@@ -54,6 +54,7 @@ export const GooglePage = () => {
   const [settingsForm, setSettingsForm] = useState({
     brand: "",
     merchantId: "",
+    dataSource: "",
     credentials: "",
     autoUpdate: true,
     firstSync: true,
@@ -75,6 +76,9 @@ export const GooglePage = () => {
             if (key === "merchantId") {
               acc.merchantId = value;
             }
+            if (key === "dataSource") {
+              acc.dataSource = value;
+            }
             if (key === "credentials") {
               acc.credentials = value;
             }
@@ -89,6 +93,7 @@ export const GooglePage = () => {
           {} as {
             brand: string;
             merchantId: string;
+            dataSource: string;
             credentials: string;
             autoUpdate: boolean;
             firstSync: boolean;
@@ -183,6 +188,7 @@ export const GooglePage = () => {
               <label>Merchant ID</label>
               <input
                 className="w-full"
+                required
                 value={settingsForm.merchantId}
                 onChange={(e) =>
                   setSettingsForm({
@@ -193,6 +199,21 @@ export const GooglePage = () => {
               />
             </div>
           </div>
+          <div className="w-full flex flex-col gap-2">
+            <label>Data source</label>
+            <input
+              className="w-full"
+              placeholder="accounts/{merchantId}/dataSources/{id}"
+              required
+              value={settingsForm.dataSource}
+              onChange={(e) =>
+                setSettingsForm({
+                  ...settingsForm,
+                  dataSource: e.target.value,
+                })
+              }
+            />
+          </div>
           <div className="flex flex-col gap-4">
             <div className="flex flex-col">
               <label>Google Account Credentials</label>

package/dist/plugin-ui/pages/FacebookPage.d.ts

@@ -1 +1,2 @@
-export declare const FacebookPage: () => import("react/jsx-runtime").JSX.Element;
+import React from "react";
+export declare const FacebookPage: () => React.JSX.Element;

package/dist/plugin-ui/pages/GooglePage.d.ts

@@ -1 +1,2 @@
-export declare const GooglePage: () => import("react/jsx-runtime").JSX.Element;
+import React from "react";
+export declare const GooglePage: () => React.JSX.Element;

package/dist/plugin-ui/pages/GooglePage.js

@@ -41,6 +41,7 @@ export const GooglePage = () => {
     const [settingsForm, setSettingsForm] = useState({
         brand: "",
         merchantId: "",
+        dataSource: "",
         credentials: "",
         autoUpdate: true,
         firstSync: true,
@@ -59,6 +60,9 @@ export const GooglePage = () => {
                 if (key === "merchantId") {
                     acc.merchantId = value;
                 }
+                if (key === "dataSource") {
+                    acc.dataSource = value;
+                }
                 if (key === "credentials") {
                     acc.credentials = value;
                 }
@@ -128,10 +132,13 @@ export const GooglePage = () => {
                             alignItems: "center",
                             width: "42px",
                             height: "42px",
-                        }, className: "spinner" }) })), _jsxs("form", { className: "flex flex-col gap-4", onSubmit: onSubmit, children: [_jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: "Brand" }), _jsx(Input, { className: "w-full", value: settingsForm.brand, onChange: (e) => setSettingsForm({ ...settingsForm, brand: e.target.value }) })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: "Merchant ID" }), _jsx(Input, { className: "w-full", value: settingsForm.merchantId, onChange: (e) => setSettingsForm({
+                        }, className: "spinner" }) })), _jsxs("form", { className: "flex flex-col gap-4", onSubmit: onSubmit, children: [_jsxs("div", { className: "flex justify-between gap-4", children: [_jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: "Brand" }), _jsx(Input, { className: "w-full", value: settingsForm.brand, onChange: (e) => setSettingsForm({ ...settingsForm, brand: e.target.value }) })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: "Merchant ID" }), _jsx(Input, { className: "w-full", required: true, value: settingsForm.merchantId, onChange: (e) => setSettingsForm({
                                                 ...settingsForm,
                                                 merchantId: e.target.value,
-                                            }) })] })] }), _jsxs("div", { className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col", children: [_jsx(Label, { children: "Google Account Credentials" }), _jsx(Input, { style: {
+                                            }) })] })] }), _jsxs("div", { className: "w-full flex flex-col gap-2", children: [_jsx(Label, { children: "Data source" }), _jsx(Input, { className: "w-full", placeholder: "accounts/{merchantId}/dataSources/{id}", required: true, value: settingsForm.dataSource, onChange: (e) => setSettingsForm({
+                                        ...settingsForm,
+                                        dataSource: e.target.value,
+                                    }) })] }), _jsxs("div", { className: "flex flex-col gap-4", children: [_jsxs("div", { className: "flex flex-col", children: [_jsx(Label, { children: "Google Account Credentials" }), _jsx(Input, { style: {
                                                 border: "none",
                                                 backgroundColor: "transparent",
                                                 background: "none",
@@ -143,7 +150,7 @@ export const GooglePage = () => {
                                                     firstSync: typeof checked === "boolean" ? checked : false,
                                                 }) })] }), _jsx(Button, { children: "Save" })] }) })] }), _jsxs("div", { className: "flex gap-2", children: [_jsx("span", { children: "Connection status" }), serviceInfo.connectionStatus ? _jsx("div", { children: "\uD83D\uDC9A" }) : _jsx("div", { children: "\uD83D\uDC94" })] }), serviceInfo.connectionStatus ? (_jsx("div", { className: "mt-8", children: _jsx(Button, { onClick: async () => {
                             try {
-                                await removeOldItems({ platform: "facebook" });
+                                await removeOldItems({ platform: "google" });
                                 toast.success("Old items removed successfully");
                                 refetch();
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deenruv/merchant-plugin",
-  "version": "1.0.15",
+  "version": "1.0.17-dev.14",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -16,27 +16,26 @@
     "./plugin-ui": "./dist/plugin-ui/index.js"
   },
   "dependencies": {
+    "@google-shopping/products": "0.9.0",
     "@nestjs/common": "~10.3.10",
     "@nestjs/graphql": "~12.2.0",
     "date-fns": "^4.1.0",
     "facebook-nodejs-business-sdk": "^23.0.1",
-    "google-auth-library": "^9.15.0",
-    "googleapis": "^144.0.0",
     "graphql": "~16.9.0",
     "graphql-tag": "^2.12.6",
     "graphql-zeus": "^5.4.2",
     "html-to-text": "^9.0.5",
-    "lucide-react": "^0.363.0",
+    "lucide-react": "^1.21.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-i18next": "^14.0.5",
-    "sonner": "^1.4.41",
     "recharts": "^2.12.7",
-    "@deenruv/admin-types": "^1.0.15",
-    "@deenruv/common": "^1.0.15",
-    "@deenruv/ui-devkit": "^1.0.15",
-    "@deenruv/react-ui-devkit": "^1.0.15",
-    "@deenruv/admin-ui": "^1.0.15"
+    "sonner": "^1.4.41",
+    "@deenruv/admin-types": "^1.0.17-dev.14",
+    "@deenruv/common": "^1.0.17-dev.14",
+    "@deenruv/admin-ui": "^1.0.17-dev.14",
+    "@deenruv/react-ui-devkit": "^1.0.17-dev.14",
+    "@deenruv/ui-devkit": "^1.0.17-dev.14"
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
@@ -48,16 +47,17 @@
     "rimraf": "^5.0.10",
     "tslib": "^2.6.2",
     "typescript": "5.3.3",
-    "@deenruv/core": "^1.0.15"
+    "@deenruv/core": "^1.0.17-dev.14"
   },
   "peerDependencies": {
-    "@deenruv/core": "^1.0.0"
+    "@deenruv/core": "^1.0.0 || ^1.0.17-dev.0"
   },
   "scripts": {
     "build": "rimraf dist && tsc --build && cp -r ./src/plugin-server/ui ./dist/plugin-server",
     "watch": "concurrently -k -p \"[{name}]\" -n \"SERVER,UI\" -c \"yellow.bold,cyan.bold\" \"tsc --watch --project src/plugin-server/tsconfig.json\" \"tsc --watch --project src/plugin-ui/tsconfig.json\"",
     "lint": "eslint ./src/**/*.ts",
     "lint:fix": "eslint --fix ./src/**/*.ts",
+    "test": "vitest --run --exclude='src/plugin-server/e2e/**'",
     "zeus": "zeus http://localhost:6100/admin-api ./src/plugin-server --es && zeus http://localhost:6100/admin-api ./src/plugin-server/ui --td && zeus http://localhost:6100/admin-api ./src/plugin-ui --td --es"
   }
 }