better entre exist check

postalsys · Feb 21, 2024 · 1fc1298 · 1fc1298
1 parent 0d7bd4a
commit 1fc1298
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/lib/account.js b/lib/account.js
@@ -556,7 +556,7 @@ class Account {
         let retries = 0;
         while (retries++ < 20) {
             id = nanoid();
-            let alreadyExists = await this.redis.exists(`${REDIS_PREFIX}iad:${id}`);
+            let alreadyExists = await this.redis.hexists(`${REDIS_PREFIX}iad:${id}`, 'account');
             if (alreadyExists) {
                 id = false;
             } else {
@@ -1206,11 +1206,13 @@ class Account {
             options,
             timeout: this.timeout
         });
+
         if (!messageData) {
             let message = 'Requested message was not found';
             let error = Boom.boomify(new Error(message), { statusCode: 404 });
             throw error;
         }
+
         return messageData;
     }
 

diff --git a/lib/connection.js b/lib/connection.js
@@ -2878,6 +2878,7 @@ class Connection {
                 let content = await this.getAttachmentContent(attachment.reference, {
                     chunkSize: Math.max(DOWNLOAD_CHUNK_SIZE, 2 * 1024 * 1024)
                 });
+
                 if (!content) {
                     let error = new Error('Referenced attachment was not found');
                     error.code = 'ReferenceNotFound';

diff --git a/lib/gateway.js b/lib/gateway.js
@@ -80,7 +80,7 @@ class Gateway {
         let retries = 0;
         while (retries++ < 20) {
             id = nanoid();
-            let alreadyExists = await this.redis.exists(`${REDIS_PREFIX}iad:${id}`);
+            let alreadyExists = await this.redis.hexists(`${REDIS_PREFIX}gateway:${id}`, 'gateway');
             if (alreadyExists) {
                 id = false;
             } else {

diff --git a/workers/documents.js b/workers/documents.js
@@ -289,7 +289,7 @@ const documentsWorker = new Worker(
 
             // returns indexing response for the parent job
             case MESSAGE_NEW_NOTIFY: {
-                let accountExists = await redis.exists(`${REDIS_PREFIX}iad:${job.data.account}`);
+                let accountExists = await redis.hexists(`${REDIS_PREFIX}iad:${job.data.account}`, 'account');
                 if (!accountExists) {
                     // deleted account?
                     return false;
@@ -698,7 +698,7 @@ const documentsWorker = new Worker(
                     let messageData = job.data.data;
                     let messageId = messageData.id;
 
-                    let accountExists = await redis.exists(`${REDIS_PREFIX}iad:${job.data.account}`);
+                    let accountExists = await redis.hexists(`${REDIS_PREFIX}iad:${job.data.account}`, 'account');
                     if (!accountExists) {
                         // deleted account?
                         return;
@@ -805,7 +805,7 @@ ${Object.keys(params)
                         return;
                     }
 
-                    let accountExists = await redis.exists(`${REDIS_PREFIX}iad:${job.data.account}`);
+                    let accountExists = await redis.hexists(`${REDIS_PREFIX}iad:${job.data.account}`, 'account');
                     if (!accountExists) {
                         // deleted account?
                         return;

diff --git a/workers/webhooks.js b/workers/webhooks.js
@@ -105,7 +105,7 @@ const notifyWorker = new Worker(
         let accountKey = getAccountKey(job.data.account);
 
         // validate if we should even process this webhook
-        let accountExists = await redis.exists(accountKey);
+        let accountExists = await redis.hexists(accountKey, 'account');
         if (!accountExists && job.name !== ACCOUNT_DELETED_NOTIFY) {
             logger.debug({
                 msg: 'Account is not enabled',