refactor: moved pagination to normalised data

openedx · Jul 7, 2023 · 36804f2 · 36804f2
1 parent e44e18c
commit 36804f2
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/Notifications/data/thunks.js b/src/Notifications/data/thunks.js
@@ -35,11 +35,16 @@ const normalizeNotificationCounts = ({ countByAppName, count, showNotificationsT
   };
 };
 
-const normalizeNotifications = (notifications) => {
-  const newNotificationIds = notifications.map(notification => notification.id.toString());
-  const notificationsKeyValuePair = notifications.reduce((acc, obj) => { acc[obj.id] = obj; return acc; }, {});
+const normalizeNotifications = (data) => {
+  const newNotificationIds = data.results.map(notification => notification.id.toString());
+  const notificationsKeyValuePair = data.results.reduce((acc, obj) => { acc[obj.id] = obj; return acc; }, {});
+  const pagination = {
+    numPages: data.num_pages,
+    currentPage: data.current_page,
+    hasMorePages: !!data.next,
+  };
   return {
-    newNotificationIds, notificationsKeyValuePair,
+    newNotificationIds, notificationsKeyValuePair, pagination,
   };
 };
 
@@ -48,13 +53,8 @@ export const fetchNotificationList = ({ appName, page }) => (
     try {
       dispatch(fetchNotificationRequest({ appName }));
       const data = await getNotificationsList(appName, page);
-      const normalisedData = normalizeNotifications((camelCaseObject(data.results)));
-      const pagination = {
-        numPages: data.num_pages,
-        currentPage: data.current_page,
-        hasMorePages: !!data.next,
-      };
-      dispatch(fetchNotificationSuccess({ ...normalisedData, pagination }));
+      const normalisedData = normalizeNotifications((camelCaseObject(data)));
+      dispatch(fetchNotificationSuccess({ ...normalisedData }));
     } catch (error) {
       if (getHttpErrorStatus(error) === 403) {
         dispatch(fetchNotificationDenied(appName));