EW-1355: Improve CC Import performance.

apps/server/src/infra/boards-client/boards-client.adapter.spec.ts

@@ -1,5 +1,5 @@
 import { faker } from '@faker-js/faker';
-import { createMock } from '@golevelup/ts-jest';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
 import { BoardsClientAdapter } from './boards-client.adapter';
@@ -8,20 +8,20 @@ import { BoardApi, BoardResponse, CreateBoardBodyParams, CreateBoardResponse } f
 describe(BoardsClientAdapter.name, () => {
 	let module: TestingModule;
 	let sut: BoardsClientAdapter;
-
-	const boardApiMock = createMock<BoardApi>();
+	let boardApiMock: DeepMocked<BoardApi>;
 
 	beforeAll(async () => {
 		module = await Test.createTestingModule({
 			providers: [
 				BoardsClientAdapter,
 				{
 					provide: BoardApi,
-					useValue: boardApiMock,
+					useValue: createMock<BoardApi>(),
 				},
 			],
 		}).compile();
 		sut = module.get(BoardsClientAdapter);
+		boardApiMock = module.get(BoardApi);
 	});
 
 	afterAll(async () => {
@@ -51,19 +51,26 @@ describe(BoardsClientAdapter.name, () => {
 
 				boardApiMock.boardControllerCreateBoard.mockResolvedValue(axiosResponseFactory.build({ data: responseData }));
 
+				const jwt = faker.internet.jwt();
+
 				return {
 					params,
 					responseData,
+					jwt,
 				};
 			};
 
 			it('should call boardApi.boardControllerCreateBoard', async () => {
-				const { params, responseData } = setup();
+				const { params, responseData, jwt } = setup();
 
-				const response = await sut.createBoard(params);
+				const response = await sut.createBoard(jwt, params);
 
 				expect(response).toEqual(responseData);
-				expect(boardApiMock.boardControllerCreateBoard).toHaveBeenCalledWith(params);
+				expect(boardApiMock.boardControllerCreateBoard).toHaveBeenCalledWith(params, {
+					headers: {
+						Authorization: `Bearer ${jwt}`,
+					},
+				});
 			});
 		});
 	});
@@ -89,19 +96,26 @@ describe(BoardsClientAdapter.name, () => {
 					axiosResponseFactory.build({ data: responseData })
 				);
 
+				const jwt = faker.internet.jwt();
+
 				return {
 					boardId,
 					responseData,
+					jwt,
 				};
 			};
 
 			it('should call boardApi.boardControllerGetBoardSkeleton', async () => {
-				const { boardId, responseData } = setup();
+				const { boardId, responseData, jwt } = setup();
 
-				const response = await sut.getBoardSkeletonById(boardId);
+				const response = await sut.getBoardSkeletonById(jwt, boardId);
 
 				expect(response).toEqual(responseData);
-				expect(boardApiMock.boardControllerGetBoardSkeleton).toHaveBeenCalledWith(boardId);
+				expect(boardApiMock.boardControllerGetBoardSkeleton).toHaveBeenCalledWith(boardId, {
+					headers: {
+						Authorization: `Bearer ${jwt}`,
+					},
+				});
 			});
 		});
 	});
@@ -116,19 +130,26 @@ describe(BoardsClientAdapter.name, () => {
 
 				boardApiMock.boardControllerCreateColumn.mockResolvedValue(axiosResponseFactory.build({ data: responseData }));
 
+				const jwt = faker.internet.jwt();
+
 				return {
 					boardId,
 					responseData,
+					jwt,
 				};
 			};
 
 			it('should call boardApi.boardControllerCreateColumn', async () => {
-				const { boardId, responseData } = setup();
+				const { boardId, responseData, jwt } = setup();
 
-				const response = await sut.createBoardColumn(boardId);
+				const response = await sut.createBoardColumn(jwt, boardId);
 
 				expect(response).toEqual(responseData);
-				expect(boardApiMock.boardControllerCreateColumn).toHaveBeenCalledWith(boardId);
+				expect(boardApiMock.boardControllerCreateColumn).toHaveBeenCalledWith(boardId, {
+					headers: {
+						Authorization: `Bearer ${jwt}`,
+					},
+				});
 			});
 		});
 	});

apps/server/src/infra/boards-client/boards-client.adapter.ts

@@ -1,25 +1,34 @@
 import { Injectable } from '@nestjs/common';
+import { RawAxiosRequestConfig } from 'axios';
 import { BoardApi, BoardResponse, ColumnResponse, CreateBoardBodyParams, CreateBoardResponse } from './generated';
 
 @Injectable()
 export class BoardsClientAdapter {
 	constructor(private readonly boardApi: BoardApi) {}
 
-	public async createBoard(params: CreateBoardBodyParams): Promise<CreateBoardResponse> {
-		const response = await this.boardApi.boardControllerCreateBoard(params);
+	public async createBoard(jwt: string, params: CreateBoardBodyParams): Promise<CreateBoardResponse> {
+		const response = await this.boardApi.boardControllerCreateBoard(params, this.getAxiosConfig(jwt));
 
 		return response.data;
 	}
 
-	public async createBoardColumn(boardId: string): Promise<ColumnResponse> {
-		const response = await this.boardApi.boardControllerCreateColumn(boardId);
+	public async createBoardColumn(jwt: string, boardId: string): Promise<ColumnResponse> {
+		const response = await this.boardApi.boardControllerCreateColumn(boardId, this.getAxiosConfig(jwt));
 
 		return response.data;
 	}
 
-	public async getBoardSkeletonById(boardId: string): Promise<BoardResponse> {
-		const response = await this.boardApi.boardControllerGetBoardSkeleton(boardId);
+	public async getBoardSkeletonById(jwt: string, boardId: string): Promise<BoardResponse> {
+		const response = await this.boardApi.boardControllerGetBoardSkeleton(boardId, this.getAxiosConfig(jwt));
 
 		return response.data;
 	}
+
+	private getAxiosConfig(jwt: string): RawAxiosRequestConfig {
+		return {
+			headers: {
+				Authorization: `Bearer ${jwt}`,
+			},
+		};
+	}
 }

apps/server/src/infra/boards-client/boards-client.module.spec.ts

@@ -1,22 +1,13 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ConfigModule } from '@nestjs/config';
 import { faker } from '@faker-js/faker';
-import { Request } from 'express';
-import { createMock } from '@golevelup/ts-jest';
-import { REQUEST } from '@nestjs/core';
 import { BoardsClientAdapter } from './boards-client.adapter';
 import { BoardsClientConfig } from './boards-client.config';
 import { BoardsClientModule } from './boards-client.module';
 
 describe(BoardsClientModule.name, () => {
 	let module: TestingModule;
 
-	const requestMock = createMock<Request>({
-		headers: {
-			authorization: `Bearer ${faker.string.alphanumeric(42)}`,
-		},
-	});
-
 	beforeEach(async () => {
 		module = await Test.createTestingModule({
 			imports: [
@@ -32,10 +23,7 @@ describe(BoardsClientModule.name, () => {
 					],
 				}),
 			],
-		})
-			.overrideProvider(REQUEST)
-			.useValue(requestMock)
-			.compile();
+		}).compile();
 	});
 
 	afterAll(async () => {

apps/server/src/infra/boards-client/boards-client.module.ts

@@ -1,29 +1,23 @@
-import { Module, Scope } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
-import { REQUEST } from '@nestjs/core';
-import { Request } from 'express';
-import { JwtExtractor } from '@shared/common/utils';
 import { BoardsClientAdapter } from './boards-client.adapter';
 import { BoardsClientConfig } from './boards-client.config';
-import { Configuration, BoardApi } from './generated';
+import { BoardApi, Configuration } from './generated';
 
 @Module({
 	providers: [
 		BoardsClientAdapter,
 		{
 			provide: BoardApi,
-			scope: Scope.REQUEST,
-			useFactory: (configService: ConfigService<BoardsClientConfig, true>, request: Request): BoardApi => {
+			useFactory: (configService: ConfigService<BoardsClientConfig, true>): BoardApi => {
 				const basePath = configService.getOrThrow<string>('API_HOST');
-				const accessToken = JwtExtractor.extractJwtFromRequestOrFail(request);
 				const configuration = new Configuration({
 					basePath: `${basePath}/v3`,
-					accessToken,
 				});
 
 				return new BoardApi(configuration);
 			},
-			inject: [ConfigService, REQUEST],
+			inject: [ConfigService],
 		},
 	],
 	exports: [BoardsClientAdapter],

apps/server/src/infra/cards-client/card-client.adapter.spec.ts

@@ -1,4 +1,4 @@
-import { createMock } from '@golevelup/ts-jest';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { BoardCardApi, BoardElementApi, ContentElementType } from './generated';
 import { CardClientAdapter } from '.';
@@ -8,25 +8,26 @@ import { axiosResponseFactory } from '@testing/factory/axios-response.factory';
 describe(CardClientAdapter.name, () => {
 	let module: TestingModule;
 	let sut: CardClientAdapter;
-
-	const cardApiMock = createMock<BoardCardApi>();
-	const boardElementApiMock = createMock<BoardElementApi>();
+	let cardApiMock: DeepMocked<BoardCardApi>;
+	let boardElementApiMock: DeepMocked<BoardElementApi>;
 
 	beforeAll(async () => {
 		module = await Test.createTestingModule({
 			providers: [
 				CardClientAdapter,
 				{
-					provide: BoardElementApi,
-					useValue: boardElementApiMock,
+					provide: BoardCardApi,
+					useValue: createMock<BoardCardApi>(),
 				},
 				{
-					provide: BoardCardApi,
-					useValue: cardApiMock,
+					provide: BoardElementApi,
+					useValue: createMock<BoardElementApi>(),
 				},
 			],
 		}).compile();
 		sut = module.get(CardClientAdapter);
+		cardApiMock = module.get(BoardCardApi);
+		boardElementApiMock = module.get(BoardElementApi);
 	});
 
 	afterAll(async () => {
@@ -54,20 +55,27 @@ describe(CardClientAdapter.name, () => {
 					axiosResponseFactory.build({ data: { id: cardId, type: ContentElementType.RICH_TEXT } })
 				);
 
+				const jwt = faker.internet.jwt();
+
 				return {
 					cardId,
 					createContentElementBodyParams,
+					jwt,
 				};
 			};
 
 			it('should call cardApi.cardControllerCreateElement', async () => {
-				const { cardId, createContentElementBodyParams } = setup();
+				const { cardId, createContentElementBodyParams, jwt } = setup();
 
-				const response = await sut.createCardElement(cardId, createContentElementBodyParams);
+				const response = await sut.createCardElement(jwt, cardId, createContentElementBodyParams);
 
 				expect(response.id).toEqual(cardId);
 				expect(response.type).toEqual(ContentElementType.RICH_TEXT);
-				expect(cardApiMock.cardControllerCreateElement).toHaveBeenCalledWith(cardId, createContentElementBodyParams);
+				expect(cardApiMock.cardControllerCreateElement).toHaveBeenCalledWith(cardId, createContentElementBodyParams, {
+					headers: {
+						Authorization: `Bearer ${jwt}`,
+					},
+				});
 			});
 		});
 	});
@@ -79,19 +87,25 @@ describe(CardClientAdapter.name, () => {
 				const renameBodyParams = {
 					title: faker.lorem.words(),
 				};
+				const jwt = faker.internet.jwt();
 
 				return {
 					cardId,
 					renameBodyParams,
+					jwt,
 				};
 			};
 
 			it('should call cardApi.cardControllerUpdateCardTitle', async () => {
-				const { cardId, renameBodyParams } = setup();
+				const { cardId, renameBodyParams, jwt } = setup();
 
-				await sut.updateCardTitle(cardId, renameBodyParams);
+				await sut.updateCardTitle(jwt, cardId, renameBodyParams);
 
-				expect(cardApiMock.cardControllerUpdateCardTitle).toHaveBeenCalledWith(cardId, renameBodyParams);
+				expect(cardApiMock.cardControllerUpdateCardTitle).toHaveBeenCalledWith(cardId, renameBodyParams, {
+					headers: {
+						Authorization: `Bearer ${jwt}`,
+					},
+				});
 			});
 		});
 	});
@@ -114,21 +128,29 @@ describe(CardClientAdapter.name, () => {
 					axiosResponseFactory.build({ data: updateElementContentBodyParams })
 				);
 
+				const jwt = faker.internet.jwt();
+
 				return {
 					elementId,
 					updateElementContentBodyParams,
+					jwt,
 				};
 			};
 
 			it('should call elementAPI.elementControllerUpdateElement', async () => {
-				const { elementId, updateElementContentBodyParams } = setup();
+				const { elementId, updateElementContentBodyParams, jwt } = setup();
 
-				const response = await sut.updateCardElement(elementId, updateElementContentBodyParams);
+				const response = await sut.updateCardElement(jwt, elementId, updateElementContentBodyParams);
 
 				expect(response).toEqual(updateElementContentBodyParams);
 				expect(boardElementApiMock.elementControllerUpdateElement).toHaveBeenCalledWith(
 					elementId,
-					updateElementContentBodyParams
+					updateElementContentBodyParams,
+					{
+						headers: {
+							Authorization: `Bearer ${jwt}`,
+						},
+					}
 				);
 			});
 		});