@social-mail/social-mail-web-server 1.5.49 → 1.5.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.5.49",
+  "version": "1.5.50",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/SocialMailContext.ts

@@ -45,6 +45,7 @@ import IncomingSmsSource from "./entities/IncomingSmsSource.js";
 import VerificationToken, { VerificationTokenAddress } from "./entities/VerificationToken.js";
 import MailboxFolder from "./entities/MailboxFolder.js";
 import HostedZone, { HostedZoneRecord, HostedZoneUser } from "./entities/HostedZone.js";
+import EmailAddressName from "./entities/EmailAddressName.js";
 
 @RegisterScoped
 export default class SocialMailContext extends EntityContext {
@@ -205,6 +206,8 @@ export default class SocialMailContext extends EntityContext {
 
     public verificationTokenAddresses = this.model.register(VerificationTokenAddress);
 
+    public emailAddressNames = this.model.register(EmailAddressName);
+
     public tags = this.model.register(Tag);
 
 }

package/src/server/model/SocialMailContextEvents.ts

@@ -97,6 +97,8 @@ import StoreTagEvents from "./events/StoreTagEvents.js";
 import StoreItemFolderTagEvents from "./events/StoreItemFolderTagEvents.js";
 import HostedZone, { HostedZoneRecord, HostedZoneUser } from "./entities/HostedZone.js";
 import HostedZoneEvents, { HostedZoneRecordEvents, HostedZoneUserEvents } from "./events/HostedZoneEvents.js";
+import EmailAddressName from "./entities/EmailAddressName.js";
+import EmailAddressNameEvents from "./events/EmailAddressNameEvents.js";
 
 @RegisterSingleton
 export default class SocialMailContextEvents extends ContextEvents {
@@ -127,6 +129,7 @@ export default class SocialMailContextEvents extends ContextEvents {
         this.register(HostedZoneUser, HostedZoneUserEvents);
         this.register(Email, EmailEvents);
         this.register(EmailAddress, EmailAddressEvents);
+        this.register(EmailAddressName, EmailAddressNameEvents);
         this.register(EmailEngagement, EmailEngagementEvents);
         this.register(EmailRecipient, EmailRecipientEvents);
         this.register(EmailTag, EmailTagEvents);

package/src/server/model/entities/EmailAddress.ts

@@ -9,6 +9,7 @@ import Domain from "./Domain.js";
 import type MailboxContact from "./MailboxContact.js";
 import type { ContactEmail } from "./Contact.js";
 import type SubscriberActivity from "./SubscriberActivity.js";
+import type EmailAddressName from "./EmailAddressName.js";
 
 @Table("EmailAddresses")
 @Index({
@@ -50,5 +51,6 @@ export default class EmailAddress {
     public contactEmails: ContactEmail[];
 
     public subscriberActivities: SubscriberActivity[];
+    names: EmailAddressName[];
 
 }

package/src/server/model/entities/EmailAddressName.ts

@@ -0,0 +1,37 @@
+import Column from "@entity-access/entity-access/dist/decorators/Column.js";
+import Table from "@entity-access/entity-access/dist/decorators/Table.js";
+import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
+import EmailAddress from "./EmailAddress.js";
+import Tag from "./Tag.js";
+
+/**
+ * This table exists as an index of all historical name tokens used in the email address.
+ *
+ * Akash @ Social Mail <akash@socialmail.me>
+ * Akash Kava <akash@socialmail.me>
+ * EmailAddressNameToken will contain ids of akash, kava, social, mail tokens
+ *
+ * Why not use FTS?
+ * FTS will not keep history, this table will keep history of names.
+ */
+
+@Table("EmailAddressNames")
+export default class EmailAddressName {
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(Tag, {
+        property: (x) => x.tag,
+        inverseProperty: (x) => x.emailAddressNames
+    })
+    tagID: number;
+
+    @Column({ dataType: "BigInt", key: true })
+    @RelateTo(EmailAddress, {
+        property: (x) => x.emailAddress,
+        inverseProperty: (x) => x.names
+    })
+    emailAddressID: number;
+
+    tag: Tag;
+    emailAddress: EmailAddress;
+}

package/src/server/model/entities/Tag.ts

@@ -5,11 +5,12 @@ import type AppFileTag from "./AppFileTag.js";
 import { RelateTo } from "@entity-access/entity-access/dist/decorators/Relate.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import type { ContactTag } from "./Contact.js";
-import { IgnoreJsonProperty, ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
+import { ReadOnlyJsonProperty } from "@entity-access/server-pages/dist/services/ModelService.js";
 import type MailboxContactTag from "./MailboxContactTag.js";
 import type EmailTag from "./EmailTag.js";
 import type { StoreItemFolderTag, StoreItemTag, StoreTag } from "./Store.js";
 import type MailboxFolder from "./MailboxFolder.js";
+import type EmailAddressName from "./EmailAddressName.js";
 
 /**
  * The reason tags table exists in form of string,bigint pair is, we need
@@ -83,4 +84,5 @@ export default class Tag {
     storeTags: StoreTag[];
     storeItemFolderTags: StoreItemFolderTag[];
     mailboxFolders: MailboxFolder[];
+    emailAddressNames: EmailAddressName[];
 }

package/src/server/model/events/EmailAddressNameEvents.ts

@@ -0,0 +1,14 @@
+import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
+import EmailAddressName from "../entities/EmailAddressName.js";
+import AuthenticatedEvents from "./AuthenticatedEvents.js";
+
+export default class EmailAddressNameEvents extends AuthenticatedEvents<EmailAddressName> {
+
+    filter(query: IEntityQuery<EmailAddressName>): IEntityQuery<EmailAddressName> {
+        if (this.verify) {
+            this.sessionUser.ensureLoggedIn();
+        }
+        return query.limit(20);
+    }
+
+}

package/src/server/seed/ui/seed-ui.ts

@@ -3,7 +3,7 @@ import semver from "semver";
 
 export default async function seedUI(config: DBConfig) {
 
-    const version = "1.2.502";
+    const version = "1.2.506";
 
     const existing = await config.getValue(UIPackageConfig, false);
     if (existing) {

package/src/server/services/EmailAddressService.ts

@@ -1,10 +1,12 @@
 /* eslint-disable no-console */
-import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { RegisterSingleton, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../model/SocialMailContext.js";
 import { globalServices } from "../../globalServices.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 import { cacheFor } from "../../common/cacheFor.js";
 import Domain from "../model/entities/Domain.js";
+import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
+import UpdateEmailAddressNameWorkflow from "../workflows/email-address/UpdateEmailAddressNameWorkflow.js";
 
 
 @RegisterSingleton
@@ -145,6 +147,8 @@ export default class EmailAddressService {
 
         emailAddress = emailAddress.trim().toLocaleLowerCase();
 
+        name = name?.trim();
+
         const tokens = emailAddress.split("@");
         if (tokens.length !== 2) {
             if (validate) {
@@ -182,9 +186,17 @@ export default class EmailAddressService {
                 // });
                 const ea = await db.emailAddresses.statements.selectOrInsert(changes, { emailAddress });
                 const hasMailbox = await db.mailboxes.where(ea, (p) => (x) => x.mailboxID === p.emailAddressID).some();
+                if (name && ea.name !== name) {
+                    // schedule for names tag
+                    const wc = ServiceProvider.resolve(this, WorkflowContext);
+                    await wc.queue(UpdateEmailAddressNameWorkflow, { id: ea.emailAddressID, name });
+                }
                 if(!hasMailbox && ((name && ea.name !== name) || ea.domainID !== domainID)) {
                     ea.name = name;
                     ea.domainID = domainID;
+
+                    // schedule tag updates...
+
                     await db.emailAddresses.statements.update(ea);
                     // await db.emailAddresses.saveDirect({
                     //     mode: "update",

package/src/server/workflows/email-address/UpdateEmailAddressNameWorkflow.ts

@@ -0,0 +1,30 @@
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import TagService from "../../services/tags/TagService.js";
+
+export default class UpdateEmailAddressNameWorkflow extends Workflow<{ id: number, name: string }> {
+
+    async run() {
+        await this.update();
+        return 1;
+    }
+
+    @UniqueActivity
+    async update(
+        @Inject db?: SocialMailContext,
+        @Inject ts?: TagService
+    ) {
+        const { id: emailAddressID } = this.input;
+        // split tags...
+        const tokens = this.input.name.split(/[^\p{L}]+/igmu);
+        for (const token of tokens) {
+            if (!token) {
+                continue;
+            }
+            const tagID = await ts.getSystemTagID(token);
+            await db.emailAddressNames.statements.selectOrInsert({ tagID, emailAddressID },{ tagID, emailAddressID });
+        }
+    }
+
+}

package/src/server/workflows/repair/tags/RepairEmailNameTagsWorkflow.ts

@@ -0,0 +1,57 @@
+import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
+import SocialMailContext from "../../../model/SocialMailContext.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Hashtags from "../../../../common/Hashtags.js";
+import TagService from "../../../services/tags/TagService.js";
+import { Email } from "../../../model/entities/Email.js";
+
+export default class RepairEmailNameTagsWorkflow extends Workflow {
+
+    static taskGroup = "batch";
+
+    async run() {
+        let start = 0;
+        do{
+            start = await this.fixEmailTags(start);
+        } while(BigInt(start));
+    }
+
+    @UniqueActivity
+    async fixEmailTags(
+        start: number,
+        @Inject db?: SocialMailContext,
+        @Inject ts?: TagService
+    ) {
+
+        for(let i = 0;i< 100;i++) {
+            const emails = await db.emailAddresses.where({ start }, (p) => (x) => x.emailAddressID > p.start)
+                .orderBy(void 0, (p) => (x) => x.emailAddressID)
+                .limit(10)
+                .toArray();
+
+            if (!emails.length) {
+                return 0;
+            }
+
+            for (const { emailAddressID, name } of emails) {
+                start = emailAddressID;
+                if (!name) {
+                    continue;
+                }
+                // fix tag...
+                const tokens = name.split(/[^\p{L}]+/igmu);
+                for (const token of tokens) {
+                    if (!token) {
+                        continue;
+                    }
+                    const tagID = await ts.getSystemTagID(token);
+                    await db.emailAddressNames.statements.selectOrInsert({ tagID, emailAddressID },{ tagID, emailAddressID });
+                }
+            }
+            db.changeSet.clear();
+        }
+        return start;
+    }
+
+
+}