merchi_sdk_ts 1.3.2-a → 1.3.2-c

package/dist/entities/product.test.js

@@ -235,6 +235,7 @@ test('can list products with options set', function () {
         companyId: 91,
         companySupplierId: 100,
         componentId: 37,
+        conversationId: 1,
         dateFrom: new Date(0),
         dateTo: new Date(1),
         doesNotHaveAdminDomain: false,

package/dist/entities/support_conversation.js

@@ -45,26 +45,18 @@ var SupportConversation = /** @class */ (function (_super) {
         SupportConversation.property({ type: Date }),
         __metadata("design:type", Object)
     ], SupportConversation.prototype, "lastMessageAt", void 0);
-    __decorate([
-        SupportConversation.property(),
-        __metadata("design:type", Number)
-    ], SupportConversation.prototype, "domainId", void 0);
     __decorate([
         SupportConversation.property({ type: Domain }),
         __metadata("design:type", Domain)
     ], SupportConversation.prototype, "domain", void 0);
     __decorate([
-        SupportConversation.property(),
+        SupportConversation.property({ type: String }),
         __metadata("design:type", Object)
     ], SupportConversation.prototype, "guestId", void 0);
     __decorate([
-        SupportConversation.property(),
+        SupportConversation.property({ type: String }),
         __metadata("design:type", Object)
     ], SupportConversation.prototype, "clientFingerprint", void 0);
-    __decorate([
-        SupportConversation.property(),
-        __metadata("design:type", Object)
-    ], SupportConversation.prototype, "userId", void 0);
     __decorate([
         SupportConversation.property({ type: User }),
         __metadata("design:type", Object)

package/dist/entities/support_conversation.test.js

@@ -0,0 +1,6 @@
+import { Merchi } from '../merchi.js';
+test('can make SupportConversation', function () {
+    var merchi = new Merchi();
+    var supportConversation = new merchi.SupportConversation();
+    expect(supportConversation).toBeTruthy();
+});

package/dist/entities/support_message.js

@@ -22,109 +22,35 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 import { Entity } from '../entity.js';
+import { SupportConversation } from './support_conversation.js';
+import { User } from './user.js';
 var SupportMessage = /** @class */ (function (_super) {
     __extends(SupportMessage, _super);
     function SupportMessage() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    /**
-     * List messages for a conversation (`GET …/support_conversations/<id>/support_messages/`).
-     * The generic `/support_messages/` list route is not used for widget/dashboard chat.
-     */
-    SupportMessage.listForConversation = function (conversationId, options) {
-        var _this = this;
-        var resource = "/support_conversations/".concat(conversationId, "/support_messages/");
-        var fetchOptions = { method: 'GET', query: [] };
-        if ((options === null || options === void 0 ? void 0 : options.offset) !== undefined) {
-            fetchOptions.query.push(['offset', String(options.offset)]);
-        }
-        if ((options === null || options === void 0 ? void 0 : options.limit) !== undefined) {
-            fetchOptions.query.push(['limit', String(options.limit)]);
-        }
-        fetchOptions.query.push(['skip_rights', 'y']);
-        return this.merchi.authenticatedFetch(resource, fetchOptions).then(function (data) {
-            var e_1, _a;
-            var _b, _c, _d, _e, _f, _g, _h, _j;
-            var pluralName = _this.pluralName;
-            var rawItems = (_b = data[pluralName]) !== null && _b !== void 0 ? _b : [];
-            var singularName = _this.singularName;
-            var entities = [];
-            try {
-                for (var rawItems_1 = __values(rawItems), rawItems_1_1 = rawItems_1.next(); !rawItems_1_1.done; rawItems_1_1 = rawItems_1.next()) {
-                    var item = rawItems_1_1.value;
-                    var entity = (new _this());
-                    entity.fromJson(item[singularName]);
-                    entities.push(entity);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (rawItems_1_1 && !rawItems_1_1.done && (_a = rawItems_1.return)) _a.call(rawItems_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            var pagination = (_c = data.pagination) !== null && _c !== void 0 ? _c : {};
-            var total = (_e = (_d = pagination.totalCount) !== null && _d !== void 0 ? _d : pagination.available) !== null && _e !== void 0 ? _e : entities.length;
-            var metadata = {
-                available: total,
-                count: total,
-                limit: (_g = (_f = pagination.limit) !== null && _f !== void 0 ? _f : options === null || options === void 0 ? void 0 : options.limit) !== null && _g !== void 0 ? _g : 50,
-                offset: (_j = (_h = pagination.offset) !== null && _h !== void 0 ? _h : options === null || options === void 0 ? void 0 : options.offset) !== null && _j !== void 0 ? _j : 0,
-            };
-            return { items: entities, metadata: metadata };
-        });
-    };
-    /** POST a manager message to a conversation (dashboard session). */
-    SupportMessage.createForConversation = function (conversationId, content) {
-        var _this = this;
-        var resource = "/support_conversations/".concat(conversationId, "/support_messages/");
-        var fetchOptions = {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-            body: new URLSearchParams({ content: content }).toString(),
-        };
-        fetchOptions.query = [['skip_rights', 'y']];
-        return this.merchi.authenticatedFetch(resource, fetchOptions).then(function (data) {
-            var entity = (new _this());
-            entity.fromJson(data[_this.singularName]);
-            return entity;
-        });
-    };
     SupportMessage.resourceName = 'support_messages';
     SupportMessage.singularName = 'supportMessage';
-    /** Matches API `plural_json_name` (list responses use `supportMessagesList`). */
-    SupportMessage.pluralName = 'supportMessagesList';
+    SupportMessage.pluralName = 'supportMessages';
     __decorate([
         SupportMessage.property(),
         __metadata("design:type", Number)
     ], SupportMessage.prototype, "id", void 0);
     __decorate([
-        SupportMessage.property(),
-        __metadata("design:type", Number)
-    ], SupportMessage.prototype, "conversationId", void 0);
+        SupportMessage.property({ type: SupportConversation }),
+        __metadata("design:type", SupportConversation)
+    ], SupportMessage.prototype, "conversation", void 0);
     __decorate([
-        SupportMessage.property(),
+        SupportMessage.property({ type: String }),
         __metadata("design:type", String)
     ], SupportMessage.prototype, "senderType", void 0);
     __decorate([
-        SupportMessage.property(),
+        SupportMessage.property({ type: User }),
         __metadata("design:type", Object)
     ], SupportMessage.prototype, "user", void 0);
     __decorate([
-        SupportMessage.property(),
+        SupportMessage.property({ type: String }),
         __metadata("design:type", String)
     ], SupportMessage.prototype, "content", void 0);
     __decorate([

package/dist/entities/support_message.test.js

@@ -0,0 +1,6 @@
+import { Merchi } from '../merchi.js';
+test('can make SupportMessage', function () {
+    var merchi = new Merchi();
+    var supportMessage = new merchi.SupportMessage();
+    expect(supportMessage).toBeTruthy();
+});

package/dist/entity.js

@@ -814,6 +814,10 @@ var Entity = /** @class */ (function () {
                 fetchOptions.query.push(['component_id',
                     options.componentId.toString()]);
             }
+            if (options.conversationId !== undefined) {
+                fetchOptions.query.push(['conversation_id',
+                    options.conversationId.toString()]);
+            }
             if (options.groupBuyForJobId !== undefined) {
                 fetchOptions.query.push(['group_buy_for_job_id',
                     options.groupBuyForJobId.toString()]);

package/package.json

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

package/src/entities/product.test.ts

@@ -259,6 +259,7 @@ test('can list products with options set', () => {
     companyId: 91,
     companySupplierId: 100,
     componentId: 37,
+    conversationId: 1,
     dateFrom: new Date(0),
     dateTo: new Date(1),
     doesNotHaveAdminDomain: false,

package/src/entities/support_conversation.test.ts

@@ -0,0 +1,7 @@
+import { Merchi } from '../merchi.js';
+
+test('can make SupportConversation', () => {
+  const merchi = new Merchi();
+  const supportConversation = new merchi.SupportConversation();
+  expect(supportConversation).toBeTruthy();
+});

package/src/entities/support_conversation.ts

@@ -17,22 +17,16 @@ export class SupportConversation extends Entity {
   @SupportConversation.property({ type: Date })
   public lastMessageAt?: Date | null;
 
-  @SupportConversation.property()
-  public domainId?: number;
-
   @SupportConversation.property({ type: Domain })
   public domain?: Domain;
 
-  @SupportConversation.property()
+  @SupportConversation.property({ type: String })
   public guestId?: string | null;
 
   /** Opaque client fingerprint for repeat-visitor / spam correlation (max 512 chars). */
-  @SupportConversation.property()
+  @SupportConversation.property({ type: String })
   public clientFingerprint?: string | null;
 
-  @SupportConversation.property()
-  public userId?: number | null;
-
   @SupportConversation.property({ type: User })
   public user?: User | null;
 

package/src/entities/support_message.test.ts

@@ -0,0 +1,7 @@
+import { Merchi } from '../merchi.js';
+
+test('can make SupportMessage', () => {
+  const merchi = new Merchi();
+  const supportMessage = new merchi.SupportMessage();
+  expect(supportMessage).toBeTruthy();
+});

package/src/entities/support_message.ts

@@ -1,90 +1,27 @@
-import { Entity, ListResponse } from '../entity.js';
-// eslint-disable-next-line no-unused-vars
-import { RequestOptions } from '../request.js';
+import { Entity } from '../entity.js';
+import { SupportConversation } from './support_conversation.js';
 import { User } from './user.js';
 
 export class SupportMessage extends Entity {
   protected static resourceName = 'support_messages';
   protected static singularName = 'supportMessage';
-  /** Matches API `plural_json_name` (list responses use `supportMessagesList`). */
-  protected static pluralName = 'supportMessagesList';
+  protected static pluralName = 'supportMessages';
 
   @SupportMessage.property()
   public id?: number;
 
-  @SupportMessage.property()
-  public conversationId?: number;
+  @SupportMessage.property({ type: SupportConversation })
+  public conversation?: SupportConversation;
 
-  @SupportMessage.property()
+  @SupportMessage.property({ type: String })
   public senderType?: string;  // 'guest' | 'manager'
 
-  @SupportMessage.property()
+  @SupportMessage.property({ type: User })
   public user?: User | null;
 
-  @SupportMessage.property()
+  @SupportMessage.property({ type: String })
   public content?: string;
 
   @SupportMessage.property({ type: Date })
   public creationDate?: Date | null;
-
-  /**
-   * List messages for a conversation (`GET …/support_conversations/<id>/support_messages/`).
-   * The generic `/support_messages/` list route is not used for widget/dashboard chat.
-   */
-  public static listForConversation<T extends typeof SupportMessage>(
-    this: T,
-    conversationId: number,
-    options?: { limit?: number; offset?: number }
-  ): Promise<ListResponse<InstanceType<T>>> {
-    const resource = `/support_conversations/${conversationId}/support_messages/`;
-    const fetchOptions: RequestOptions = { method: 'GET', query: [] };
-    if (options?.offset !== undefined) {
-      fetchOptions.query!.push(['offset', String(options.offset)]);
-    }
-    if (options?.limit !== undefined) {
-      fetchOptions.query!.push(['limit', String(options.limit)]);
-    }
-    fetchOptions.query!.push(['skip_rights', 'y']);
-    return this.merchi.authenticatedFetch(resource, fetchOptions).then((data: any) => {
-      const pluralName = this.pluralName;
-      const rawItems: any[] = data[pluralName] ?? [];
-      const singularName = this.singularName;
-      const entities: InstanceType<T>[] = [];
-      for (const item of rawItems) {
-        const entity: InstanceType<T> = (new this()) as InstanceType<T>;
-        entity.fromJson(item[singularName]);
-        entities.push(entity);
-      }
-      const pagination = data.pagination ?? {};
-      const total =
-        pagination.totalCount ?? pagination.available ?? entities.length;
-      const metadata = {
-        available: total,
-        count: total,
-        limit: pagination.limit ?? options?.limit ?? 50,
-        offset: pagination.offset ?? options?.offset ?? 0,
-      };
-      return { items: entities, metadata };
-    });
-  }
-
-  /** POST a manager message to a conversation (dashboard session). */
-  public static createForConversation<T extends typeof SupportMessage>(
-    this: T,
-    conversationId: number,
-    content: string
-  ): Promise<InstanceType<T>> {
-    const resource = `/support_conversations/${conversationId}/support_messages/`;
-    const fetchOptions: RequestOptions = {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      body: new URLSearchParams({ content }).toString(),
-    };
-    fetchOptions.query = [['skip_rights', 'y']];
-    return this.merchi.authenticatedFetch(resource, fetchOptions).then((data: any) => {
-      const entity: InstanceType<T> = (new this()) as InstanceType<T>;
-      entity.fromJson(data[this.singularName]);
-      return entity;
-    });
-  }
 }

package/src/entity.ts

@@ -85,6 +85,7 @@ interface ListOptions {
   companyId?: number;
   companySupplierId?: number;
   componentId?: number;
+  conversationId?: number;
   dateFrom?: Date;
   dateTo?: Date;
   domainRoles?: Role[];
@@ -615,6 +616,10 @@ export class Entity {
         fetchOptions.query.push(['component_id',
           options.componentId.toString()]);
       }
+      if (options.conversationId !== undefined) {
+        fetchOptions.query.push(['conversation_id',
+          options.conversationId.toString()]);
+      }
       if (options.groupBuyForJobId !== undefined) {
         fetchOptions.query.push(['group_buy_for_job_id',
           options.groupBuyForJobId.toString()]);