@social-mail/social-mail-web-server 1.5.112 → 1.5.113

package/package.json

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

package/src/server/services/EmailAddressService.ts

@@ -166,6 +166,8 @@ export default class EmailAddressService {
 
         const domainID = await this.getOrCreateDomain(domainName);
 
+        name ||= username;
+
         for (let index = 0; index < 3; index++) {
             try {
 
@@ -190,8 +192,10 @@ export default class EmailAddressService {
                     // schedule for names tag
                     const wc = ServiceProvider.resolve(this, WorkflowContext);
                     await wc.queue(RepairEmailNameTagsWorkflow, { id: ea.emailAddressID, name });
-                    // we should try to save username as well but without stripping numbers
-                    await wc.queue(RepairEmailNameTagsWorkflow, { id: ea.emailAddressID, name:username, includeNumbers: true });
+                    if (name !== username) {
+                        // we should try to save username as well but without stripping numbers
+                        await wc.queue(RepairEmailNameTagsWorkflow, { id: ea.emailAddressID, name:username, includeNumbers: true });
+                    }
                 }
                 if(!hasMailbox && ((name && ea.name !== name) || ea.domainID !== domainID)) {
                     ea.name = name;

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

@@ -33,7 +33,7 @@ export default class RepairEmailNameTagsWorkflow extends Workflow<{ id: number,
         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)
+                .limit(50)
                 .toArray();
 
             if (!emails.length) {
@@ -42,10 +42,9 @@ export default class RepairEmailNameTagsWorkflow extends Workflow<{ id: number,
 
             for (const { emailAddressID, name, emailAddress } of emails) {
                 start = emailAddressID;
-                if (!name) {
-                    continue;
+                if (name) {
+                    await nts.updateName(name, { emailAddressID });
                 }
-                await nts.updateName(name, { emailAddressID });
                 const [username ] = emailAddress.split("@", 2);
                 await nts.updateName(username, { emailAddressID }, true);