From 5ab85256d1b4e1fad75c86626f03864be0f3cd30 Mon Sep 17 00:00:00 2001
From: Rogger Valverde <rogger.valverde@uni.pe>
Date: Fri, 4 Feb 2022 21:02:15 -0500
Subject: [PATCH] refactor(retry-jobs): create getZSetItems include script
 (#1052)

---
 src/commands/includes/getZSetItems.lua |  8 ++++++++
 src/commands/includes/removeJobs.lua   |  5 +----
 src/commands/retryJobs-4.lua           |  5 +----
 tests/test_worker.ts                   | 20 ++++++++++----------
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 src/commands/includes/getZSetItems.lua

diff --git a/src/commands/includes/getZSetItems.lua b/src/commands/includes/getZSetItems.lua
new file mode 100644
index 0000000000..171499f74d
--- /dev/null
+++ b/src/commands/includes/getZSetItems.lua
@@ -0,0 +1,8 @@
+
+--[[
+  Function to get ZSet items.
+]]
+
+local function getZSetItems(keyName, max)
+  return rcall('ZRANGE', keyName, 0, max - 1)
+end
diff --git a/src/commands/includes/removeJobs.lua b/src/commands/includes/removeJobs.lua
index 26b972f6d1..3feb7fe1b1 100644
--- a/src/commands/includes/removeJobs.lua
+++ b/src/commands/includes/removeJobs.lua
@@ -9,11 +9,8 @@ local function getListItems(keyName, max)
   return rcall('LRANGE', keyName, 0, max - 1)
 end
 
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
-
 --- @include "removeParentDependencyKey"
+--- @include "getZSetItems"
 
 local function removeJobs(keys, hard, baseKey, max)
   for i, key in ipairs(keys) do
diff --git a/src/commands/retryJobs-4.lua b/src/commands/retryJobs-4.lua
index 306bc6c685..17e2862a19 100644
--- a/src/commands/retryJobs-4.lua
+++ b/src/commands/retryJobs-4.lua
@@ -20,10 +20,7 @@ local rcall = redis.call;
 
 -- Includes
 --- @include "includes/batches"
-
-local function getZSetItems(keyName, max)
-  return rcall('ZRANGE', keyName, 0, max - 1)
-end
+--- @include "includes/getZSetItems"
 
 local jobs = getZSetItems(KEYS[3], maxCount)
 
diff --git a/tests/test_worker.ts b/tests/test_worker.ts
index fae701e637..0d54fc57aa 100644
--- a/tests/test_worker.ts
+++ b/tests/test_worker.ts
@@ -38,14 +38,14 @@ describe('workers', function () {
   });
 
   it('should get all workers for this queue', async function () {
-    const worker = new Worker(queueName, async job => {}, { connection });
+    const worker = new Worker(queueName, async () => {}, { connection });
     await worker.waitUntilReady();
     await delay(10);
 
     const workers = await queue.getWorkers();
     expect(workers).to.have.length(1);
 
-    const worker2 = new Worker(queueName, async job => {}, { connection });
+    const worker2 = new Worker(queueName, async () => {}, { connection });
     await worker2.waitUntilReady();
     await delay(10);
 
@@ -59,8 +59,8 @@ describe('workers', function () {
   it('should get only workers related only to one queue', async function () {
     const queueName2 = `${queueName}2`;
     const queue2 = new Queue(queueName2, { connection });
-    const worker = new Worker(queueName, async job => {}, { connection });
-    const worker2 = new Worker(queueName2, async job => {}, { connection });
+    const worker = new Worker(queueName, async () => {}, { connection });
+    const worker2 = new Worker(queueName2, async () => {}, { connection });
     await worker.waitUntilReady();
     await worker2.waitUntilReady();
 
@@ -135,7 +135,7 @@ describe('workers', function () {
       worker.close();
 
       await new Promise<void>(resolve => {
-        worker.once('completed', async (job, err) => {
+        worker.once('completed', async job => {
           expect(job).to.be.ok;
           expect(job.finishedOn).to.be.string;
           expect(job.data.foo).to.be.eql('bar');
@@ -760,7 +760,7 @@ describe('workers', function () {
     describe('when run method is called when worker is running', function () {
       it('throws error', async () => {
         const maxJobs = 10;
-        const worker = new Worker(queueName, async (job: Job) => {}, {
+        const worker = new Worker(queueName, async () => {}, {
           autorun: false,
         });
         await worker.waitUntilReady();
@@ -853,7 +853,7 @@ describe('workers', function () {
 
     await Promise.all(jobs);
 
-    const worker = new Worker(queueName, async job => {});
+    const worker = new Worker(queueName, async () => {});
     await worker.waitUntilReady();
 
     await new Promise(resolve => {
@@ -896,7 +896,7 @@ describe('workers', function () {
   it('process a job that returns a string in the process handler', async () => {
     const testString = 'a very dignified string';
 
-    const worker = new Worker(queueName, async job => {
+    const worker = new Worker(queueName, async () => {
       return testString;
     });
     await worker.waitUntilReady();
@@ -1017,7 +1017,7 @@ describe('workers', function () {
 
     const addedJob = await queue.add('test', { foo: 'bar' });
 
-    const anotherWorker = new Worker(queueName, async job => {
+    const anotherWorker = new Worker(queueName, async () => {
       err = new Error(
         'The second queue should not have received a job to process',
       );
@@ -1311,7 +1311,7 @@ describe('workers', function () {
 
     const worker = new Worker(
       queueName,
-      async job => {
+      async () => {
         if (first) {
           first = false;
           return delay(2000);