Merge pull request #1372 from javiteri95/deletePermanentBug2

Delete permanent bug2

Author: Hirobreak

electron_app/src/__integrations__/Email.integration.js

@@ -677,8 +677,8 @@ describe('Update data email to Email Table:', () => {
 describe('Delete emails from Email Table:', () => {
   it('Should delete email from DB by key', async () => {
     const keysToDelete = [emailSpam.email.key];
-    const result = await DBManager.deleteEmailByKeys(keysToDelete);
-    expect(result).toBe(1);
+    await DBManager.deleteEmailByKeys(keysToDelete);
+
     const [email] = await DBManager.getEmailByKey(emailSpam.email.key);
     expect(email).toBeUndefined();
   });
@@ -695,6 +695,91 @@ describe('Delete emails from Email Table:', () => {
     expect(result).toBe(1);
   });
 
+  it('Should delete email from DB by key, its emailLabel, emailContact, its files and feeds', async () => {
+    const emailToDelete = {
+      email: {
+        threadId: 'threadZ',
+        key: '30',
+        subject: 'A email to delete',
+        content: '<p>A email to delete</p>',
+        preview: 'A email to delete',
+        date: '2019-11-14 08:23:19.120',
+        status: 0,
+        unread: true,
+        secure: true,
+        unsentDate: '2019-12-14 08:23:30.000',
+        messageId: 'messageIdZ',
+        fromAddress: 'User Z <[email protected]>'
+      },
+      recipients: {
+        from: ['User Z <[email protected]>'],
+        to: Array(400)
+          .fill()
+          .map((e, i) => `fake${i}@faker.com`),
+        cc: ['[email protected]'],
+        bcc: ['[email protected]']
+      },
+      labels: [1],
+      files: [
+        {
+          token: 'tokenZ',
+          name: 'Criptext_Image_2018_06_14.png',
+          readOnly: false,
+          size: 183241,
+          status: 1,
+          date: '2018-06-14T23:45:57.466Z',
+          mimeType: 'image/png'
+        }
+      ]
+    };
+
+    const theEmail = await DBManager.createEmail(emailToDelete); //this create emailLabel, emailContact, and files
+
+    const feeditem = {
+      date: '2018-06-14 08:23:19.120',
+      type: 7,
+      emailId: theEmail.id,
+      contactId: 1
+    };
+
+    const feedItemCreated = await DBManager.createFeedItem(feeditem);
+    expect(feedItemCreated).toHaveProperty('contactId');
+    expect(feedItemCreated).toHaveProperty('emailId');
+
+    const keyToDelete = [emailToDelete.email.key];
+    const emailContactExist = await DBManager.getContactsByEmailId(theEmail.id);
+    expect(emailContactExist.to).not.toHaveLength(0);
+    expect(emailContactExist.cc).not.toHaveLength(0);
+    expect(emailContactExist.bcc).not.toHaveLength(0);
+    expect(emailContactExist.from).not.toHaveLength(0);
+    const emailLabelsExist = await DBManager.getEmailLabelsByEmailId(
+      theEmail.id
+    );
+    expect(emailLabelsExist).not.toHaveLength(0);
+    const filesExist = await DBManager.getFilesByEmailId(theEmail.id);
+    expect(filesExist).not.toHaveLength(0);
+    await DBManager.deleteEmailByKeys(keyToDelete);
+
+    const [email] = await DBManager.getEmailByKey(emailToDelete.email.key);
+    expect(email).toBeUndefined();
+
+    const feedItemsDeleted = await DBManager.getAllFeedItems();
+    expect(feedItemsDeleted).toHaveLength(0);
+    const emailContactDeleted = await DBManager.getContactsByEmailId(
+      theEmail.id
+    );
+    expect(emailContactDeleted.to).toHaveLength(0);
+    expect(emailContactDeleted.cc).toHaveLength(0);
+    expect(emailContactDeleted.bcc).toHaveLength(0);
+    expect(emailContactDeleted.from).toHaveLength(0);
+    const emailLabelDeleted = await DBManager.getEmailLabelsByEmailId(
+      theEmail.id
+    );
+    expect(emailLabelDeleted).toHaveLength(0);
+    const filesExistDeleted = await DBManager.getFilesByEmailId(theEmail.id);
+    expect(filesExistDeleted).toHaveLength(0);
+  });
+
   it('Should not delete emails from DB by ids', async () => {
     const idsToDelete = [emailIdToDelete];
     const result = await DBManager.deleteEmailsByIds(idsToDelete);

electron_app/src/database/DBEmanager.js

@@ -272,12 +272,53 @@ const createEmail = (params, prevTrx) => {
   });
 };
 
-const deleteEmailByKeys = keys => {
-  return Email().destroy({ where: { key: keys } });
+const getKeys = (keys, trx) => {
+  return Email()
+    .findAll({
+      attributes: ['id'],
+      where: { key: keys },
+      raw: true,
+      transaction: trx
+    })
+    .then(list => list);
+};
+
+const deleteEmailByKeys = async keys => {
+  return await getDB().transaction(async trx => {
+    const ids = await getKeys(keys, trx).map(el1 => el1.id);
+    return Feeditem()
+      .destroy({ where: { emailId: ids }, transaction: trx })
+      .then(() => {
+        return EmailContact().destroy({
+          where: { emailId: ids },
+          transaction: trx
+        });
+      })
+      .then(() => {
+        return EmailLabel().destroy({
+          where: { emailId: ids },
+          transaction: trx
+        });
+      })
+      .then(() => {
+        return File().destroy({ where: { emailId: ids }, transaction: trx });
+      })
+      .then(() => {
+        return Email().destroy({
+          where: { id: ids },
+          transaction: trx
+        });
+      })
+      .catch(ex => console.log(ex)); //To do
+  });
 };
 
 const deleteEmailsByIds = (ids, trx) => {
-  return Email().destroy({ where: { id: ids }, transaction: trx });
+  return Email().destroy({
+    where: { id: ids },
+    transaction: trx,
+    cascade: true
+  });
 };
 
 const deleteEmailsByThreadIdAndLabelId = (threadIds, labelId) => {

electron_app/src/ipc/manager.js

@@ -31,6 +31,7 @@ ipc.answerRenderer(
           })
         )
       );
+      await dbManager.deleteEmailByKeys(emailKeys);
     }
     await dbManager.deleteEmailsByThreadIdAndLabelId(threadIds, labelId);
   }

email_mailbox/src/containers/ActivityPanel.js

@@ -18,9 +18,11 @@ const mapStateToProps = state => {
   const orderedFeeds = orderFeedsByDate(feeds);
   const { newFeeds, oldFeeds } = clasifyFeeds(orderedFeeds);
   const newFeedsPlain = newFeeds.toJS();
-  const feedItemIds = newFeedsPlain.map(feedItem => feedItem.id);
+  const feedItemIds = newFeedsPlain
+    .filter(feedItem => feedItem.emailData)
+    .map(feedItem => feedItem.id);
   return {
-    newFeeds: newFeedsPlain,
+    newFeeds: newFeedsPlain.filter(item => item.emailData),
     oldFeeds: oldFeeds.toJS(),
     feedItemIds
   };