From 58276d4ea3aa81662d9aa7d7cd5776040330f9a2 Mon Sep 17 00:00:00 2001 From: Stephen Cresswell <229672+cressie176@users.noreply.github.com> Date: Sat, 16 Sep 2023 16:24:11 +0100 Subject: [PATCH] Refactor --- lib/ManagedResources.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/ManagedResources.js b/lib/ManagedResources.js index d6746af..cb482dd 100644 --- a/lib/ManagedResources.js +++ b/lib/ManagedResources.js @@ -36,10 +36,9 @@ module.exports = class ManagedResources { } async destroyIdleResources() { - const destroys = this.#list.map((managedResource, index) => { - if (!managedResource.isIdle()) return; - return this.destroy(managedResource.resource).then(() => this.#removeManagedResource(managedResource, index)); - }); + const destroys = this.#list.map((managedResource, index) => (managedResource.isIdle() + ? managedResource.destroy().then(() => this.#removeManagedResource(managedResource, index)) + : Promise.resolve())); return Promise.all(destroys); } @@ -62,7 +61,7 @@ module.exports = class ManagedResources { } hasIdleResources() { - return Boolean(this.getIdleManagedResource()); + return this.#list.some((managedResource) => managedResource.isIdle()); } getIdleManagedResource() { @@ -70,7 +69,7 @@ module.exports = class ManagedResources { } hasAcquiredResources() { - return Boolean(this.#list.find((managedResource) => managedResource.isAcquired())); + return this.#list.some((managedResource) => managedResource.isAcquired()); } hasSpareCapacity() {