From 389362f463f83e3b65c7df642118f849d19e1629 Mon Sep 17 00:00:00 2001 From: Barno <32536886+CarolBarno@users.noreply.github.com> Date: Thu, 2 Mar 2023 11:28:36 +0300 Subject: [PATCH] Replaced `Promise.props()` function with `.all()` in Members stats refs https://github.com/TryGhost/Ghost/issues/14882 - this helps remove uses of Bluebird within Ghost Co-authored-by: Carol-Barno --- .../services/members/stats/members-stats.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/ghost/core/core/server/services/members/stats/members-stats.js b/ghost/core/core/server/services/members/stats/members-stats.js index 938181eb80..20b25c49ed 100644 --- a/ghost/core/core/server/services/members/stats/members-stats.js +++ b/ghost/core/core/server/services/members/stats/members-stats.js @@ -1,5 +1,4 @@ const moment = require('moment-timezone'); -const Promise = require('bluebird'); const dateFormat = 'YYYY-MM-DD HH:mm:ss'; class MembersStats { @@ -131,14 +130,19 @@ class MembersStats { const totalMembers = await this.getTotalMembers(); // perform final calculations in parallel - const results = await Promise.props({ - total: totalMembers, - total_in_range: this.getTotalMembersInRange({days, totalMembers, siteTimezone}), - total_on_date: this.getTotalMembersOnDatesInRange({days, totalMembers, siteTimezone}), - new_today: this.getNewMembersToday({siteTimezone}) - }); + const [total, totalInRange, totalOnDate, newToday] = await Promise.all([ + totalMembers, + this.getTotalMembersInRange({days, totalMembers, siteTimezone}), + this.getTotalMembersOnDatesInRange({days, totalMembers, siteTimezone}), + this.getNewMembersToday({siteTimezone}) + ]); - return results; + return { + total, + total_in_range: totalInRange, + total_on_date: totalOnDate, + new_today: newToday + }; } }