Update to new structure

Author: szuperaz

packages/feeds-client/__integration-tests__/notification-feed.test.ts

@@ -5,9 +5,10 @@ import {
   getTestUser,
   waitForEvent,
 } from './utils';
-import { FeedsClient } from '../src/FeedsClient';
-import { Feed } from '../src/Feed';
+
 import { UserRequest } from '../src/gen/models';
+import { FeedsClient } from '../src/feeds-client';
+import { Feed } from '../src/feed';
 
 describe('Notification Feed Test Setup', () => {
   let client1: FeedsClient;

packages/feeds-client/src/feed/event-handlers/activity/activity-marked-utils.test.ts

@@ -1,6 +1,9 @@
 import { describe, it, expect } from 'vitest';
-import { ActivityMarkEvent, NotificationStatusResponse } from '../gen/models';
-import { updateNotificationStatusFromActivityMarked } from './activity-marked-utils';
+import {
+  ActivityMarkEvent,
+  NotificationStatusResponse,
+} from '../../../gen/models';
+import { updateNotificationStatusFromActivityMarked } from './handle-activity-marked';
 
 const createMockActivityMarkEvent = (
   overrides: Partial<ActivityMarkEvent> = {},

…ndlers/activity/activity-marked-utils.ts …dlers/activity/handle-activity-marked.tspackages/feeds-client/src/feed/event-handlers/activity/activity-marked-utils.ts renamed to packages/feeds-client/src/feed/event-handlers/activity/handle-activity-marked.ts packages/feeds-client/src/feed/event-handlers/activity/activity-marked-utils.ts renamed to packages/feeds-client/src/feed/event-handlers/activity/handle-activity-marked.ts

@@ -1,5 +1,9 @@
-import { ActivityMarkEvent, NotificationStatusResponse } from '../gen/models';
-import { UpdateStateResult } from '../types-internal';
+import {
+  ActivityMarkEvent,
+  NotificationStatusResponse,
+} from '../../../gen/models';
+import { EventPayload, UpdateStateResult } from '../../../types-internal';
+import { Feed } from '../../feed';
 
 export const updateNotificationStatusFromActivityMarked = (
   event: ActivityMarkEvent,
@@ -46,3 +50,19 @@ export const updateNotificationStatusFromActivityMarked = (
     data: { notification_status: newState },
   };
 };
+
+export function handleActivityMarked(
+  this: Feed,
+  event: EventPayload<'feeds.activity.marked'>,
+) {
+  const result = updateNotificationStatusFromActivityMarked(
+    event,
+    this.currentState.notification_status,
+    this.currentState.aggregated_activities,
+  );
+  if (result.changed) {
+    this.state.partialNext({
+      notification_status: result.data?.notification_status,
+    });
+  }
+}

packages/feeds-client/src/feed/event-handlers/activity/notification-feed-utils.ts

@@ -3,8 +3,8 @@ import {
   NotificationFeedUpdatedEvent,
   NotificationStatusResponse,
   AggregatedActivityResponse,
-} from '../gen/models';
-import { updateNotificationFeedFromEvent } from './notification-feed-utils';
+} from '../../../gen/models';
+import { updateNotificationFeedFromEvent } from './handle-notification-feed-updated';
 
 const createMockNotificationFeedUpdatedEvent = (
   overrides: Partial<NotificationFeedUpdatedEvent> = {},

…activity/notification-feed-utils.test.ts …handle-notification-feed-updated.test.tspackages/feeds-client/src/feed/event-handlers/activity/notification-feed-utils.test.ts renamed to packages/feeds-client/src/feed/event-handlers/notification-feed/handle-notification-feed-updated.test.ts packages/feeds-client/src/feed/event-handlers/activity/notification-feed-utils.test.ts renamed to packages/feeds-client/src/feed/event-handlers/notification-feed/handle-notification-feed-updated.test.ts

@@ -1,10 +1,54 @@
 import type { Feed } from '../../../feed';
-import type { EventPayload } from '../../../types-internal';
+import {
+  AggregatedActivityResponse,
+  NotificationFeedUpdatedEvent,
+  NotificationStatusResponse,
+} from '../../../gen/models';
+import type { EventPayload, UpdateStateResult } from '../../../types-internal';
+
+export const updateNotificationFeedFromEvent = (
+  event: NotificationFeedUpdatedEvent,
+): UpdateStateResult<{
+  data?: {
+    notification_status?: NotificationStatusResponse;
+    aggregated_activities?: AggregatedActivityResponse[];
+  };
+}> => {
+  const updates: {
+    notification_status?: NotificationStatusResponse;
+    aggregated_activities?: AggregatedActivityResponse[];
+  } = {};
+
+  if (event.notification_status) {
+    updates.notification_status = event.notification_status;
+  }
+
+  if (event.aggregated_activities) {
+    updates.aggregated_activities = event.aggregated_activities;
+  }
+
+  // Only return changed if we have actual updates
+  if (Object.keys(updates).length > 0) {
+    return {
+      changed: true,
+      data: updates,
+    };
+  }
+
+  return {
+    changed: false,
+  };
+};
 
 export function handleNotificationFeedUpdated(
   this: Feed,
   event: EventPayload<'feeds.notification_feed.updated'>,
 ) {
-  console.info('notification feed updated', event);
-  // TODO: handle notification feed updates
+  const result = updateNotificationFeedFromEvent(event);
+  if (result.changed) {
+    this.state.partialNext({
+      notification_status: result.data?.notification_status,
+      aggregated_activities: result.data?.aggregated_activities,
+    });
+  }
 }

packages/feeds-client/src/feed/event-handlers/notification-feed/handle-notification-feed-updated.ts

@@ -51,6 +51,7 @@ import type {
   PagerResponseWithLoadingStates,
 } from '../types';
 import { checkHasAnotherPage, Constants, uniqueArrayMerge } from '../utils';
+import { handleActivityMarked } from './event-handlers/activity/handle-activity-marked';
 
 export type FeedState = Omit<
   Partial<GetOrCreateFeedResponse & FeedResponse>,
@@ -180,19 +181,7 @@ export class Feed extends FeedApi {
     'feeds.poll.vote_removed': Feed.noop,
     'feeds.activity.pinned': Feed.noop,
     'feeds.activity.unpinned': Feed.noop,
-    'feeds.activity.marked': (event) => {
-      const currentState = this.currentState;
-      const result = updateNotificationStatusFromActivityMarked(
-        event,
-        currentState.notification_status,
-        currentState.aggregated_activities,
-      );
-      if (result.changed) {
-        this.state.partialNext({
-          ...result.data,
-        });
-      }
-    },
+    'feeds.activity.marked': handleActivityMarked.bind(this),
     'moderation.custom_action': Feed.noop,
     'moderation.flagged': Feed.noop,
     'moderation.mark_reviewed': Feed.noop,