refactor(eventsSlice): replace useWeightsInPeriod with a new events…

…Slice selector
benji6 · Dec 28, 2023 · 9abf55c · 9abf55c
1 parent 643aa71
commit 9abf55c
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 23 deletions.
diff --git a/client/src/components/hooks/useWeightsInPeriod.ts b/client/src/components/hooks/useWeightsInPeriod.ts
diff --git a/client/src/components/pages/Stats/Explore/MoodSummaryForPeriod.tsx b/client/src/components/pages/Stats/Explore/MoodSummaryForPeriod.tsx
@@ -5,10 +5,10 @@ import {
 } from "../../../../utils";
 import MoodSummary from "../../../shared/MoodSummary";
 import { Paper } from "eri";
+import { RootState } from "../../../../store";
 import eventsSlice from "../../../../store/eventsSlice";
 import useMoodsInPeriod from "../../../hooks/useMoodsInPeriod";
 import { useSelector } from "react-redux";
-import useWeightsInPeriod from "../../../hooks/useWeightsInPeriod";
 
 interface Props {
   dateFrom: Date;
@@ -18,8 +18,8 @@ interface Props {
 export default function MoodSummaryForPeriod({ dateFrom, dateTo }: Props) {
   const meditations = useSelector(eventsSlice.selectors.normalizedMeditations);
   const moodValues = useMoodsInPeriod(dateFrom, dateTo).map(({ mood }) => mood);
-  const weightsInPeriod = useWeightsInPeriod(dateFrom, dateTo).map(
-    ({ value }) => value,
+  const meanWeightInPeriod = useSelector((state: RootState) =>
+    eventsSlice.selectors.meanWeightInPeriod(state, dateFrom, dateTo),
   );
   const secondsMeditated = computeSecondsMeditatedInInterval(
     meditations,
@@ -30,14 +30,16 @@ export default function MoodSummaryForPeriod({ dateFrom, dateTo }: Props) {
   return (
     <Paper>
       <h3>Summary</h3>
-      {!moodValues.length && !moodValues.length && !weightsInPeriod.length && (
-        <p>No data for the selected period</p>
-      )}
+      {!moodValues.length &&
+        !moodValues.length &&
+        meanWeightInPeriod === undefined && (
+          <p>No data for the selected period</p>
+        )}
       <MoodSummary
         currentPeriod={{
           best: moodValues.length ? Math.max(...moodValues) : undefined,
           mean: computeMeanSafe(moodValues),
-          meanWeight: computeMeanSafe(weightsInPeriod),
+          meanWeight: meanWeightInPeriod,
           secondsMeditated,
           standardDeviation: computeStandardDeviation(moodValues),
           total: moodValues.length,

diff --git a/client/src/components/pages/Stats/MoodSummaryForCalendarPeriod.tsx b/client/src/components/pages/Stats/MoodSummaryForCalendarPeriod.tsx
@@ -1,15 +1,14 @@
 import {
-  computeMeanSafe,
   computeSecondsMeditatedInInterval,
   computeStandardDeviation,
   formatIsoDateInLocalTimezone,
 } from "../../../utils";
 import MoodSummary from "../../shared/MoodSummary";
 import { Paper } from "eri";
+import { RootState } from "../../../store";
 import eventsSlice from "../../../store/eventsSlice";
 import useMoodsInPeriod from "../../hooks/useMoodsInPeriod";
 import { useSelector } from "react-redux";
-import useWeightsInPeriod from "../../hooks/useWeightsInPeriod";
 
 interface Props {
   dates: [Date, Date, Date];
@@ -29,11 +28,11 @@ export default function MoodSummaryForCalendarPeriod({
 }: Props) {
   const meditations = useSelector(eventsSlice.selectors.normalizedMeditations);
   const moods = useSelector(eventsSlice.selectors.normalizedMoods);
-  const weightsInPeriod = useWeightsInPeriod(date1, date2).map(
-    ({ value }) => value,
+  const meanWeightInPeriod = useSelector((state: RootState) =>
+    eventsSlice.selectors.meanWeightInPeriod(state, date1, date2),
   );
-  const weightsInPreviousPeriod = useWeightsInPeriod(date0, date1).map(
-    ({ value }) => value,
+  const meanWeightInPreviousPeriod = useSelector((state: RootState) =>
+    eventsSlice.selectors.meanWeightInPeriod(state, date0, date1),
   );
 
   const firstMoodDate = new Date(moods.allIds[0]);
@@ -49,7 +48,7 @@ export default function MoodSummaryForCalendarPeriod({
         currentPeriod={{
           best: moodValues.length ? Math.max(...moodValues) : undefined,
           mean: normalizedAverages.byId[formatIsoDateInLocalTimezone(date1)],
-          meanWeight: computeMeanSafe(weightsInPeriod),
+          meanWeight: meanWeightInPeriod,
           secondsMeditated: computeSecondsMeditatedInInterval(
             meditations,
             date1,
@@ -69,7 +68,7 @@ export default function MoodSummaryForCalendarPeriod({
                 mean: normalizedAverages.byId[
                   formatIsoDateInLocalTimezone(date0)
                 ],
-                meanWeight: computeMeanSafe(weightsInPreviousPeriod),
+                meanWeight: meanWeightInPreviousPeriod,
                 secondsMeditated: computeSecondsMeditatedInInterval(
                   meditations,
                   date0,

diff --git a/client/src/store/eventsSlice.test.ts b/client/src/store/eventsSlice.test.ts
@@ -1487,6 +1487,78 @@ describe("eventsSlice", () => {
       ).toEqual(["🙂", "Bulbasaur", "Charmander", "Pikachu", "Squirtle"]);
     });
 
+    describe("meanWeightInPeriod", () => {
+      test("when there are no events", () => {
+        expect(
+          eventsSlice.selectors.meanWeightInPeriod(
+            initialState,
+            new Date("2020-01-01"),
+            new Date("2023-01-01"),
+          ),
+        ).toBe(undefined);
+      });
+
+      test("when there are no events that match the date range", () => {
+        expect(
+          eventsSlice.selectors.meanWeightInPeriod(
+            {
+              ...initialState,
+              events: {
+                ...initialState.events,
+                allIds: ["2020-01-01T00:00:00.000Z"],
+                byId: {
+                  "2020-01-01T00:00:00.000Z": {
+                    createdAt: "2020-01-01T00:00:00.000Z",
+                    type: "v1/weights/create",
+                    payload: { value: 70 },
+                  },
+                },
+              },
+            },
+            new Date("2020-01-02"),
+            new Date("2023-01-01"),
+          ),
+        ).toBe(undefined);
+      });
+
+      test("when there are events that match the date range", () => {
+        expect(
+          eventsSlice.selectors.meanWeightInPeriod(
+            {
+              ...initialState,
+              events: {
+                ...initialState.events,
+                allIds: [
+                  "2020-01-01T00:00:00.000Z",
+                  "2020-01-02T00:00:00.000Z",
+                  "2020-01-03T00:00:00.000Z",
+                ],
+                byId: {
+                  "2020-01-01T00:00:00.000Z": {
+                    createdAt: "2020-01-01T00:00:00.000Z",
+                    type: "v1/weights/create",
+                    payload: { value: 10 },
+                  },
+                  "2020-01-02T00:00:00.000Z": {
+                    createdAt: "2020-01-02T00:00:00.000Z",
+                    type: "v1/weights/create",
+                    payload: { value: 50 },
+                  },
+                  "2020-01-03T00:00:00.000Z": {
+                    createdAt: "2020-01-03T00:00:00.000Z",
+                    type: "v1/weights/create",
+                    payload: { value: 70 },
+                  },
+                },
+              },
+            },
+            new Date("2020-01-02"),
+            new Date("2023-01-01"),
+          ),
+        ).toBe(60);
+      });
+    });
+
     describe("moodIdsByDate", () => {
       test("when there are no events", () => {
         expect(eventsSlice.selectors.moodIdsByDate(initialState)).toEqual({});

diff --git a/client/src/store/eventsSlice.ts b/client/src/store/eventsSlice.ts
@@ -24,9 +24,11 @@ import {
 import { PayloadAction, createSelector, createSlice } from "@reduxjs/toolkit";
 import {
   computeAverageMoodInInterval,
+  computeMeanSafe,
   computeSecondsMeditatedInInterval,
   formatIsoDateHourInLocalTimezone,
   formatIsoDateInLocalTimezone,
+  getIdsInInterval,
   getNormalizedTagsFromDescription,
 } from "../utils";
 import { WEEK_OPTIONS } from "../formatters/dateTimeFormatters";
@@ -359,6 +361,18 @@ export default createSlice({
       normalizedStateNotEmpty,
     ),
 
+    meanWeightInPeriod: createSelector(
+      normalizedWeightsSelector,
+      (_state, dateFrom: Date) => dateFrom,
+      (_state, _dateFrom: Date, dateTo: Date) => dateTo,
+      ({ allIds, byId }, dateFrom: Date, dateTo: Date) =>
+        computeMeanSafe(
+          getIdsInInterval(allIds, dateFrom, dateTo)
+            .map((id) => byId[id])
+            .map(({ value }) => value),
+        ),
+    ),
+
     // some code may depend on the fact that the array
     // value in the returned object cannot be empty
     moodIdsByDate: createSelector(