n8n-nodes-mautic-advanced 1.3.0 → 1.3.2

package/dist/nodes/MauticAdvanced/operations/CompanyOperations.js

@@ -223,92 +223,105 @@ async function updateCompany(context, itemIndex) {
     }
     return result;
 }
+// Extract owner from a v7 company object. Requests without Accept: application/json
+// return JSON-LD where the owner IRI (/api/v2/users/{id}) lets us resolve the user ID.
+function extractOwnerFromV7(v7Item) {
+    if (!v7Item || v7Item.owner === null || v7Item.owner === undefined)
+        return null;
+    const iri = v7Item.owner?.['@id'];
+    if (iri) {
+        const match = /\/(\d+)$/.exec(iri);
+        if (match)
+            return { id: Number(match[1]) };
+    }
+    // No @id (non-Hydra response) — return partial FormEntity data as-is
+    return v7Item.owner;
+}
+// Fetch all companies from v7 and return a map of companyId → owner.
+// Called without Accept: application/json so the response includes JSON-LD @id on the owner.
+async function buildV7OwnerMap(context) {
+    const ownerMap = new Map();
+    let page = 1;
+    const MAX_PAGES = 100;
+    while (page <= MAX_PAGES) {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/v2/companies', {}, { page });
+        const items = Array.isArray(response)
+            ? response
+            : (response?.['hydra:member'] ?? []);
+        if (!items.length)
+            break;
+        for (const item of items) {
+            const id = Number(item.id);
+            if (id)
+                ownerMap.set(id, extractOwnerFromV7(item));
+        }
+        const total = response?.['hydra:totalItems'];
+        if (typeof total === 'number' && ownerMap.size >= total)
+            break;
+        page++;
+    }
+    return ownerMap;
+}
 async function getCompany(context, itemIndex) {
     const companyId = (0, ApiHelpers_1.getRequiredParam)(context, 'companyId', itemIndex);
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
     const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
-    let result;
+    // v1: custom fields via fields.all
+    const v1Response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/companies/${companyId}`);
+    let result = v1Response.company;
     if (mauticVersion === 'v7') {
-        result = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/v2/companies/${companyId}`, {}, {}, undefined, {
-            Accept: 'application/json',
-        });
-    }
-    else {
-        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/companies/${companyId}`);
-        result = response.company;
+        try {
+            // No Accept: application/json — JSON-LD response includes owner @id for user ID extraction
+            const v7Company = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/v2/companies/${companyId}`);
+            result = { ...result, owner: extractOwnerFromV7(v7Company) };
+        }
+        catch {
+            // enrichment failed — proceed with v1 data (owner: null)
+        }
     }
-    if (simple) {
+    if (simple)
         result = toSimpleCompany(result);
-    }
-    // v7 returns proper JSON types already; convertNumericStrings only needed for v1 string responses
-    return mauticVersion === 'v7' ? result : (0, DataHelpers_1.convertNumericStrings)(result);
+    return (0, DataHelpers_1.convertNumericStrings)(result);
 }
 async function getAllCompanies(context, itemIndex) {
     const returnAll = (0, ApiHelpers_1.getOptionalParam)(context, 'returnAll', itemIndex, false);
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
     const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
+    const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
+    const qs = (0, DataHelpers_1.buildQueryFromOptions)(additionalFields);
+    if (!qs.orderBy)
+        qs.orderBy = 'id';
+    if (!qs.orderByDir)
+        qs.orderByDir = 'asc';
+    // v1: custom fields via fields.all
     let responseData;
-    if (mauticVersion === 'v7') {
-        // v7: page-based pagination only (no start/limit/orderBy/search)
-        if (returnAll) {
-            const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
-            const allItems = [];
-            let page = 1;
-            while (true) {
-                const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/v2/companies', {}, { page }, undefined, { Accept: 'application/json' });
-                const pageItems = Array.isArray(response)
-                    ? response
-                    : (response?.['hydra:member'] ?? []);
-                if (!pageItems.length)
-                    break;
-                allItems.push(...pageItems);
-                if (limit !== undefined && allItems.length >= limit)
-                    break;
-                page++;
-            }
-            responseData = limit !== undefined ? allItems.slice(0, limit) : allItems;
-        }
-        else {
-            // page through until limit satisfied — v7 page size is fixed (~30), limit may exceed it
-            const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
-            const allItems = [];
-            let page = 1;
-            while (allItems.length < limit) {
-                const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/v2/companies', {}, { page }, undefined, { Accept: 'application/json' });
-                const pageItems = Array.isArray(response)
-                    ? response
-                    : (response?.['hydra:member'] ?? []);
-                if (!pageItems.length)
-                    break;
-                allItems.push(...pageItems);
-                page++;
-            }
-            responseData = allItems.slice(0, limit);
-        }
+    if (returnAll) {
+        const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
+        responseData = await (0, ApiHelpers_1.makePaginatedRequest)(context, 'companies', 'GET', '/companies', {}, qs, limit);
     }
     else {
-        const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
-        const qs = (0, DataHelpers_1.buildQueryFromOptions)(additionalFields);
-        if (!qs.orderBy)
-            qs.orderBy = 'id';
-        if (!qs.orderByDir)
-            qs.orderByDir = 'asc';
-        if (returnAll) {
-            const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
-            responseData = await (0, ApiHelpers_1.makePaginatedRequest)(context, 'companies', 'GET', '/companies', {}, qs, limit);
+        const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
+        qs.limit = limit;
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/companies', {}, qs);
+        responseData = (response.companies ? Object.values(response.companies) : []);
+    }
+    if (mauticVersion === 'v7') {
+        try {
+            // v7 enrichment: overlay owner on each v1 result using a single paginated v7 fetch
+            const ownerMap = await buildV7OwnerMap(context);
+            responseData = responseData.map((company) => ({
+                ...company,
+                owner: ownerMap.get(Number(company.id)) ?? null,
+            }));
         }
-        else {
-            const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
-            qs.limit = limit;
-            const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/companies', {}, qs);
-            responseData = (response.companies ? Object.values(response.companies) : []);
+        catch {
+            // enrichment failed — proceed with v1 data (owner: null)
         }
     }
     if (simple) {
         responseData = responseData.map((item) => toSimpleCompany(item));
     }
-    // v7 returns proper JSON types already; convertNumericStrings only needed for v1 string responses
-    return mauticVersion === 'v7' ? responseData : (0, DataHelpers_1.convertNumericStrings)(responseData);
+    return (0, DataHelpers_1.convertNumericStrings)(responseData);
 }
 async function deleteCompany(context, itemIndex) {
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-mautic-advanced",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "description": "Enhanced n8n node for Mautic with comprehensive API coverage including tags, campaigns, categories, and advanced contact management",
   "keywords": [
     "n8n",