Merge pull request #254 from jwplayer/fix/inp-watch-history

fix: Watch history update on new media

package.json

@@ -142,4 +142,4 @@
     "flat": "^5.0.1",
     "json5": "^2.2.2"
   }
-}
+}

src/services/inplayer.account.service.ts

@@ -272,18 +272,16 @@ export const subscribeToNotifications = async (uuid: string = '', onMessage: (pa
 export const updatePersonalShelves: UpdatePersonalShelves = async (payload) => {
   const { favorites, history } = payload.externalData;
   const externalData = await getCustomerExternalData();
+  const currentWatchHistoryIds = externalData?.history?.map((e) => e.mediaid);
   const currentFavoriteIds = externalData?.favorites?.map((e) => e.mediaid);
   const payloadFavoriteIds = favorites?.map((e) => e.mediaid);
 
   try {
     history.forEach(async (history) => {
-      if (externalData?.history?.length) {
-        externalData?.history?.forEach(async (historyStore) => {
-          if (historyStore.mediaid === history.mediaid && historyStore.progress !== history.progress) {
-            await InPlayer.Account.updateWatchHistory(history.mediaid, history.progress);
-          }
-        });
-      } else {
+      if (
+        !currentWatchHistoryIds?.includes(history.mediaid) ||
+        externalData?.history?.some((e) => e.mediaid == history.mediaid && e.progress != history.progress)
+      ) {
         await InPlayer.Account.updateWatchHistory(history.mediaid, history.progress);
       }
     });

test-e2e/codecept.desktop.js

@@ -17,6 +17,7 @@ exports.config = {
       url: 'http://localhost:8080',
       show: !!process.env.SHOW,
       channel: 'chrome',
+      locale: 'en-US',
     },
   },
   include: {

test-e2e/tests/payments/subscription_test.ts

@@ -1,6 +1,6 @@
 import { LoginContext } from '#utils/password_utils';
 import constants, { longTimeout, normalTimeout } from '#utils/constants';
-import { overrideIP, goToCheckout, formatPrice, finishAndCheckSubscription, cancelPlan, renewPlan, addDays } from '#utils/payments';
+import { overrideIP, goToCheckout, formatPrice, finishAndCheckSubscription, cancelPlan, renewPlan, addDays, addYear } from '#utils/payments';
 import { testConfigs } from '#test/constants';
 
 let paidLoginContext: LoginContext;
@@ -159,15 +159,15 @@ Scenario('I can finish my subscription', async ({ I }) => {
   // @ts-expect-error
   I.switchTo(null); // Exit the iframe context back to the main document
 
-  await finishAndCheckSubscription(I, addDays(today, 365), today);
+  await finishAndCheckSubscription(I, addYear(today), today);
 
   I.seeAll(cardInfo);
 });
 
 Scenario('I can cancel my subscription', async ({ I }) => {
   paidLoginContext = await I.registerOrLogin(paidLoginContext);
 
-  cancelPlan(I, addDays(today, 365));
+  cancelPlan(I, addYear(today));
 
   // Still see payment info
   I.seeAll(cardInfo);
@@ -176,5 +176,5 @@ Scenario('I can cancel my subscription', async ({ I }) => {
 Scenario('I can renew my subscription', async ({ I }) => {
   paidLoginContext = await I.registerOrLogin(paidLoginContext);
 
-  renewPlan(I, addDays(today, 365));
+  renewPlan(I, addYear(today));
 });

test-e2e/utils/payments.ts

@@ -32,7 +32,7 @@ export function addYear(date: Date) {
 }
 
 export function formatDate(date: Date) {
-  return date.toLocaleDateString('en-US');
+  return date.toLocaleDateString();
 }
 
 export async function finishAndCheckSubscription(I: CodeceptJS.I, billingDate: Date, today: Date) {