Merge branch 'main' into parse-cv-profile

Author: capJavert

__tests__/schema/autocompletes.ts

@@ -439,7 +439,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'new york',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -506,7 +506,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'united states',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -611,7 +611,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'san',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -647,7 +647,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'test',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -676,7 +676,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'nonexistentlocation',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -698,7 +698,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'test',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -757,7 +757,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'berlin',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })
@@ -794,7 +794,7 @@ describe('query autocompleteLocation', () => {
       .get('/search/geocode/v6/forward')
       .query({
         q: 'San Francisco, CA',
-        types: 'country,place',
+        types: 'country,region,place',
         limit: 5,
         access_token: process.env.MAPBOX_ACCESS_TOKEN,
       })

__tests__/schema/opportunity.ts

@@ -1410,6 +1410,68 @@ describe('query userOpportunityMatches', () => {
       period: 1, // ANNUAL
     });
   });
+
+  it('should include opportunity details when requested', async () => {
+    loggedUser = '1';
+
+    const GET_USER_MATCHES_WITH_OPPORTUNITY_QUERY = /* GraphQL */ `
+      query GetUserOpportunityMatchesWithOpportunity($first: Int) {
+        userOpportunityMatches(first: $first) {
+          edges {
+            node {
+              userId
+              opportunityId
+              status
+              updatedAt
+              opportunity {
+                id
+                title
+                state
+                location {
+                  city
+                  country
+                }
+                organization {
+                  id
+                  name
+                }
+              }
+            }
+          }
+        }
+      }
+    `;
+
+    const res = await client.query(GET_USER_MATCHES_WITH_OPPORTUNITY_QUERY, {
+      variables: {
+        first: 10,
+      },
+    });
+
+    expect(res.errors).toBeFalsy();
+    expect(res.data.userOpportunityMatches.edges).toHaveLength(2);
+
+    const matchWithOpportunity = res.data.userOpportunityMatches.edges.find(
+      (e: { node: { opportunityId: string } }) =>
+        e.node.opportunityId === '550e8400-e29b-41d4-a716-446655440001',
+    );
+
+    expect(matchWithOpportunity.node.opportunity).toEqual({
+      id: '550e8400-e29b-41d4-a716-446655440001',
+      title: 'Senior Full Stack Developer',
+      state: 2, // LIVE
+      location: [
+        {
+          city: null,
+          country: 'Norway',
+        },
+      ],
+      organization: {
+        id: '550e8400-e29b-41d4-a716-446655440000',
+        name: 'Daily Dev Inc',
+      },
+    });
+  });
 });
 
 describe('query getCandidatePreferences', () => {

__tests__/schema/profile.ts

@@ -185,17 +185,6 @@ describe('query userExperiences', () => {
     expect(res.data.userExperiences.pageInfo.hasNextPage).toBe(false);
   });
 
-  it('should return only 1 experience for non-logged-in user', async () => {
-    loggedUser = null;
-
-    const res = await client.query(USER_EXPERIENCES_QUERY, {
-      variables: { userId: '1' },
-    });
-
-    expect(res.errors).toBeFalsy();
-    expect(res.data.userExperiences.edges).toHaveLength(1);
-  });
-
   it('should return all fields for logged-in users', async () => {
     loggedUser = '1';
 

__tests__/updateUserInfo.ts

@@ -10,6 +10,7 @@ import {
 } from './helpers';
 import { User } from '../src/entity';
 import { clearFile, UploadPreset } from '../src/common/cloudinary';
+import { fallbackImages } from '../src/config';
 
 let con: DataSource;
 let state: GraphQLTestingState;
@@ -254,7 +255,7 @@ describe('mutation updateUserInfo', () => {
       expect(res.errors).toBeFalsy();
 
       const updatedUser = await repo.findOneBy({ id: loggedUser });
-      expect(updatedUser?.image).toBeNull();
+      expect(updatedUser?.image).toBe(fallbackImages.avatar);
       expect(clearFile).toHaveBeenCalledWith({
         referenceId: loggedUser,
         preset: UploadPreset.Avatar,
@@ -318,7 +319,7 @@ describe('mutation updateUserInfo', () => {
       expect(res.errors).toBeFalsy();
 
       const updatedUser = await repo.findOneBy({ id: loggedUser });
-      expect(updatedUser?.image).toBeNull();
+      expect(updatedUser?.image).toBe(fallbackImages.avatar);
       expect(updatedUser?.cover).toBeNull();
 
       expect(clearFile).toHaveBeenCalledTimes(2);

src/integrations/mapbox/clients.ts

@@ -39,7 +39,7 @@ export class MapboxClient implements IMapboxClient {
 
   async autocomplete(query: string): Promise<MapboxResponse> {
     return this.garmr.execute(async () => {
-      const url = `${this.baseUrl}?q=${encodeURIComponent(query)}&types=country,place&limit=5&access_token=${this.accessToken}`;
+      const url = `${this.baseUrl}?q=${encodeURIComponent(query)}&types=country,region,place&limit=5&access_token=${this.accessToken}`;
 
       const response = await fetch(url);
 

src/schema/opportunity.ts

@@ -221,6 +221,7 @@ export const typeDefs = /* GraphQL */ `
     createdAt: DateTime!
     updatedAt: DateTime!
     user: User!
+    opportunity: Opportunity
     candidatePreferences: UserCandidatePreference
     screening: [ScreeningAnswer!]!
     feedback: [ScreeningAnswer!]!

src/schema/profile.ts

@@ -236,11 +236,8 @@ export const resolvers = traceResolvers<unknown, AuthContext>({
         ctx,
         info,
         (nodeSize) =>
-          !!ctx.userId &&
           userExperiencesPageGenerator.hasPreviousPage(page, nodeSize),
-        (nodeSize) =>
-          !!ctx.userId &&
-          userExperiencesPageGenerator.hasNextPage(page, nodeSize),
+        (nodeSize) => userExperiencesPageGenerator.hasNextPage(page, nodeSize),
         (node, index) =>
           userExperiencesPageGenerator.nodeToCursor(page, args, node, index),
         (builder) => {
@@ -259,8 +256,8 @@ export const resolvers = traceResolvers<unknown, AuthContext>({
           builder.queryBuilder
             .orderBy(`${builder.alias}."endedAt"`, 'DESC', 'NULLS FIRST')
             .addOrderBy(`${builder.alias}."startedAt"`, 'DESC')
-            .limit(!ctx.userId ? 1 : getLimit({ limit: page.limit }))
-            .offset(!ctx.userId ? 0 : page.offset);
+            .limit(getLimit({ limit: page.limit }))
+            .offset(page.offset);
 
           return builder;
         },

src/schema/users.ts

@@ -115,6 +115,7 @@ import {
 import { markdown } from '../common/markdown';
 import { deleteRedisKey, getRedisObject, RedisMagicValues } from '../redis';
 import {
+  fallbackImages,
   generateStorageKey,
   RESUME_BUCKET_NAME,
   StorageKey,
@@ -2542,7 +2543,7 @@ export const resolvers: IResolvers<unknown, BaseContext> = traceResolvers<
             const file = await upload;
             return (await uploadAvatar(user.id, file.createReadStream())).url;
           }
-          return data.image || null;
+          return data.image || fallbackImages.avatar;
         })(),
         (async () => {
           if (coverUpload && cloudinaryUrl) {