refactor: move stories normalize and denormalize functions from model…

…s to reducers
Codeminer42 · Nov 3, 2023 · 8515d58 · 8515d58
1 parent 6ce9990
commit 8515d58
Show file tree

Hide file tree

Showing 9 changed files with 306 additions and 349 deletions.
diff --git a/app/assets/javascripts/actions/story.js b/app/assets/javascripts/actions/story.js
@@ -6,7 +6,7 @@ import {
 } from "./notifications";
 import { wait } from "../services/promises";
 import { storyScopes } from "../libs/beta/constants";
-import { getStoriesByScope } from "../selectors/stories";
+import { storiesWithScope } from "../reducers/stories";
 
 export const createStory = (attributes, from) => ({
   type: actionTypes.CREATE_STORY,
@@ -155,7 +155,7 @@ export const showHistory =
   async (dispatch, getState, { Story }) => {
     const { stories, users } = getState();
 
-    const story = Story.findById(getStoriesByScope(stories, from), storyId);
+    const story = Story.findById(storiesWithScope(stories, from), storyId);
     dispatch(loadHistory(story.title));
     try {
       const activities = await Story.getHistory(
@@ -175,7 +175,7 @@ export const updateCollapsedStory =
   async (dispatch, getState, { Story }) => {
     const { stories } = getState();
 
-    const story = Story.findById(getStoriesByScope(stories, from), storyId);
+    const story = Story.findById(storiesWithScope(stories, from), storyId);
     const newStory = { ...story, ...newAttributes };
 
     return await confirmBeforeSaveIfNeeded(
@@ -223,7 +223,7 @@ export const dragDropStory =
   async (dispatch, getState, { Story }) => {
     const { stories } = getState();
 
-    const story = Story.findById(getStoriesByScope(stories, from), storyId);
+    const story = Story.findById(storiesWithScope(stories, from), storyId);
 
     const newStory = Story.addNewAttributes(story, newAttributes);
 
@@ -245,7 +245,7 @@ export const saveStory =
   async (dispatch, getState, { Story }) => {
     const { stories } = getState();
 
-    const story = Story.findById(getStoriesByScope(stories, from), storyId);
+    const story = Story.findById(storiesWithScope(stories, from), storyId);
 
     dispatch(setLoadingStory(story.id, from));
 
@@ -347,7 +347,7 @@ export const deleteStory =
       const { stories } = getState();
 
       const storyTitle = Story.findById(
-        getStoriesByScope(stories, from),
+        storiesWithScope(stories, from),
         storyId
       ).title;
 

diff --git a/app/assets/javascripts/models/beta/story.js b/app/assets/javascripts/models/beta/story.js
@@ -469,48 +469,3 @@ export const donePoints = (stories) =>
 
 export const remainingPoints = (stories) =>
   totalPoints(stories) - donePoints(stories);
-
-export const normalizeStories = (stories) => {
-  return stories.reduce(
-    (acc, story) => {
-      const storyId = story.id;
-
-      acc.stories.byId[storyId] = { ...story };
-      acc.stories.allIds.push(storyId);
-
-      return acc;
-    },
-    {
-      stories: {
-        byId: {},
-        allIds: [],
-      },
-    }
-  );
-};
-
-export const denormalizeStories = (stories) => {
-  const normalizedStories = stories.stories;
-
-  if (!normalizedStories || normalizedStories.allIds.length === 0) {
-    return [];
-  }
-
-  const denormalizedStories = normalizedStories.allIds.map((storyId) => {
-    return normalizedStories.byId[storyId];
-  });
-
-  return denormalizedStories;
-};
-
-export const denormalizeState = (state) => ({
-  epic: denormalizeStories(state[storyScopes.EPIC]),
-  all: denormalizeStories(state[storyScopes.ALL]),
-  search: denormalizeStories(state[storyScopes.SEARCH]),
-});
-
-export const normalizeState = (state) => ({
-  epic: normalizeStories(state[storyScopes.EPIC]),
-  all: normalizeStories(state[storyScopes.ALL]),
-  search: normalizeStories(state[storyScopes.SEARCH]),
-});
diff --git a/app/assets/javascripts/reducers/pastIterations.js b/app/assets/javascripts/reducers/pastIterations.js
@@ -119,7 +119,7 @@ const denormalizePastIterations = (pastIterations) => {
   return denormalizedPastIterations;
 };
 
-export const getDenormalizedIterations = (pastIterations) =>
+export const denormalizedIterations = (pastIterations) =>
   denormalizePastIterations(pastIterations);
 
 export default pastIterationsReducer;
diff --git a/app/assets/javascripts/reducers/stories.js b/app/assets/javascripts/reducers/stories.js
@@ -16,15 +16,7 @@ import * as Task from "models/beta/task";
 import * as Label from "models/beta/label";
 import { updateIfSameId } from "../services/updateIfSameId";
 import { storyScopes } from "./../libs/beta/constants";
-import {
-  denormalizeStories,
-  isEpic,
-  isSearch,
-  normalizeStories,
-  isNew,
-  normalizeState,
-} from "../models/beta/story";
-import { getStoriesByScope } from "../selectors/stories";
+import { isEpic, isSearch, isNew } from "../models/beta/story";
 
 const initialState = {
   [storyScopes.ALL]: {},
@@ -129,7 +121,7 @@ const storiesReducer = (state = initialState, action) => {
         ),
       };
     case actionTypes.UPDATE_STORY_SUCCESS:
-      return normalizeState(
+      return normalizeAllScopes(
         allScopes(state, action.story.id, (stories) => {
           return stories.map(
             updateIfSameId(action.story.id, (story) =>
@@ -143,7 +135,7 @@ const storiesReducer = (state = initialState, action) => {
         })
       );
     case actionTypes.SORT_STORIES_SUCCESS:
-      return normalizeState(
+      return normalizeAllScopes(
         allScopes(state, null, (stories) => {
           return stories.map((story) => {
             const editingStory = action.stories.find(
@@ -161,7 +153,7 @@ const storiesReducer = (state = initialState, action) => {
         })
       );
     case actionTypes.OPTIMISTICALLY_UPDATE:
-      return normalizeState(
+      return normalizeAllScopes(
         allScopes(state, action.story.id, (stories) => {
           return stories.map(
             updateIfSameId(action.story.id, (story) => {
@@ -226,7 +218,7 @@ const storiesReducer = (state = initialState, action) => {
         ),
       };
     case actionTypes.DELETE_STORY_SUCCESS:
-      return normalizeState(
+      return normalizeAllScopes(
         allScopes(state, action.id, (stories) => {
           return stories.filter((story) => story.id !== action.id);
         })
@@ -317,11 +309,9 @@ const withScope = (reducer) => (state, action) => {
 };
 
 const allScopes = (stories, storyId, mutation) => ({
-  [storyScopes.ALL]: mutation(getStoriesByScope(stories, storyScopes.ALL)),
-  [storyScopes.SEARCH]: mutation(
-    getStoriesByScope(stories, storyScopes.SEARCH)
-  ),
-  [storyScopes.EPIC]: mutation(getStoriesByScope(stories, storyScopes.EPIC)),
+  [storyScopes.ALL]: mutation(storiesWithScope(stories, storyScopes.ALL)),
+  [storyScopes.SEARCH]: mutation(storiesWithScope(stories, storyScopes.SEARCH)),
+  [storyScopes.EPIC]: mutation(storiesWithScope(stories, storyScopes.EPIC)),
 });
 
 const mergeWithFetchedStories = (currentStories, fetchedStories) => {
@@ -421,4 +411,54 @@ const filterAndRemoveStories = (mergedStories, fetchedStories) => {
   return updatedMergedStories;
 };
 
+const normalizeStories = (stories) => {
+  return stories.reduce(
+    (acc, story) => {
+      const storyId = story.id;
+
+      acc.stories.byId[storyId] = { ...story };
+      acc.stories.allIds.push(storyId);
+
+      return acc;
+    },
+    {
+      stories: {
+        byId: {},
+        allIds: [],
+      },
+    }
+  );
+};
+
+const denormalizeStories = (stories) => {
+  const normalizedStories = stories.stories;
+
+  if (!normalizedStories || normalizedStories.allIds.length === 0) {
+    return [];
+  }
+
+  const denormalizedStories = normalizedStories.allIds.map((storyId) => {
+    return normalizedStories.byId[storyId];
+  });
+
+  return denormalizedStories;
+};
+
+export const storiesWithScope = (state, scope) => {
+  const stories = state[scope || storyScopes.ALL];
+  return denormalizeStories(stories);
+};
+
+export const denormalizeAllScopes = (state) => ({
+  epic: storiesWithScope(state, storyScopes.EPIC),
+  all: storiesWithScope(state, storyScopes.ALL),
+  search: storiesWithScope(state, storyScopes.SEARCH),
+});
+
+const normalizeAllScopes = (state) => ({
+  epic: normalizeStories(state[storyScopes.EPIC]),
+  all: normalizeStories(state[storyScopes.ALL]),
+  search: normalizeStories(state[storyScopes.SEARCH]),
+});
+
 export default withScope(storiesReducer);
diff --git a/app/assets/javascripts/selectors/columns.js b/app/assets/javascripts/selectors/columns.js
@@ -4,8 +4,8 @@ import { mountPastIterations } from "./done";
 import * as Column from "../models/beta/column";
 import { comparePosition } from "../models/beta/story";
 import { property, last } from "underscore";
-import { getStoriesByScope } from "./stories";
-import { getDenormalizedIterations } from "../reducers/pastIterations";
+import { denormalizedIterations } from "../reducers/pastIterations";
+import { storiesWithScope } from "../reducers/stories";
 
 const getStories = property("stories");
 const getColumn = property("column");
@@ -17,19 +17,17 @@ export const getColumns = createSelector(
   (column, stories, project, pastIterations) => {
     switch (column) {
       case Column.CHILLY_BIN:
-        return getStoriesByScope(stories)
+        return storiesWithScope(stories)
           .filter(Column.isChillyBin)
           .sort(comparePosition);
       case Column.BACKLOG:
         const orderedStories = orderByState(
-          getStoriesByScope(stories).filter((story) =>
+          storiesWithScope(stories).filter((story) =>
             Column.isBacklog(story, project)
           )
         );
 
-        const lastPastIteration = last(
-          getDenormalizedIterations(pastIterations)
-        );
+        const lastPastIteration = last(denormalizedIterations(pastIterations));
         const firstSprintNumber = lastPastIteration
           ? lastPastIteration.iterationNumber + 1
           : 1;
@@ -40,11 +38,11 @@ export const getColumns = createSelector(
         );
       case Column.DONE:
         return mountPastIterations(
-          getDenormalizedIterations(pastIterations),
-          getStoriesByScope(stories)
+          denormalizedIterations(pastIterations),
+          storiesWithScope(stories)
         );
       case Column.EPIC:
-        return getStoriesByScope(stories, Column.EPIC);
+        return storiesWithScope(stories, Column.EPIC);
     }
   }
 );