Address feedV2 review comments

Author: idoshamun

__tests__/feeds.ts

@@ -1218,7 +1218,7 @@ describe('query feedV2', () => {
       });
     nock('http://localhost:6000')
       .post('/feed.json', (body) => {
-        expect(body.allowed_post_types).toEqual(['article', 'highlight']);
+        expect(body.allowed_post_types).toEqual(['article']);
         expect(body.highlights_limit).toEqual(4);
         return true;
       })
@@ -1274,7 +1274,6 @@ describe('query feedV2', () => {
           { post_id: 'p1', metadata: { p: 'post' } },
           {
             type: 'highlight',
-            post_id: '',
             highlight_ids: [
               '3c75fab6-e28b-431d-ab54-a927708de085',
               'c2e332bf-83ac-4651-8a05-8e19fbefc5ac',

__tests__/integrations/feed.ts

@@ -184,7 +184,6 @@ describe('FeedClient', () => {
         { type: 'post', id: '1', feedMeta: '{"p":"a"}' },
         {
           type: 'highlight',
-          postId: null,
           highlightIds: ['h1', 'h2'],
           feedMeta: '{"p":"highlight"}',
         },

src/integrations/feed/clients.ts

@@ -81,7 +81,6 @@ export class FeedClient implements IFeedClient, IGarmrClient {
         if (type === 'highlight') {
           return {
             type: 'highlight',
-            postId: post_id || null,
             highlightIds: highlight_ids || [],
             feedMeta,
           };

src/integrations/feed/types.ts

@@ -3,14 +3,13 @@ import type { FeedFlags } from '../../entity';
 import { GenericMetadata } from '../lofn';
 
 export type FeedResponsePostItem = {
-  type: 'post';
+  type?: 'post';
   id: string;
   feedMeta: string | null;
 };
 
 export type FeedResponseHighlightItem = {
   type: 'highlight';
-  postId: string | null;
   highlightIds: string[];
   feedMeta: string | null;
 };
@@ -23,27 +22,16 @@ export type FeedResponse = {
   staleCursor?: boolean; // True when feed cache was regenerated and cursor became stale
 };
 
-export const isFeedResponsePostItem = (
-  item: FeedResponseItem,
-): item is FeedResponsePostItem => item.type === 'post';
-
 export const isFeedResponseHighlightItem = (
   item: FeedResponseItem,
 ): item is FeedResponseHighlightItem => item.type === 'highlight';
 
-export const getFeedResponsePostItems = (
-  response: Pick<FeedResponse, 'data'>,
-): FeedResponsePostItem[] => response.data.filter(isFeedResponsePostItem);
-
 export const getFeedResponsePostIds = (
   response: Pick<FeedResponse, 'data'>,
-): string[] => getFeedResponsePostItems(response).map(({ id }) => id);
-
-export const findFeedResponsePostItem = (
-  response: Pick<FeedResponse, 'data'>,
-  id: string,
-): FeedResponsePostItem | undefined =>
-  getFeedResponsePostItems(response).find((item) => item.id === id);
+): string[] =>
+  response.data.flatMap((item) =>
+    isFeedResponseHighlightItem(item) ? [] : [item.id],
+  );
 
 export enum FeedConfigName {
   Personalise = 'personalise',

src/schema/common.ts

@@ -23,11 +23,7 @@ import {
 
 import { BaseContext, Context } from '../Context';
 import type { MeiliPagination } from '../integrations/meilisearch';
-import {
-  FeedResponse,
-  findFeedResponsePostItem,
-  getFeedResponsePostItems,
-} from '../integrations/feed/types';
+import { FeedResponse } from '../integrations/feed/types';
 
 export interface GQLEmptyResponse {
   _: boolean;
@@ -279,18 +275,20 @@ export const fixedIdsPageGenerator = <
   nodeToCursor: (page, args, node, i, queryParams): string =>
     offsetToCursor(
       page.offset +
-        getFeedResponsePostItems(queryParams!).findIndex(
-          (item) => item.id === node.id,
+        queryParams!.data.findIndex(
+          (item) => item.type !== 'highlight' && item.id === node.id,
         ),
     ),
   hasNextPage: (page, nodesSize, total, queryParams): boolean =>
-    getFeedResponsePostItems(queryParams!).length >= page.limit,
+    queryParams!.data.length >= page.limit,
   hasPreviousPage: (page): boolean => page.offset > 0,
   transformNodes: (page, nodes, queryParams) => {
     // Add the metadata object
     return nodes.slice(0, page.limit - 1).map((node) => ({
       ...node,
-      feedMeta: findFeedResponsePostItem(queryParams!, node.id)?.feedMeta,
+      feedMeta: queryParams!.data.find(
+        (item) => item.type !== 'highlight' && item.id === node.id,
+      )?.feedMeta,
     }));
   },
 });
@@ -311,13 +309,15 @@ export const feedCursorPageGenerator = <
   nodeToCursor: (page, args, node, i, queryParams): string =>
     queryParams!.cursor as string,
   hasNextPage: (page, nodesSize, total, queryParams): boolean =>
-    getFeedResponsePostItems(queryParams!).length >= page.limit,
+    queryParams!.data.length >= page.limit,
   hasPreviousPage: (page): boolean => !!page.cursor,
   transformNodes: (page, nodes, queryParams) => {
     // Add the metadata object
     return nodes.map((node) => ({
       ...node,
-      feedMeta: findFeedResponsePostItem(queryParams!, node.id)?.feedMeta,
+      feedMeta: queryParams!.data.find(
+        (item) => item.type !== 'highlight' && item.id === node.id,
+      )?.feedMeta,
     }));
   },
 });