Merge remote-tracking branch 'origin/feat-slack-channel' into feat-slack-channel

Author: rebelchris

__tests__/alerts.ts

@@ -408,7 +408,7 @@ describe('mutation clearOpportunityAlert', () => {
   it('should clear opportunityId from alerts', async () => {
     loggedUser = '1';
 
-    saveFixtures(con, OpportunityJob, [
+    await saveFixtures(con, OpportunityJob, [
       {
         ...opportunitiesFixture[0],
         id: '45bef485-ba42-4fd9-8c8c-a2ea4b2d1d62',

__tests__/boot.ts

@@ -159,6 +159,7 @@ const LOGGED_IN_BODY = {
     clickbaitTries: null,
     hasLocationSet: false,
     location: null,
+    hideExperience: false,
   },
   marketingCta: null,
   feeds: [],

__tests__/helpers.ts

@@ -47,6 +47,7 @@ import {
   BrokkrService,
   ExtractMarkdownResponse,
   ParseCVResponse,
+  ParseError,
 } from '@dailydotdev/schema';
 import { createClient, type ClickHouseClient } from '@clickhouse/client';
 import * as clickhouseCommon from '../src/common/clickhouse';
@@ -450,7 +451,9 @@ export const createMockBrokkrTransport = () =>
       },
       parseCV: (request) => {
         if (request.blobName === 'empty-cv-mock') {
-          return new ParseCVResponse({});
+          return new ParseCVResponse({
+            errors: [new ParseError({ message: 'Empty CV' })],
+          });
         }
 
         return new ParseCVResponse({

__tests__/notifications/index.ts

@@ -10,6 +10,7 @@ import {
   NotificationDoneByContext,
   NotificationGiftPlusContext,
   type NotificationOpportunityMatchContext,
+  type NotificationParsedCVProfileContext,
   type NotificationPostAnalyticsContext,
   NotificationPostContext,
   NotificationPostModerationContext,
@@ -2179,9 +2180,10 @@ describe('parsed_cv_profile notifications', () => {
 
   it('should notify when parsed CV profile is ready', async () => {
     const type = NotificationType.ParsedCVProfile;
-    const ctx: NotificationUserContext = {
+    const ctx: NotificationParsedCVProfileContext = {
       userIds: ['1'],
       user: usersFixture[0] as Reference<User>,
+      status: 'success',
     };
 
     const actual = generateNotificationV2(type, ctx);
@@ -2202,5 +2204,40 @@ describe('parsed_cv_profile notifications', () => {
         type: 'user',
       },
     ]);
+    expect(actual.notification.title).toBe(
+      'Great news — we parsed your CV successfully, and your experience has been added to <u>your profile</u>!',
+    );
+  });
+
+  it('should notify when parsed CV profile failed', async () => {
+    const type = NotificationType.ParsedCVProfile;
+    const ctx: NotificationParsedCVProfileContext = {
+      userIds: ['1'],
+      user: usersFixture[0] as Reference<User>,
+      status: 'failed',
+    };
+
+    const actual = generateNotificationV2(type, ctx);
+    expect(actual.notification.type).toEqual(type);
+    expect(actual.userIds).toEqual(['1']);
+    expect(actual.notification.public).toEqual(true);
+    expect(actual.notification.referenceId).toEqual('1');
+    expect(actual.notification.targetUrl).toEqual(
+      'http://localhost:5002/idoshamun',
+    );
+    expect(actual.attachments!.length).toEqual(0);
+    expect(actual.avatars).toEqual([
+      {
+        image: 'https://daily.dev/ido.jpg',
+        name: 'Ido',
+        referenceId: '1',
+        targetUrl: 'http://localhost:5002/idoshamun',
+        type: 'user',
+      },
+    ]);
+
+    expect(actual.notification.title).toBe(
+      "We couldn't parse your CV — sorry about that! The good news is you can still add your experience manually in <u>your profile</u>.",
+    );
   });
 });

__tests__/schema/profile.ts

@@ -320,6 +320,65 @@ describe('query userExperiences', () => {
     });
   });
 
+  it('should return empty list when viewing another user with hideExperience enabled', async () => {
+    loggedUser = '1';
+
+    // Set user 2's hideExperience to true
+    await con.getRepository(User).update({ id: '2' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCES_QUERY, {
+      variables: { userId: '2' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperiences.edges).toHaveLength(0);
+    expect(res.data.userExperiences.pageInfo.hasNextPage).toBe(false);
+  });
+
+  it('should return own experiences even with hideExperience enabled', async () => {
+    loggedUser = '1';
+
+    // Set user 1's hideExperience to true
+    await con.getRepository(User).update({ id: '1' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCES_QUERY, {
+      variables: { userId: '1' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperiences.edges).toHaveLength(4);
+  });
+
+  it('should return experiences for another user when hideExperience is false', async () => {
+    loggedUser = '1';
+
+    // Explicitly set user 2's hideExperience to false
+    await con
+      .getRepository(User)
+      .update({ id: '2' }, { hideExperience: false });
+
+    const res = await client.query(USER_EXPERIENCES_QUERY, {
+      variables: { userId: '2' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperiences.edges).toHaveLength(1);
+  });
+
+  it('should return empty list for anonymous user when owner has hideExperience enabled', async () => {
+    loggedUser = null;
+
+    // Set user 2's hideExperience to true
+    await con.getRepository(User).update({ id: '2' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCES_QUERY, {
+      variables: { userId: '2' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperiences.edges).toHaveLength(0);
+  });
+
   it('should return cursor for each edge', async () => {
     loggedUser = '1';
 
@@ -447,17 +506,15 @@ describe('query userExperienceById', () => {
     });
   });
 
-  it('should return error when experience does not exist', async () => {
+  it('should return null when experience does not exist', async () => {
     loggedUser = '1';
 
-    await testQueryErrorCode(
-      client,
-      {
-        query: USER_EXPERIENCE_BY_ID_QUERY,
-        variables: { id: 'f47ac10b-58cc-4372-a567-3e02b2c3d479' }, // manually adjusted to be unique
-      },
-      'NOT_FOUND',
-    );
+    const res = await client.query(USER_EXPERIENCE_BY_ID_QUERY, {
+      variables: { id: 'f47ac10b-58cc-4372-a567-3e02b2c3d479' }, // manually adjusted to be unique
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperienceById).toBeNull();
   });
 
   it('should work for non-logged-in users', async () => {
@@ -486,6 +543,70 @@ describe('query userExperienceById', () => {
       title: 'Product Manager',
     });
   });
+
+  it('should return null when viewing another user experience with hideExperience enabled', async () => {
+    loggedUser = '1';
+
+    // Set user 2's hideExperience to true
+    await con.getRepository(User).update({ id: '2' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCE_BY_ID_QUERY, {
+      variables: { id: 'd4e5f6a7-89ab-4def-c012-456789012345' }, // User 2's experience
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperienceById).toBeNull();
+  });
+
+  it('should return own experience even with hideExperience enabled', async () => {
+    loggedUser = '1';
+
+    // Set user 1's hideExperience to true
+    await con.getRepository(User).update({ id: '1' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCE_BY_ID_QUERY, {
+      variables: { id: 'f47ac10b-58cc-4372-a567-0e02b2c3d479' }, // User 1's experience
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperienceById).toMatchObject({
+      id: 'f47ac10b-58cc-4372-a567-0e02b2c3d479',
+      title: 'Senior Software Engineer',
+    });
+  });
+
+  it('should return experience from another user when hideExperience is false', async () => {
+    loggedUser = '1';
+
+    // Explicitly set user 2's hideExperience to false
+    await con
+      .getRepository(User)
+      .update({ id: '2' }, { hideExperience: false });
+
+    const res = await client.query(USER_EXPERIENCE_BY_ID_QUERY, {
+      variables: { id: 'd4e5f6a7-89ab-4def-c012-456789012345' },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperienceById).toMatchObject({
+      id: 'd4e5f6a7-89ab-4def-c012-456789012345',
+      title: 'Product Manager',
+    });
+  });
+
+  it('should return null for anonymous user when owner has hideExperience enabled', async () => {
+    loggedUser = null;
+
+    // Set user 1's hideExperience to true
+    await con.getRepository(User).update({ id: '1' }, { hideExperience: true });
+
+    const res = await client.query(USER_EXPERIENCE_BY_ID_QUERY, {
+      variables: { id: 'f47ac10b-58cc-4372-a567-0e02b2c3d479' }, // User 1's experience
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userExperienceById).toBeNull();
+  });
 });
 
 describe('mutation upsertUserGeneralExperience', () => {

__tests__/updateUserInfo.ts

@@ -96,6 +96,7 @@ describe('mutation updateUserInfo', () => {
           country
           city
         }
+        hideExperience
       }
     }
   `;
@@ -662,4 +663,53 @@ describe('mutation updateUserInfo', () => {
     expect(updatedUser?.readmeHtml).toContain('<h1>');
     // locationId check skipped - requires DatasetLocation records
   });
+
+  it('should update hideExperience', async () => {
+    loggedUser = '1';
+    const repo = con.getRepository(User);
+
+    // Verify initial state is false
+    const user = await repo.findOneBy({ id: loggedUser });
+    expect(user?.hideExperience).toBe(false);
+
+    const res = await client.mutate(MUTATION, {
+      variables: {
+        data: {
+          hideExperience: true,
+          username: 'testuser',
+          name: 'Test User',
+        },
+      },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.updateUserInfo.hideExperience).toBe(true);
+
+    const updatedUser = await repo.findOneBy({ id: loggedUser });
+    expect(updatedUser?.hideExperience).toBe(true);
+  });
+
+  it('should update hideExperience to false', async () => {
+    loggedUser = '1';
+    const repo = con.getRepository(User);
+
+    // Set hideExperience to true first
+    await repo.update({ id: loggedUser }, { hideExperience: true });
+
+    const res = await client.mutate(MUTATION, {
+      variables: {
+        data: {
+          hideExperience: false,
+          username: 'testuser',
+          name: 'Test User',
+        },
+      },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.updateUserInfo.hideExperience).toBe(false);
+
+    const updatedUser = await repo.findOneBy({ id: loggedUser });
+    expect(updatedUser?.hideExperience).toBe(false);
+  });
 });