bugfix/progress report showing inaccurate current scores

Author: lcampbell2

services/progress-report/src/notify/notify-send-org-progress-report.js

@@ -11,11 +11,11 @@ const sendOrgProgressReport = async ({ log, user, orgStats, notifyClient }) => {
         org_name_en: orgDetails.en.name,
         org_name_fr: orgDetails.fr.name,
         https_score: `${httpsScore}%`,
-        https_score_diff: httpsScoreDiff > 0 ? `+${httpsScoreDiff}%` : `${httpsScoreDiff}%`,
+        https_score_diff: httpsScoreDiff >= 0 ? `+${httpsScoreDiff}%` : `${httpsScoreDiff}%`,
         dmarc_score: `${dmarcScore}%`,
-        dmarc_score_diff: dmarcScoreDiff > 0 ? `+${dmarcScoreDiff}%` : `${dmarcScoreDiff}%`,
+        dmarc_score_diff: dmarcScoreDiff >= 0 ? `+${dmarcScoreDiff}%` : `${dmarcScoreDiff}%`,
         domain_count: domainCount,
-        domain_count_diff: domainCountDiff > 0 ? `+${domainCountDiff}` : domainCountDiff,
+        domain_count_diff: domainCountDiff >= 0 ? `+${domainCountDiff}` : domainCountDiff,
       },
     })
     log(`Successfully sent ${orgDetails.en.name} progress report via email to user:, ${user._key}`)

services/progress-report/src/progress-report-service.js

@@ -64,8 +64,8 @@ const calculateSummaryStats = ({ startSummary, endSummary }) => {
   const domainCountDiff = endSummary.dmarc.total - startSummary.dmarc.total
 
   return {
-    httpsScore: endHttpsScore.toFixed(1) * 100,
-    dmarcScore: endDmarcScore.toFixed(1) * 100,
+    httpsScore: (endHttpsScore * 100).toFixed(1),
+    dmarcScore: (endDmarcScore * 100).toFixed(1),
     domainCount: endSummary.dmarc.total,
     httpsScoreDiff: httpsScoreDiff.toFixed(1),
     dmarcScoreDiff: dmarcScoreDiff.toFixed(1),