some adjusts

Author: luancazarine

components/wati/sources/common/base.mjs

@@ -13,11 +13,8 @@ export default {
     },
   },
   methods: {
-    getOpts() {
-      return {};
-    },
-    filterItems() {
-      () => true;
+    prepareData(data) {
+      return data;
     },
     _getLastDate() {
       return this.db.get("lastDate") || 0;
@@ -29,20 +26,16 @@ export default {
       const lastDate = this._getLastDate();
       const dateField = this.getDateField();
 
-      const response = this.wati.paginate({
-        fn: this.getFunction(),
-        ...this.getOpts(),
-        itemsField: this.getItemsField(),
-        maxResults,
-      });
+      const response = this.wati.paginate(
+        this.getPaginateOpts(maxResults),
+      );
 
       let responseArray = [];
       for await (const item of response) {
-        if (this.checkBreak(item, lastDate)) break;
         responseArray.push(item);
       }
 
-      responseArray = responseArray.filter(this.filterItems);
+      responseArray = this.prepareData(responseArray, lastDate, maxResults);
 
       if (responseArray.length) {
         this._setLastDate(responseArray[0][dateField]);

components/wati/sources/new-contact-created/new-contact-created.mjs

@@ -11,20 +11,20 @@ export default {
   dedupe: "unique",
   methods: {
     ...common.methods,
+    getPaginateOpts(maxResults) {
+      return {
+        fn: this.wati.listContacts,
+        itemsField: "result",
+        optsField: "data",
+        maxResults,
+      };
+    },
     getDateField() {
       return "created";
     },
-    getItemsField() {
-      return [
-        "result",
-      ];
-    },
     checkBreak(item, lastDate) {
       return Date.parse(item.created) < lastDate;
     },
-    getFunction() {
-      return this.wati.listContacts;
-    },
     getSummary(item) {
       return `New contact created: ${item.wAid}`;
     },

components/wati/sources/new-incoming-message/new-incoming-message.mjs

@@ -20,29 +20,30 @@ export default {
   },
   methods: {
     ...common.methods,
-    getOpts() {
+    getPaginateOpts() {
       return {
+        fn: this.wati.listContactMessages,
         whatsappNumber: `+${this.contactId}`,
+        itemsField: [
+          "messages",
+        ],
+        optsField: "params",
       };
     },
     getDateField() {
       return "timestamp";
     },
-    getItemsField() {
-      return [
-        "messages",
-        "items",
-      ];
-    },
-    filterItems(item) {
-      return item.statusString === "SENT";
+    prepareData(data, lastDate, maxResults) {
+      data = data
+        .filter((item) => item.statusString === "SENT" && Date.parse(item.created) > lastDate)
+        .sort((a, b) => Date.parse(b.created) - Date.parse(a.created));
+
+      if (maxResults && data.length > maxResults) data.length = maxResults;
+      return data;
     },
     checkBreak(item, lastDate) {
       return Date.parse(item.timestamp) < lastDate;
     },
-    getFunction() {
-      return this.wati.listContactMessages;
-    },
     getSummary(item) {
       return `New message: ${item.text || "No content"}`;
     },

components/wati/wati.app.mjs

@@ -9,13 +9,14 @@ export default {
       label: "Contact Id",
       description: "The Id of the contact.",
       async options({ page }) {
-        const { result } = await this.listContacts({
-          params: {
-            pageSize: page + 1,
+        const { result: { items } } = await this.listContacts({
+          data: {
+            pageSize: 100,
+            pageNumber: page,
           },
         });
 
-        return result.map(({ wAid }) => wAid);
+        return items.map(({ wAid }) => wAid);
       },
     },
     whatsappNumber: {
@@ -63,6 +64,7 @@ export default {
     },
     listContacts(opts = {}) {
       return this._makeRequest({
+        method: "POST",
         path: "/contacts",
         ...opts,
       });
@@ -107,34 +109,34 @@ export default {
       });
     },
     async *paginate({
-      fn, params = {}, itemsField, maxResults = null, ...opts
+      fn, itemsField, optsField, maxResults = null, data = {}, params = {}, ...otherOpts
     }) {
       let hasMore = false;
       let count = 0;
       let page = 0;
 
-      do {
-        params.pageNumber = ++page;
-        const response = await fn({
-          params,
-          ...opts,
-        });
+      const opts = {
+        data,
+        params,
+        ...otherOpts,
+      };
 
-        let data = response;
+      opts[optsField].pageSize = 100;
 
-        for (const field of itemsField) {
-          data = data[field];
-        }
+      do {
+        opts[optsField].pageNumber = page++;
+        const response = await fn(opts);
+        const items = response[itemsField].items;
 
-        for (const d of data) {
+        for (const d of items) {
           yield d;
 
           if (maxResults && ++count === maxResults) {
             return count;
           }
         }
 
-        hasMore = data.length;
+        hasMore = items.length;
 
       } while (hasMore);
     },