fix: Final rename of error counting field

openedx · Jul 7, 2023 · 2cada4d · 2cada4d
1 parent 19cd49a
commit 2cada4d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/src/payment/data/__snapshots__/redux.test.js.snap b/src/payment/data/__snapshots__/redux.test.js.snap
@@ -9,7 +9,7 @@ Object {
     "paymentState": "checkout",
     "paymentStatePolling": Object {
       "keepPolling": false,
-      "retryCount": 5,
+      "retriesLeft": 5,
     },
     "products": Array [],
     "redirect": false,
@@ -36,7 +36,7 @@ Object {
     "paymentState": "checkout",
     "paymentStatePolling": Object {
       "keepPolling": false,
-      "retryCount": 5,
+      "retriesLeft": 5,
     },
     "products": Array [],
     "redirect": false,
@@ -63,7 +63,7 @@ Object {
     "paymentState": "checkout",
     "paymentStatePolling": Object {
       "keepPolling": false,
-      "retryCount": 5,
+      "retriesLeft": 5,
     },
     "products": Array [],
     "redirect": false,

diff --git a/src/payment/data/reducers.js b/src/payment/data/reducers.js
@@ -37,7 +37,7 @@ const paymentStatePollingInitialState = {
    * This is replaceable by a configuration value. (`PAYMENT_STATE_POLLING_MAX_ERRORS`),
    *     however, this is our default.
    */
-  retryCount: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
+  retriesLeft: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
 };
 
 /**
@@ -173,7 +173,7 @@ const clientSecret = (state = clientSecretInitialState, action = null) => {
  */
 export const paymentState = (state = basketInitialState, action = null) => {
   // noinspection JSUnresolvedReference
-  const maxErrors = getConfig().PAYMENT_STATE_POLLING_MAX_ERRORS || paymentStatePollingInitialState.retryCount;
+  const maxErrors = getConfig().PAYMENT_STATE_POLLING_MAX_ERRORS || paymentStatePollingInitialState.retriesLeft;
   const shouldPoll = (payState) => POLLING_PAYMENT_STATES.includes(payState);
 
   if (action !== null && action !== undefined) {
@@ -184,7 +184,7 @@ export const paymentState = (state = basketInitialState, action = null) => {
           paymentStatePolling: {
             ...state.paymentStatePolling,
             keepPolling: shouldPoll(state.paymentState),
-            retryCount: maxErrors,
+            retriesLeft: maxErrors,
           },
         };
 
@@ -195,7 +195,7 @@ export const paymentState = (state = basketInitialState, action = null) => {
           paymentStatePolling: {
             ...state.paymentStatePolling,
             keepPolling: false,
-            retryCount: maxErrors,
+            retriesLeft: maxErrors,
           },
         };
 
@@ -205,20 +205,20 @@ export const paymentState = (state = basketInitialState, action = null) => {
           paymentStatePolling: {
             ...state.paymentStatePolling,
             keepPolling: false,
-            retryCount: maxErrors,
+            retriesLeft: maxErrors,
           },
         };
 
       case pollPaymentState.RECEIVED: {
         const isHttpError = action.payload.state === PAYMENT_STATE.HTTP_ERROR;
-        const currRetryCnt = (isHttpError ? state.paymentStatePolling.retryCount - 1 : maxErrors);
+        const currRetriesLeft = (isHttpError ? state.paymentStatePolling.retriesLeft - 1 : maxErrors);
         return {
           ...state,
           paymentState: action.payload.state,
           paymentStatePolling: {
             ...state.paymentStatePolling,
-            keepPolling: currRetryCnt > 0 && shouldPoll(action.payload.state),
-            retryCount: currRetryCnt,
+            keepPolling: currRetriesLeft > 0 && shouldPoll(action.payload.state),
+            retriesLeft: currRetriesLeft,
           },
         };
       }

diff --git a/src/payment/data/redux.test.js b/src/payment/data/redux.test.js
@@ -113,7 +113,7 @@ describe('redux tests', () => {
           isRedirect: false,
           paymentState: PAYMENT_STATE.DEFAULT,
           paymentStatePolling: {
-            retryCount: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
+            retriesLeft: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
             keepPolling: false,
           },
         });
@@ -138,7 +138,7 @@ describe('redux tests', () => {
           isRedirect: true, // this is also now true.
           paymentState: PAYMENT_STATE.DEFAULT,
           paymentStatePolling: {
-            retryCount: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
+            retriesLeft: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
             keepPolling: false,
           },
         });
@@ -293,12 +293,12 @@ describe('redux tests', () => {
           triggerStore.dispatch(pollPaymentState.received({ state: PAYMENT_STATE.HTTP_ERROR }));
           expect(triggerStore.getState().payment.basket.paymentStatePolling.keepPolling)
             .toBe(expectedCount > 0);
-          expect(triggerStore.getState().payment.basket.paymentStatePolling.retryCount)
+          expect(triggerStore.getState().payment.basket.paymentStatePolling.retriesLeft)
             .toBe(expectedCount);
         }
 
         expect(triggerStore.getState().payment.basket.paymentStatePolling.keepPolling).toBe(false);
-        expect(triggerStore.getState().payment.basket.paymentStatePolling.retryCount)
+        expect(triggerStore.getState().payment.basket.paymentStatePolling.retriesLeft)
           .toBe(0);
 
         triggerStore.dispatch(pollPaymentState.failure(Error('Too many HTTP errors!')));

diff --git a/src/payment/data/sagas.js b/src/payment/data/sagas.js
@@ -368,9 +368,9 @@ export function* handlePaymentState() {
 
         yield put(pollPaymentState.received({ state: PAYMENT_STATE.HTTP_ERROR }));
 
-        const currentRetryCount = yield select(state => state.payment.basket.paymentStatePolling.retryCount);
+        const retriesLeft = yield select(state => state.payment.basket.paymentStatePolling.retriesLeft);
 
-        if (currentRetryCount === 0) {
+        if (retriesLeft === 0) {
           // noinspection ExceptionCaughtLocallyJS
           throw innerError;
         }

diff --git a/src/payment/data/sagas.test.js b/src/payment/data/sagas.test.js
@@ -885,7 +885,7 @@ describe('saga tests', () => {
       paymentState: inPaymentState,
       paymentStatePolling: {
         keepPolling: false,
-        retryCount: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
+        retriesLeft: DEFAULT_PAYMENT_STATE_POLLING_MAX_ERRORS,
       },
     });