fix(cache): remove previous data or error on new run (#66)

americanexpress · Sep 23, 2022 · f921ef3 · f921ef3
1 parent 902c677
commit f921ef3
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 4 deletions.
diff --git a/packages/fetchye-immutable-cache/__tests__/__snapshots__/ImmutableCache.spec.js.snap b/packages/fetchye-immutable-cache/__tests__/__snapshots__/ImmutableCache.spec.js.snap
@@ -105,3 +105,29 @@ Immutable.Map {
   "data": Immutable.Map {},
 }
 `;
+
+exports[`ImmutableCache should reflect load to error to success state 1`] = `
+Immutable.Map {
+  "errors": Immutable.Map {},
+  "loading": Immutable.Set [],
+  "data": Immutable.Map {
+    "abc1234": Object {
+      "body": Object {
+        "fakeData": true,
+      },
+      "ok": true,
+      "status": 200,
+    },
+  },
+}
+`;
+
+exports[`ImmutableCache should reflect load to success to error state 1`] = `
+Immutable.Map {
+  "errors": Immutable.Map {
+    "abc1234": [Error: Fake Error],
+  },
+  "loading": Immutable.Set [],
+  "data": Immutable.Map {},
+}
+`;
diff --git a/packages/fetchye-immutable-cache/__tests__/reducer.spec.js b/packages/fetchye-immutable-cache/__tests__/reducer.spec.js
@@ -21,7 +21,6 @@ import {
   deleteAction,
   errorAction,
   clearErrorsAction,
-
 } from 'fetchye-core';
 import reducer from '../src/reducer';
 
@@ -127,6 +126,38 @@ describe('Immutable Reducer', () => {
       }
     `);
   });
+  it('should reflect load to success to error state', () => {
+    const { dispatch, getState } = store;
+    createScenario(dispatch, ['loadingAction', 'setAction', 'errorAction'], 'abc1234');
+    expect(getState()).toMatchInlineSnapshot(`
+      Immutable.Map {
+        "errors": Immutable.Map {
+          "abc1234": [Error: Fake Error],
+        },
+        "loading": Immutable.Set [],
+        "data": Immutable.Map {},
+      }
+    `);
+  });
+  it('should reflect load to error to success state', () => {
+    const { dispatch, getState } = store;
+    createScenario(dispatch, ['loadingAction', 'errorAction', 'setAction'], 'abc1234');
+    expect(getState()).toMatchInlineSnapshot(`
+      Immutable.Map {
+        "errors": Immutable.Map {},
+        "loading": Immutable.Set [],
+        "data": Immutable.Map {
+          "abc1234": Object {
+            "body": Object {
+              "fakeData": true,
+            },
+            "ok": true,
+            "status": 200,
+          },
+        },
+      }
+    `);
+  });
   it('should reflect multiple hashes stored', () => {
     const { dispatch, getState } = store;
     createScenario(dispatch, ['loadingAction', 'setAction'], 'abc1234');

diff --git a/packages/fetchye-immutable-cache/src/reducer.js b/packages/fetchye-immutable-cache/src/reducer.js
@@ -43,15 +43,17 @@ export function fetchyeReducer(state = iMap({
       return state.withMutations(
         (nextState) => nextState
           .setIn(['errors', action.hash], action.error)
+          .deleteIn(['data', action.hash])
           .deleteIn(['loading', action.hash])
       );
     case IS_LOADING:
       return state.updateIn(['loading'], (loading) => loading.add(action.hash));
     case SET_DATA:
       return state.withMutations(
         (nextState) => nextState
-          .deleteIn(['loading', action.hash])
           .setIn(['data', action.hash], action.value)
+          .deleteIn(['loading', action.hash])
+          .deleteIn(['errors', action.hash])
       );
     default:
       return state;

diff --git a/packages/fetchye-test-utils/src/testCacheInterface.js b/packages/fetchye-test-utils/src/testCacheInterface.js
@@ -88,6 +88,16 @@ export function testCacheInterface(CacheFunc) {
     createScenario(dispatch, ['loadingAction', 'errorAction', 'clearErrorsAction'], 'abc1234');
     expect(getState()).toMatchSnapshot();
   });
+  it('should reflect load to success to error state', () => {
+    const { dispatch, getState } = store;
+    createScenario(dispatch, ['loadingAction', 'setAction', 'errorAction'], 'abc1234');
+    expect(getState()).toMatchSnapshot();
+  });
+  it('should reflect load to error to success state', () => {
+    const { dispatch, getState } = store;
+    createScenario(dispatch, ['loadingAction', 'errorAction', 'setAction'], 'abc1234');
+    expect(getState()).toMatchSnapshot();
+  });
   it('reflects multiple hashes stored', () => {
     const { dispatch, getState } = store;
     createScenario(dispatch, ['loadingAction', 'setAction'], 'abc1234');

diff --git a/packages/fetchye/__tests__/__snapshots__/SimpleCache.spec.js.snap b/packages/fetchye/__tests__/__snapshots__/SimpleCache.spec.js.snap
@@ -105,3 +105,29 @@ Object {
   "loading": Object {},
 }
 `;
+
+exports[`SimpleCache should reflect load to error to success state 1`] = `
+Object {
+  "data": Object {
+    "abc1234": Object {
+      "body": Object {
+        "fakeData": true,
+      },
+      "ok": true,
+      "status": 200,
+    },
+  },
+  "errors": Object {},
+  "loading": Object {},
+}
+`;
+
+exports[`SimpleCache should reflect load to success to error state 1`] = `
+Object {
+  "data": Object {},
+  "errors": Object {
+    "abc1234": [Error: Fake Error],
+  },
+  "loading": Object {},
+}
+`;
diff --git a/packages/fetchye/src/SimpleCache.js b/packages/fetchye/src/SimpleCache.js
@@ -53,9 +53,13 @@ function reducer(state = {
       };
     }
     case ERROR: {
-      const { [action.hash]: deletedEntry, ...nextLoading } = state.loading;
+      const { [action.hash]: deletedLoadingEntry, ...nextLoading } = state.loading;
+      const { [action.hash]: deletedDataEntry, ...nextData } = state.data;
       return {
         ...state,
+        data: {
+          ...nextData,
+        },
         errors: {
           ...state.errors,
           [action.hash]: action.error,
@@ -75,13 +79,17 @@ function reducer(state = {
       };
     }
     case SET_DATA: {
-      const { [action.hash]: deletedEntry, ...nextLoading } = state.loading;
+      const { [action.hash]: deletedLoadingEntry, ...nextLoading } = state.loading;
+      const { [action.hash]: deletedErrorEntry, ...nextErrors } = state.errors;
       return {
         ...state,
         data: {
           ...state.data,
           [action.hash]: action.value,
         },
+        errors: {
+          ...nextErrors,
+        },
         loading: {
           ...nextLoading,
         },