From f4367a0dbe6bfce30ab53dfc2bc1b4d4aaf1c4a3 Mon Sep 17 00:00:00 2001
From: CD Cabrera <ccabrera@redhat.com>
Date: Mon, 1 Aug 2022 12:33:47 -0400
Subject: [PATCH] fix(rhsmTransformers): sw-43 patch isFutureDate,
 isCurrentDate (#963)

* rhsmTransformers, correctly apply date diff
---
 src/services/rhsm/rhsmTransformers.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/services/rhsm/rhsmTransformers.js b/src/services/rhsm/rhsmTransformers.js
index 4039b23f6..626a11cbd 100644
--- a/src/services/rhsm/rhsmTransformers.js
+++ b/src/services/rhsm/rhsmTransformers.js
@@ -67,7 +67,8 @@ const rhsmTally = response => {
   const updatedResponse = {};
   const { [rhsmConstants.RHSM_API_RESPONSE_DATA]: data = [], [rhsmConstants.RHSM_API_RESPONSE_META]: meta = {} } =
     response || {};
-  const currentDate = moment.utc(dateHelpers.getCurrentDate()).format('MM-D-YYYY');
+  const currentDate = moment.utc(dateHelpers.getCurrentDate());
+  const currentDateStr = moment.utc(dateHelpers.getCurrentDate()).format('MM-D-YYYY');
   let futureDateCount = 0;
 
   updatedResponse.data = data.map(
@@ -76,10 +77,10 @@ const rhsmTally = response => {
       index
     ) => {
       const updatedDate = moment.utc(date);
-      const isCurrentDate = updatedDate.format('MM-D-YYYY') === currentDate;
+      const isCurrentDate = updatedDate.format('MM-D-YYYY') === currentDateStr;
       const isFutureDate = updatedDate.diff(currentDate) > 0;
 
-      if (isFutureDate) {
+      if (isFutureDate && !isCurrentDate) {
         futureDateCount += 1;
       }