Merge branch 'main' into chore_ch_sink_bump_2_5_0

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 orbs:
-  gcp-gcr: circleci/[email protected].2
+  gcp-gcr: circleci/[email protected].9
   pulumi: pulumi/[email protected]
-  gcp-cli: circleci/gcp-cli@3.1.1
+  gcp-cli: circleci/gcp-cli@3.3.0
 jobs:
   build:
     docker:
@@ -29,7 +29,7 @@ jobs:
     resource_class: large
     docker:
       - image: cimg/node:20.12
-      - image: postgres:15-alpine
+      - image: postgres:17-alpine
         environment:
           - POSTGRES_DB: api_test
           - POSTGRES_PASSWORD: 12345

.infra/Pulumi.prod.yaml

@@ -153,5 +153,3 @@ config:
       secure: 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
   gcp:project: devkit-prod
   gcp:region: us-central1
-  api:projectNumber:
-    secure: AAABAB3AC0Ld1HpbfvRKrtr6+/b6W/kD1i8iLiLUqxv5CII2vktsPcBXiIE=

.infra/index.ts

@@ -436,7 +436,7 @@ const [apps] = deployApplicationSuite(
           ],
     },
     debezium: {
-      version: '2.4.2.Final',
+      version: '3.0.5.Final',
       topicName: debeziumTopicName,
       propsPath: './application.properties',
       propsVars: {

.infra/package.json

@@ -4,7 +4,7 @@
     "@types/node": "20.12.x"
   },
   "dependencies": {
-    "@dailydotdev/pulumi-common": "^2.4.5",
+    "@dailydotdev/pulumi-common": "^2.4.6",
     "@pulumi/gcp": "^8.10.2",
     "@pulumi/kubernetes": "^4.19.0",
     "@pulumi/pulumi": "^3.143.0"

__tests__/boot.ts

@@ -63,6 +63,7 @@ import { DEFAULT_TIMEZONE, submitArticleThreshold } from '../src/common';
 import { saveReturnAlerts } from '../src/schema/alerts';
 import { UserVote } from '../src/types';
 import { BootAlerts, excludeProperties } from '../src/routes/boot';
+import { SubscriptionCycles } from '../src/paddle';
 
 let app: FastifyInstance;
 let con: DataSource;
@@ -511,6 +512,9 @@ describe('logged in boot', () => {
     });
     await con.getRepository(User).save({
       ...usersFixture[0],
+      subscriptionFlags: {
+        cycle: SubscriptionCycles.Yearly,
+      },
       defaultFeedId: '1',
     });
     mockLoggedIn();
@@ -520,6 +524,24 @@ describe('logged in boot', () => {
       .expect(200);
     expect(res.body.user.defaultFeedId).toEqual('1');
   });
+
+  it('should not return default feed id if not plus', async () => {
+    await con.getRepository(Feed).save({
+      id: '1',
+      name: 'My Feed',
+      userId: '1',
+    });
+    await con.getRepository(User).save({
+      ...usersFixture[0],
+      defaultFeedId: '1',
+    });
+    mockLoggedIn();
+    const res = await request(app.server)
+      .get(BASE_PATH)
+      .set('Cookie', 'ory_kratos_session=value;')
+      .expect(200);
+    expect(res.body.user.defaultFeedId).toBeNull();
+  });
 });
 
 describe('boot marketing cta', () => {

__tests__/feeds.ts

@@ -435,12 +435,23 @@ describe('query anonymousFeed', () => {
     loggedUser = '1';
 
     nock('http://localhost:6000')
-      .post('/popular', {
+      .post('/feed.json', {
         total_pages: 1,
         page_size: 10,
         fresh_page_size: '4',
         offset: 0,
         user_id: '1',
+        source_types: ['machine', 'squad'],
+        allowed_languages: ['en'],
+        feed_config_name: 'popular',
+        min_day_range: 14,
+        allowed_content_curations: [
+          'news',
+          'release',
+          'opinion',
+          'comparison',
+          'story',
+        ],
       })
       .reply(200, {
         data: [{ post_id: 'p1' }, { post_id: 'p4' }],
@@ -454,7 +465,7 @@ describe('query anonymousFeed', () => {
 
   it('should safetly handle a case where the feed is empty', async () => {
     loggedUser = '1';
-    nock('http://localhost:6000').post('/popular').reply(200, {
+    nock('http://localhost:6000').post('/feed.json').reply(200, {
       data: [],
     });
     const res = await client.query(QUERY, {
@@ -519,14 +530,25 @@ describe('query anonymousFeed', () => {
     ]);
 
     nock('http://localhost:6000')
-      .post('/popular', {
+      .post('/feed.json', {
         total_pages: 1,
         page_size: 10,
         fresh_page_size: '4',
         offset: 0,
         blocked_tags: ['python', 'java'],
         blocked_sources: ['a', 'b'],
         user_id: '1',
+        source_types: ['machine', 'squad'],
+        allowed_languages: ['en'],
+        feed_config_name: 'popular',
+        min_day_range: 14,
+        allowed_content_curations: [
+          'news',
+          'release',
+          'opinion',
+          'comparison',
+          'story',
+        ],
       })
       .reply(200, {
         data: [{ post_id: 'p1' }, { post_id: 'p4' }],
@@ -3289,13 +3311,14 @@ describe('query feedPreview', () => {
     loggedUser = '1';
 
     nock('http://localhost:6000')
-      .post('/popular', {
+      .post('/feed.json', {
         user_id: '1',
         page_size: 20,
         offset: 0,
         total_pages: 1,
         fresh_page_size: '7',
         allowed_tags: ['javascript', 'webdev'],
+        feed_config_name: 'popular',
       })
       .reply(200, {
         data: [{ post_id: 'p1' }, { post_id: 'p4' }],
@@ -4292,6 +4315,24 @@ describe('query customFeed', () => {
         },
       },
     ]);
+    await con.getRepository(ContentPreferenceUser).save([
+      {
+        feedId: 'cf1',
+        referenceUserId: '2',
+        referenceId: '2',
+        status: ContentPreferenceStatus.Follow,
+        userId: '1',
+      },
+    ]);
+    await con.getRepository(ContentPreferenceSource).save([
+      {
+        feedId: 'cf1',
+        sourceId: 'a',
+        referenceId: 'a',
+        status: ContentPreferenceStatus.Follow,
+        userId: '1',
+      },
+    ]);
     await con.getRepository(ContentPreferenceKeyword).save([
       {
         feedId: 'cf1',
@@ -4339,6 +4380,26 @@ describe('query customFeed', () => {
 
   it('should return the feed by slug', async () => {
     loggedUser = '1';
+    isPlus = true;
+
+    nock('http://localhost:6000')
+      .post('/feed.json', {
+        user_id: '1',
+        page_size: 10,
+        offset: 0,
+        total_pages: 1,
+        fresh_page_size: '4',
+        allowed_tags: ['webdev', 'html', 'data'],
+        allowed_sources: ['a'],
+        allowed_author_ids: ['2'],
+        feed_config_name: FeedConfigName.CustomFeedV1,
+        disable_engagement_filter: false,
+      })
+      .reply(200, {
+        data: [{ post_id: 'p1' }, { post_id: 'p4' }],
+        cursor: 'b',
+      });
+
     const res = await client.query(QUERY, {
       variables: {
         ranking: Ranking.POPULARITY,
@@ -4379,6 +4440,25 @@ describe('query customFeed', () => {
 
   it('should return feed with preconfigured filters', async () => {
     loggedUser = '1';
+    isPlus = true;
+
+    nock('http://localhost:6000')
+      .post('/feed.json', {
+        user_id: '1',
+        page_size: 10,
+        offset: 0,
+        total_pages: 1,
+        fresh_page_size: '4',
+        allowed_tags: ['webdev', 'html', 'data'],
+        allowed_sources: ['a'],
+        allowed_author_ids: ['2'],
+        feed_config_name: FeedConfigName.CustomFeedV1,
+        disable_engagement_filter: false,
+      })
+      .reply(200, {
+        data: [{ post_id: 'p1' }, { post_id: 'p4' }],
+        cursor: 'b',
+      });
 
     const res = await client.query(QUERY, {
       variables: {
@@ -4390,12 +4470,33 @@ describe('query customFeed', () => {
 
     expect(res.errors).toBeFalsy();
     expect(res.data.customFeed.edges.map((item) => item.node.id)).toMatchObject(
-      ['p5', 'p4', 'p1'],
+      ['p1', 'p4'],
     );
   });
 
   it('should not return posts with blocked tags', async () => {
     loggedUser = '1';
+    isPlus = true;
+
+    nock('http://localhost:6000')
+      .post('/feed.json', {
+        user_id: '1',
+        page_size: 10,
+        offset: 0,
+        total_pages: 1,
+        fresh_page_size: '4',
+        allowed_tags: ['html', 'data'],
+        blocked_tags: ['webdev'],
+        allowed_sources: ['a'],
+        allowed_author_ids: ['2'],
+        feed_config_name: FeedConfigName.CustomFeedV1,
+        disable_engagement_filter: false,
+      })
+      .reply(200, {
+        data: [{ post_id: 'p4' }],
+        cursor: 'b',
+      });
+
     await con.getRepository(ContentPreferenceKeyword).save([
       {
         feedId: 'cf1',
@@ -4417,12 +4518,13 @@ describe('query customFeed', () => {
 
     expect(res.errors).toBeFalsy();
     expect(res.data.customFeed.edges.map((item) => item.node.id)).toMatchObject(
-      ['p5', 'p4'],
+      ['p4'],
     );
   });
 
   it('should return v2 feed', async () => {
     loggedUser = '1';
+    isPlus = true;
 
     nock('http://localhost:6000')
       .post('/feed.json', {
@@ -4432,6 +4534,8 @@ describe('query customFeed', () => {
         total_pages: 1,
         fresh_page_size: '4',
         allowed_tags: ['webdev', 'html', 'data'],
+        allowed_sources: ['a'],
+        allowed_author_ids: ['2'],
         feed_config_name: FeedConfigName.CustomFeedV1,
         disable_engagement_filter: false,
       })
@@ -4452,4 +4556,21 @@ describe('query customFeed', () => {
       ['p1', 'p4'],
     );
   });
+
+  it('should not return the feed by slug if not plus', async () => {
+    loggedUser = '1';
+
+    await testQueryErrorCode(
+      client,
+      {
+        query: QUERY,
+        variables: {
+          ranking: Ranking.POPULARITY,
+          first: 10,
+          feedId: 'cool-feed-cf1',
+        },
+      },
+      'FORBIDDEN',
+    );
+  });
 });

src/common/constants.ts

@@ -4,3 +4,5 @@ export const ONE_DAY_IN_SECONDS = ONE_HOUR_IN_SECONDS * 24;
 export const ONE_WEEK_IN_SECONDS = ONE_DAY_IN_SECONDS * 7;
 
 export const MAX_FOLLOWERS_LIMIT = 5_000;
+
+export const customFeedsPlusDate = new Date('2024-12-11');