@social-mail/social-mail-client 1.2.539 → 1.2.541

package/src/web/page/channels/services/ChannelService.ts

@@ -1,7 +1,7 @@
 import DITransient from "@web-atoms/core/dist/di/DITransient";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../../../../services/EntityService";
-import { Email, IEmail, IMailboxContact, Mailbox, MailboxContact } from "../../../../model/model";
+import { Email, IEmail, IMailboxContact, Mailbox, MailboxContact, MailboxEmail } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
 import EmailContentDownloader from "../../../../services/email/EmailContentDownloader";
 import EngagementService from "../../mails/service/EngagementService";
@@ -28,36 +28,37 @@ export default class ChannelService {
         version = 0,
         cancelToken
     }) {
-        let q = this.entityService.query(Email);
+        let q = this.entityService.query(MailboxEmail);
 
         if (channelID) {
-            q = q.where({ channelID}, (p) => (x) => x.mailboxes.some((m) => m.mailboxID === p.channelID));
+            q = q.where({ channelID}, (p) => (x) => x.mailboxID === p.channelID);
         }
 
         if (published) {
-            q = q.where((x) => x.status === "published");
+            q = q.where((x) => x.datePublished !== null);
         } else {
-            q = q.where((x) => x.status !== "published");
+            q = q.where((x) => x.email.status === null);
         }
 
         if (search) {
             if (!/\%/.test(search)) {
                 search = search + "%";
             }
-            q = q.where({ search }, (p) => (x) => Sql.text.like(x.subject, p.search));
+            q = q.where({ search }, (p) => (x) => Sql.text.like(x.email.subject, p.search));
         }
 
         const result = await q.orderByDescending((x) => x.emailID)
+            .include((x) => [x.email, x.email.attachments])
             .toPagedList({ start, size, cancelToken });
         const tasks = [];
         for (const iterator of result.items) {
             tasks.push(this.emailContentDownloader.downloadFromUrl(
-                apiPath(`/api/emails/channel/content/html/${channelID}/${iterator.emailID}/${iterator.headerMessageID}`)
-                , iterator));
-            tasks.push(this.engagementService.downloadEngagements(iterator));
+                apiPath(`/api/emails/channel/content/html/${channelID}/${iterator.emailID}/${iterator.email.headerMessageID}`)
+                , iterator.email));
+            tasks.push(this.engagementService.downloadEngagements(iterator.email));
         }
         await Promise.all(tasks);
-        return result;
+        return { items: result.items.map((x) => x.email), total: result.total };
     }
 
     public async getMailbox(id: number) {