merchi_sdk_ts 1.24.0 → 1.26.0

package/dist/entities/product.test.js

@@ -269,7 +269,7 @@ test('can list products with options set', function () {
         notificationType: NotificationType.DRAFT_SENT,
         offset: 0,
         orClientId: 123,
-        orClientCompanyId: 321,
+        orClientCompanyId: [321, 654],
         order: 'asc',
         originalOf: 1,
         platformCategoryId: 3,
@@ -287,6 +287,7 @@ test('can list products with options set', function () {
         relatedUser: 55,
         savedByUser: 24,
         section: NotificationSection.JOB_INFO,
+        senderCompanyId: 77,
         senderRole: Role.MANAGER,
         shopifyOnly: false,
         sort: 'name',
@@ -357,7 +358,7 @@ test('can list products with options set', function () {
         ['notification_recipient', '87'],
         ['notification_type', '1'],
         ['offset', '0'],
-        ['or_client_company_id', '321'],
+        ['or_client_company_id', '321,654'],
         ['or_client_id', '123'],
         ['order', 'asc'],
         ['original_of', '1'],
@@ -376,6 +377,7 @@ test('can list products with options set', function () {
         ['related_user', '55'],
         ['saved_by_user', '24'],
         ['section', '2'],
+        ['sender_company_id', '77'],
         ['sender_role', '6'],
         ['skip_rights', 'y'],
         ['shopify_only', 'false'],

package/dist/entity.js

@@ -816,6 +816,10 @@ var Entity = /** @class */ (function () {
                 fetchOptions.query.push(['saved_by_user',
                     options.savedByUser.toString()]);
             }
+            if (options.senderCompanyId !== undefined) {
+                fetchOptions.query.push(['sender_company_id',
+                    options.senderCompanyId.toString()]);
+            }
             if (options.receiverId !== undefined) {
                 fetchOptions.query.push(['receiver_id', options.receiverId.toString()]);
             }
@@ -886,7 +890,10 @@ var Entity = /** @class */ (function () {
                 fetchOptions.query.push(['or_client_id', options.orClientId.toString()]);
             }
             if (options.orClientCompanyId !== undefined) {
-                fetchOptions.query.push(['or_client_company_id', options.orClientCompanyId.toString()]);
+                var companyIds = Array.isArray(options.orClientCompanyId)
+                    ? options.orClientCompanyId.join(',')
+                    : options.orClientCompanyId.toString();
+                fetchOptions.query.push(['or_client_company_id', companyIds]);
             }
         }
         if (!(options && options.withRights)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_sdk_ts",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "main": "dist/index.js",
   "type": "module",
   "repository": "git@github.com:merchisdk/merchi_sdk_ts.git",

package/src/entities/product.test.ts

@@ -293,7 +293,7 @@ test('can list products with options set', () => {
     notificationType: NotificationType.DRAFT_SENT,
     offset: 0,
     orClientId: 123,
-    orClientCompanyId: 321,
+    orClientCompanyId: [321, 654],
     order: 'asc',
     originalOf: 1,
     platformCategoryId: 3,
@@ -311,6 +311,7 @@ test('can list products with options set', () => {
     relatedUser: 55,
     savedByUser: 24,
     section: NotificationSection.JOB_INFO,
+    senderCompanyId: 77,
     senderRole: Role.MANAGER,
     shopifyOnly: false,
     sort: 'name',
@@ -385,7 +386,7 @@ test('can list products with options set', () => {
     ['notification_recipient', '87'],
     ['notification_type', '1'],
     ['offset', '0'],
-    ['or_client_company_id', '321'],
+    ['or_client_company_id', '321,654'],
     ['or_client_id', '123'],
     ['order', 'asc'],
     ['original_of', '1'],
@@ -404,6 +405,7 @@ test('can list products with options set', () => {
     ['related_user', '55'],
     ['saved_by_user', '24'],
     ['section', '2'],
+    ['sender_company_id', '77'],
     ['sender_role', '6'],
     ['skip_rights', 'y'],
     ['shopify_only', 'false'],

package/src/entity.ts

@@ -122,7 +122,7 @@ interface ListOptions {
   notificationType?: NotificationType;
   offset?: number;
   orClientId?: number;
-  orClientCompanyId?: number;
+  orClientCompanyId?: number | number[];
   order?: string;
   originalOf?: number;
   platformCategoryId?: number;
@@ -141,6 +141,7 @@ interface ListOptions {
   relatedUser?: number;
   savedByUser?: number;
   section?: NotificationSection;
+  senderCompanyId?: number;
   senderRole?: Role;
   serialiseMethod?: SerialiseMethod;
   shopifyOnly?: boolean;
@@ -634,6 +635,10 @@ export class Entity {
         fetchOptions.query.push(['saved_by_user',
           options.savedByUser.toString()]);
       }
+      if (options.senderCompanyId !== undefined) {
+        fetchOptions.query.push(['sender_company_id',
+          options.senderCompanyId.toString()]);
+      }
       if (options.receiverId !== undefined) {
         fetchOptions.query.push(['receiver_id', options.receiverId.toString()]);
       }
@@ -710,8 +715,10 @@ export class Entity {
         fetchOptions.query.push(['or_client_id', options.orClientId.toString()]);
       }
       if (options.orClientCompanyId !== undefined) {
-        fetchOptions.query.push(
-          ['or_client_company_id', options.orClientCompanyId.toString()]);
+        const companyIds = Array.isArray(options.orClientCompanyId)
+          ? options.orClientCompanyId.join(',')
+          : options.orClientCompanyId.toString();
+        fetchOptions.query.push(['or_client_company_id', companyIds]);
       }
     }
     if (!(options && options.withRights)) {

package/tsconfig.json

@@ -6,10 +6,12 @@
     "downlevelIteration": true,
     "lib": ["es2017", "DOM", "ES6"],
     "moduleResolution": "node",
+    "rootDir": "./src",
     "outDir": "dist",
     "module": "ES6",
     "types": ["node", "jest"],
     "baseUrl": ".",
+    "ignoreDeprecations": "6.0",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,