fix(read-history): exclude unknown source posts (#3746)

Author: idoshamun

__tests__/users.ts

@@ -58,6 +58,7 @@ import {
   UserTopReader,
   View,
   PostType,
+  UNKNOWN_SOURCE,
 } from '../src/entity';
 import { UserProfileAnalytics } from '../src/entity/user/UserProfileAnalytics';
 import { UserProfileAnalyticsHistory } from '../src/entity/user/UserProfileAnalyticsHistory';
@@ -245,6 +246,18 @@ beforeAll(async () => {
 
 const now = new Date();
 
+const createUnknownSourceArticlePost = (
+  id: string,
+  title: string,
+): Partial<ArticlePost> => ({
+  id,
+  title,
+  shortId: id,
+  url: `http://${id}.com`,
+  sourceId: UNKNOWN_SOURCE,
+  visible: true,
+});
+
 beforeEach(async () => {
   loggedUser = null;
   isPlus = false;
@@ -3417,6 +3430,36 @@ describe('query readHistory', () => {
     expect(res.data.readHistory.edges[0].node.post.id).toEqual('p2');
   });
 
+  it("should return user's reading history without posts from unknown source", async () => {
+    loggedUser = '1';
+    const createdAtOld = new Date('2020-09-22T07:15:51.247Z');
+    const createdAtNew = new Date('2021-09-22T07:15:51.247Z');
+
+    await con
+      .getRepository(ArticlePost)
+      .save(
+        createUnknownSourceArticlePost('p-unk-read', 'Unknown source post'),
+      );
+
+    await saveFixtures(con, View, [
+      {
+        userId: '1',
+        postId: 'p-unk-read',
+        timestamp: createdAtOld,
+      },
+      {
+        userId: '1',
+        postId: 'p2',
+        timestamp: createdAtNew,
+      },
+    ]);
+
+    const res = await client.query(QUERY);
+    expect(res.errors).toBeFalsy();
+    expect(res.data.readHistory.edges).toHaveLength(1);
+    expect(res.data.readHistory.edges[0].node.post.id).toEqual('p2');
+  });
+
   it("should return user's reading history with the banned posts", async () => {
     loggedUser = '1';
     const createdAtOld = new Date('2020-09-22T07:15:51.247Z');
@@ -3688,6 +3731,32 @@ describe('query search reading history', () => {
     expect(res.errors).toBeFalsy();
     expect(res.data).toMatchSnapshot();
   });
+
+  it('should return reading history search feed without unknown source posts', async () => {
+    loggedUser = '1';
+
+    await con
+      .getRepository(ArticlePost)
+      .save(
+        createUnknownSourceArticlePost('p-unk-search', 'Unknown search result'),
+      );
+
+    await con.getRepository(View).save([
+      {
+        userId: loggedUser,
+        timestamp: subDays(now, 1),
+        postId: 'p-unk-search',
+      },
+      { userId: loggedUser, timestamp: subDays(now, 2), postId: 'p1' },
+    ]);
+
+    const res = await client.query(QUERY, {
+      variables: { query: 'Unknown' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.readHistory.edges).toEqual([]);
+  });
 });
 
 describe('mutation updateUserProfile', () => {

src/schema/users.ts

@@ -29,6 +29,7 @@ import {
   UserStreakActionType,
   View,
   PostType,
+  UNKNOWN_SOURCE,
 } from '../entity';
 import { UserNotificationFlags, UserSocialLink } from '../entity/user/User';
 import {
@@ -1784,7 +1785,10 @@ const readHistoryResolver = async (
       )
       .addSelect('timestamp', 'timestampDb')
       .andWhere('p.visible = true')
-      .andWhere('p.deleted = false');
+      .andWhere('p.deleted = false')
+      .andWhere('p.sourceId != :unknownSource', {
+        unknownSource: UNKNOWN_SOURCE,
+      });
 
     if (args?.query) {
       builder.queryBuilder.andWhere(`p.tsv @@ (${getSearchQuery(':query')})`, {