Merge branch 'main' into ENG-46-enrichment

Author: AmarTrebinjac

.infra/crons.ts

@@ -130,4 +130,8 @@ export const crons: Cron[] = [
     name: 'post-analytics-history-day-clickhouse',
     schedule: '3-59/5 * * * *',
   },
+  {
+    name: 'clean-zombie-opportunities',
+    schedule: '30 6 * * *',
+  },
 ];

__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__/cron/cleanZombieOpportunities.ts

@@ -0,0 +1,98 @@
+import { cleanZombieOpportunities as cron } from '../../src/cron/cleanZombieOpportunities';
+import { expectSuccessfulCron, saveFixtures } from '../helpers';
+import { DataSource } from 'typeorm';
+import createOrGetConnection from '../../src/db';
+import { crons } from '../../src/cron/index';
+import {
+  opportunitiesFixture,
+  organizationsFixture,
+} from '../fixture/opportunity';
+import { randomUUID } from 'node:crypto';
+import { OpportunityJob } from '../../src/entity/opportunities/OpportunityJob';
+import { subDays } from 'date-fns';
+import { Organization } from '../../src/entity/Organization';
+import { Opportunity } from '../../src/entity/opportunities/Opportunity';
+
+let con: DataSource;
+
+beforeAll(async () => {
+  con = await createOrGetConnection();
+});
+
+beforeEach(async () => {
+  jest.clearAllMocks();
+
+  await saveFixtures(con, Organization, organizationsFixture);
+
+  await saveFixtures(
+    con,
+    OpportunityJob,
+    opportunitiesFixture.map((opportunity) => {
+      return {
+        ...opportunity,
+        id: randomUUID(),
+      };
+    }),
+  );
+
+  await saveFixtures(
+    con,
+    OpportunityJob,
+    opportunitiesFixture.map((opportunity) => {
+      return {
+        ...opportunity,
+        id: randomUUID(),
+        organizationId: null,
+        flags: { anonUserId: randomUUID() },
+        createdAt: subDays(new Date(), 3),
+      };
+    }),
+  );
+
+  await saveFixtures(
+    con,
+    OpportunityJob,
+    opportunitiesFixture.map((opportunity) => {
+      return {
+        ...opportunity,
+        id: randomUUID(),
+        organizationId: null,
+        flags: { anonUserId: randomUUID() },
+        createdAt: subDays(new Date(), 1),
+      };
+    }),
+  );
+});
+
+describe('cleanZombieOpportunities cron', () => {
+  it('should be registered', () => {
+    const registeredWorker = crons.find((item) => item.name === cron.name);
+
+    expect(registeredWorker).toBeDefined();
+  });
+
+  it('should clean created opportunities not updated for more then 2 days', async () => {
+    const opportunities = await con.getRepository(Opportunity).find();
+
+    expect(opportunities.length).toEqual(15);
+
+    const zombieOpportunitiesCount = opportunities.filter((opportunity) => {
+      return (
+        !(opportunity as OpportunityJob).organizationId &&
+        opportunity.flags?.anonUserId &&
+        opportunity.createdAt < subDays(new Date(), 2)
+      );
+    }).length;
+
+    expect(zombieOpportunitiesCount).toEqual(5);
+
+    await expectSuccessfulCron(cron);
+
+    const opportunitiesCount = await con
+      .getRepository(OpportunityJob)
+      .createQueryBuilder()
+      .getCount();
+
+    expect(opportunitiesCount).toEqual(10);
+  });
+});

__tests__/helpers.ts

@@ -48,6 +48,16 @@ import {
   ExtractMarkdownResponse,
   ParseCVResponse,
   ParseError,
+  ParseOpportunityResponse,
+  Opportunity,
+  OpportunityMeta,
+  OpportunityContent,
+  EmploymentType,
+  SeniorityLevel,
+  Salary,
+  SalaryPeriod,
+  OpportunityContent_ContentBlock,
+  Location,
 } from '@dailydotdev/schema';
 import { createClient, type ClickHouseClient } from '@clickhouse/client';
 import * as clickhouseCommon from '../src/common/clickhouse';
@@ -67,6 +77,7 @@ export class MockContext extends Context {
   logger: FastifyLoggerInstance;
   contentLanguage: ContentLanguage;
   mockRegion: string;
+  mockTrackingId: string | undefined;
 
   constructor(
     con: DataSource,
@@ -76,6 +87,7 @@ export class MockContext extends Context {
     isTeamMember = false,
     isPlus = false,
     region = '',
+    trackingId: string | undefined = undefined,
   ) {
     super(mock<FastifyRequest>(), con);
     this.mockSpan = mock<opentelemetry.Span>();
@@ -88,6 +100,7 @@ export class MockContext extends Context {
     this.mockIsPlus = isPlus;
     this.logger = mock<FastifyLoggerInstance>();
     this.mockRegion = region;
+    this.mockTrackingId = trackingId;
 
     if (req?.headers['content-language']) {
       this.contentLanguage = req.headers['content-language'] as ContentLanguage;
@@ -103,7 +116,7 @@ export class MockContext extends Context {
   }
 
   get trackingId(): string | null {
-    return this.mockUserId;
+    return this.mockTrackingId || this.mockUserId;
   }
 
   get isTeamMember(): boolean {
@@ -465,6 +478,54 @@ export const createMockBrokkrTransport = () =>
           ]),
         });
       },
+      parseOpportunity: () => {
+        return new ParseOpportunityResponse({
+          opportunity: new Opportunity({
+            title: 'Mocked Opportunity Title',
+            tldr: 'This is a mocked TL;DR of the opportunity.',
+            keywords: ['mock', 'opportunity', 'test'],
+            meta: new OpportunityMeta({
+              employmentType: EmploymentType.FULL_TIME,
+              seniorityLevel: SeniorityLevel.SENIOR,
+              roleType: 0.5,
+              salary: new Salary({
+                min: BigInt(1000),
+                max: BigInt(2000),
+                currency: 'USD',
+                period: SalaryPeriod.MONTHLY,
+              }),
+            }),
+            location: [
+              new Location({
+                country: 'USA',
+                city: 'San Francisco',
+                subdivision: 'CA',
+                type: 1,
+              }),
+            ],
+            content: new OpportunityContent({
+              overview: new OpportunityContent_ContentBlock({
+                content: 'This is the overview of the mocked opportunity.',
+              }),
+              responsibilities: new OpportunityContent_ContentBlock({
+                content:
+                  'These are the responsibilities of the mocked opportunity.',
+              }),
+              requirements: new OpportunityContent_ContentBlock({
+                content:
+                  'These are the requirements of the mocked opportunity.',
+              }),
+              whatYoullDo: new OpportunityContent_ContentBlock({
+                content: 'This is what you will do in the mocked opportunity.',
+              }),
+              interviewProcess: new OpportunityContent_ContentBlock({
+                content:
+                  'This is the interview process of the mocked opportunity.',
+              }),
+            }),
+          }),
+        });
+      },
     });
   });